OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 2336a861: am a2fb4deb: am a7e098c8: Merge "Drop in new assets of correct size...
Michael Kolb [Fri, 19 Apr 2013 17:17:11 +0000 (10:17 -0700)]
am 2336a861: am a2fb4deb: am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce

* commit '2336a861714c1f63fabe03d0825bf4ff4e829690':
  Drop in new assets of correct size

11 years agoam a2fb4deb: am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photo...
Michael Kolb [Fri, 19 Apr 2013 17:14:18 +0000 (10:14 -0700)]
am a2fb4deb: am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce

* commit 'a2fb4deb06d9d8c4b7fb1f5c6191ee1b06cc5355':
  Drop in new assets of correct size

11 years agoam a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce
Michael Kolb [Fri, 19 Apr 2013 17:11:24 +0000 (10:11 -0700)]
am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce

* commit 'a7e098c8e798160fdc2410867ec7eba325b7cd96':
  Drop in new assets of correct size

11 years agoMerge "Drop in new assets of correct size" into gb-ub-photos-bryce
Michael Kolb [Fri, 19 Apr 2013 17:09:40 +0000 (17:09 +0000)]
Merge "Drop in new assets of correct size" into gb-ub-photos-bryce

11 years agoDrop in new assets of correct size
Michael Kolb [Fri, 19 Apr 2013 15:56:07 +0000 (08:56 -0700)]
Drop in new assets of correct size

  Bug: 8640131

Change-Id: Iefcff08ae190c07700b5526a6847b664fe1b51a7

11 years agoam eb630552: am 1e17e692: am 316af8dd: Merge "Fix crop activity aspect ratio and...
Ruben Brunk [Fri, 19 Apr 2013 03:24:36 +0000 (20:24 -0700)]
am eb630552: am 1e17e692: am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce

* commit 'eb630552e1ba3f995b2fda865821fe3b38c8cb39':
  Fix crop activity aspect ratio and orientation handling.

11 years agoam 1e17e692: am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handl...
Ruben Brunk [Fri, 19 Apr 2013 03:22:26 +0000 (20:22 -0700)]
am 1e17e692: am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce

* commit '1e17e69237eaa80b1c48d1dcff1ee3a71000d4ee':
  Fix crop activity aspect ratio and orientation handling.

11 years agoam 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into...
Ruben Brunk [Fri, 19 Apr 2013 03:20:19 +0000 (20:20 -0700)]
am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce

* commit '316af8dd675d777f4bd9512b8af5391c7c89363f':
  Fix crop activity aspect ratio and orientation handling.

11 years agoMerge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos...
Ruben Brunk [Fri, 19 Apr 2013 03:16:53 +0000 (03:16 +0000)]
Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce

11 years agoam 1388f728: am a2b7cea2: am a1939d22: Merge "fixed borders issues" into gb-ub-photos...
John Hoford [Fri, 19 Apr 2013 01:47:51 +0000 (18:47 -0700)]
am 1388f728: am a2b7cea2: am a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce

* commit '1388f7284f3ab67141cf86719e9bba40d69738da':
  fixed borders issues

11 years agoam a2b7cea2: am a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce
John Hoford [Fri, 19 Apr 2013 01:45:53 +0000 (18:45 -0700)]
am a2b7cea2: am a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce

* commit 'a2b7cea2ee21c48f7f4b53236c58159e92ecb113':
  fixed borders issues

11 years agoam a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce
John Hoford [Fri, 19 Apr 2013 01:44:01 +0000 (18:44 -0700)]
am a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce

* commit 'a1939d22f631ddcb7e942cc0ad2ffa7ef78b763f':
  fixed borders issues

11 years agoMerge "fixed borders issues" into gb-ub-photos-bryce
John Hoford [Fri, 19 Apr 2013 01:41:44 +0000 (01:41 +0000)]
Merge "fixed borders issues" into gb-ub-photos-bryce

11 years agoFix crop activity aspect ratio and orientation handling.
Ruben Brunk [Thu, 18 Apr 2013 23:22:27 +0000 (16:22 -0700)]
Fix crop activity aspect ratio and orientation handling.

Bug: 8659064
Bug: 8647628
Change-Id: I3e4293cc3bba7d55334acb396e20a23cc92f8f82

11 years agoam 70ef3fd8: am 7f5d0331: am ed2f1790: Merge "Remove unused imports." into gb-ub...
Flavio Lerda [Thu, 18 Apr 2013 23:07:45 +0000 (16:07 -0700)]
am 70ef3fd8: am 7f5d0331: am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce

* commit '70ef3fd8916d2c1f11a31ee8c8101032a450b5c0':
  Remove unused imports.

11 years agoam 7f5d0331: am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce
Flavio Lerda [Thu, 18 Apr 2013 23:04:12 +0000 (16:04 -0700)]
am 7f5d0331: am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce

* commit '7f5d0331b16923df1eec2501ba0709c05c845c74':
  Remove unused imports.

11 years agoam ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce
Flavio Lerda [Thu, 18 Apr 2013 23:00:40 +0000 (16:00 -0700)]
am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce

* commit 'ed2f17903bbbca08ac98af4aa6c1dd9d22504a1d':
  Remove unused imports.

11 years agoMerge "Remove unused imports." into gb-ub-photos-bryce
Flavio Lerda [Thu, 18 Apr 2013 22:57:36 +0000 (22:57 +0000)]
Merge "Remove unused imports." into gb-ub-photos-bryce

11 years agoRemove unused imports.
Flavio Lerda [Thu, 18 Apr 2013 21:51:46 +0000 (22:51 +0100)]
Remove unused imports.

This is follow-up on the previous fix for b/8433834, addressing reviewer
comments.

Bug: 8433834
Change-Id: I06f466704175a62d8febc5be471a2ca1f50e898d

11 years agoam 9765a573: am 59c8f492: am 5b083f89: Add more menu options/icons
Michael Kolb [Thu, 18 Apr 2013 22:29:23 +0000 (15:29 -0700)]
am 9765a573: am 59c8f492: am 5b083f89: Add more menu options/icons

* commit '9765a5738d5c62d00328c923d93707092b3e89fb':
  Add more menu options/icons

11 years agoam 59c8f492: am 5b083f89: Add more menu options/icons
Michael Kolb [Thu, 18 Apr 2013 22:24:39 +0000 (15:24 -0700)]
am 59c8f492: am 5b083f89: Add more menu options/icons

* commit '59c8f492a413cbd786c9051fe765621ecec23c51':
  Add more menu options/icons

11 years agoam 5b083f89: Add more menu options/icons
Michael Kolb [Thu, 18 Apr 2013 22:20:30 +0000 (15:20 -0700)]
am 5b083f89: Add more menu options/icons

* commit '5b083f89c9c87f8e19e0942d1d7c2de623e527be':
  Add more menu options/icons

11 years agoAdd more menu options/icons
Michael Kolb [Thu, 18 Apr 2013 19:31:10 +0000 (12:31 -0700)]
Add more menu options/icons

  Bug: 8640131

Added location and scene mode to secondary menu
Updated HDR icons

Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4

11 years agoam ee8b05cf: am a9fbbc0c: am b726c83a: Merge "Change labels so that it doesn\'t clash...
George Mount [Thu, 18 Apr 2013 21:31:03 +0000 (14:31 -0700)]
am ee8b05cf: am a9fbbc0c: am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce

* commit 'ee8b05cfca2ea41f1b3ca2c858a3655b56ccb51f':
  Change labels so that it doesn't clash with PanoUiLib.

11 years agoam a9fbbc0c: am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiL...
George Mount [Thu, 18 Apr 2013 21:26:52 +0000 (14:26 -0700)]
am a9fbbc0c: am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce

* commit 'a9fbbc0ca0a348a0b5d302d130395f35cf88a1db':
  Change labels so that it doesn't clash with PanoUiLib.

11 years agoam b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into...
George Mount [Thu, 18 Apr 2013 21:23:11 +0000 (14:23 -0700)]
am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce

* commit 'b726c83ab60b0ec8e93cad9724857999b3bb8ec5':
  Change labels so that it doesn't clash with PanoUiLib.

11 years agoMerge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos...
George Mount [Thu, 18 Apr 2013 21:20:31 +0000 (21:20 +0000)]
Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce

11 years agofixed borders issues
John Hoford [Thu, 18 Apr 2013 03:40:25 +0000 (20:40 -0700)]
fixed borders issues

bug:8315216
Change-Id: I04d62984c70e7e514b8625e6a4b5ed9395137471

11 years agoam 68e7e978: am 8a931f9d: am c3178ca4: Gallery crop uses new activity. Fixed image...
Ruben Brunk [Thu, 18 Apr 2013 18:48:08 +0000 (11:48 -0700)]
am 68e7e978: am 8a931f9d: am c3178ca4: Gallery crop uses new activity.  Fixed image quality.

* commit '68e7e978faa04f43cb4b7fe02858bb32bd6250a5':
  Gallery crop uses new activity.  Fixed image quality.

11 years agoam 8a931f9d: am c3178ca4: Gallery crop uses new activity. Fixed image quality.
Ruben Brunk [Thu, 18 Apr 2013 18:44:14 +0000 (11:44 -0700)]
am 8a931f9d: am c3178ca4: Gallery crop uses new activity.  Fixed image quality.

* commit '8a931f9d440e2ce415048401e23a42aedb0c8abd':
  Gallery crop uses new activity.  Fixed image quality.

11 years agoam c3178ca4: Gallery crop uses new activity. Fixed image quality.
Ruben Brunk [Thu, 18 Apr 2013 18:40:49 +0000 (11:40 -0700)]
am c3178ca4: Gallery crop uses new activity.  Fixed image quality.

* commit 'c3178ca4daf7ed570f3432f3433959c208ecc105':
  Gallery crop uses new activity.  Fixed image quality.

11 years agoGallery crop uses new activity. Fixed image quality.
Ruben Brunk [Tue, 16 Apr 2013 23:17:45 +0000 (16:17 -0700)]
Gallery crop uses new activity.  Fixed image quality.

Bug: 8639287
Bug: 8617799
Bug: 8600483
Bug: 8586301
Bug: 8526929
Bug: 8181859
Bug: 7561681

Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e

11 years agoChange labels so that it doesn't clash with PanoUiLib.
George Mount [Thu, 18 Apr 2013 17:15:40 +0000 (10:15 -0700)]
Change labels so that it doesn't clash with PanoUiLib.

  Bug 8401273
  PanoUiLib is required for all Gallery Wolfie UI.

Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a

11 years agoam c99bd971: am 42a13dcb: am c54e3418: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 18 Apr 2013 14:48:38 +0000 (07:48 -0700)]
am c99bd971: am 42a13dcb: am c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'c99bd9718016864fb89652451f12039d240cd3c0':
  Import translations. DO NOT MERGE

11 years agoam 622db9a0: am f2a17aee: am df9e8b91: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 18 Apr 2013 14:48:37 +0000 (07:48 -0700)]
am 622db9a0: am f2a17aee: am df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '622db9a03e717afce029dfc9a239045df668697d':
  Import translations. DO NOT MERGE

11 years agoam d57098b2: am 86def04c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 18 Apr 2013 14:45:14 +0000 (07:45 -0700)]
am d57098b2: am 86def04c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'd57098b230f0f6613660e0c79d9c77f6188966ae':
  Import translations. DO NOT MERGE

11 years agoam 1c9ce63d: am 17d1c732: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 18 Apr 2013 14:45:13 +0000 (07:45 -0700)]
am 1c9ce63d: am 17d1c732: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '1c9ce63d99e77a8095cd7331436bbd711dd74cbd':
  Import translations. DO NOT MERGE

11 years agoam 42a13dcb: am c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Thu, 18 Apr 2013 14:44:38 +0000 (07:44 -0700)]
am 42a13dcb: am c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '42a13dcbfe3def75ceba13740fd1d01d30d2284c':
  Import translations. DO NOT MERGE

11 years agoam f2a17aee: am df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Thu, 18 Apr 2013 14:44:38 +0000 (07:44 -0700)]
am f2a17aee: am df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'f2a17aee8824caf401fff0ebaf6024a546d598e2':
  Import translations. DO NOT MERGE

11 years agoam c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Thu, 18 Apr 2013 14:41:32 +0000 (07:41 -0700)]
am c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'c54e3418578d1419ff3370fa4ee38bdd43397ce1':
  Import translations. DO NOT MERGE

11 years agoam df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Thu, 18 Apr 2013 14:41:31 +0000 (07:41 -0700)]
am df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'df9e8b91919a3b0b2097dc63f708854d20183a16':
  Import translations. DO NOT MERGE

11 years agoam 86def04c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 18 Apr 2013 14:41:14 +0000 (07:41 -0700)]
am 86def04c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '86def04cbab343bd12c1be3a286bf8260e604c23':
  Import translations. DO NOT MERGE

11 years agoam 17d1c732: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 18 Apr 2013 14:41:14 +0000 (07:41 -0700)]
am 17d1c732: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '17d1c73295822b0d79d2dd50a66a6c68d5a1328c':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 18 Apr 2013 14:40:18 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 18 Apr 2013 14:40:06 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 18 Apr 2013 14:39:53 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 18 Apr 2013 14:39:18 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 18 Apr 2013 14:39:04 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 18 Apr 2013 14:38:29 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 51757f32: am 9581384f: am 47f28614: Merge "Usage statistics for sharing." into...
Flavio Lerda [Thu, 18 Apr 2013 13:27:13 +0000 (06:27 -0700)]
am 51757f32: am 9581384f: am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce

* commit '51757f326b320dc6770aea64880caf8e1c8d9574':
  Usage statistics for sharing.

11 years agoam 9581384f: am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos...
Flavio Lerda [Thu, 18 Apr 2013 13:24:05 +0000 (06:24 -0700)]
am 9581384f: am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce

* commit '9581384f4bb5d167883ef14aadf8ef8462dc8815':
  Usage statistics for sharing.

11 years agoam 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce
Flavio Lerda [Thu, 18 Apr 2013 13:22:14 +0000 (06:22 -0700)]
am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce

* commit '47f28614605a19726d2ab81b90333ba718223b72':
  Usage statistics for sharing.

11 years agoMerge "Usage statistics for sharing." into gb-ub-photos-bryce
Flavio Lerda [Thu, 18 Apr 2013 13:19:39 +0000 (13:19 +0000)]
Merge "Usage statistics for sharing." into gb-ub-photos-bryce

11 years agoam 04440b3c: am 5ed8e518: am 61f3f111: Remove call to superclass onTouch in curves.
Ruben Brunk [Thu, 18 Apr 2013 02:59:22 +0000 (19:59 -0700)]
am 04440b3c: am 5ed8e518: am 61f3f111: Remove call to superclass onTouch in curves.

* commit '04440b3c55e11d798510484e7b7eccb04f0b8a1e':
  Remove call to superclass onTouch in curves.

11 years agoam 5ed8e518: am 61f3f111: Remove call to superclass onTouch in curves.
Ruben Brunk [Thu, 18 Apr 2013 02:54:15 +0000 (19:54 -0700)]
am 5ed8e518: am 61f3f111: Remove call to superclass onTouch in curves.

* commit '5ed8e518b4208e3d748aa421778a885a95f17756':
  Remove call to superclass onTouch in curves.

11 years agoam 61f3f111: Remove call to superclass onTouch in curves.
Ruben Brunk [Thu, 18 Apr 2013 02:51:45 +0000 (19:51 -0700)]
am 61f3f111: Remove call to superclass onTouch in curves.

* commit '61f3f1113a5b4f8583fd9fcae4d24734617cae21':
  Remove call to superclass onTouch in curves.

11 years agoRemove call to superclass onTouch in curves.
Ruben Brunk [Thu, 18 Apr 2013 01:55:53 +0000 (18:55 -0700)]
Remove call to superclass onTouch in curves.

Bug: 8523301
Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f

11 years agoam b343fc4a: am 550a4871: am 869cb048: Merge "Remove redeye filter." into gb-ub-photo...
Ruben Brunk [Thu, 18 Apr 2013 01:59:04 +0000 (18:59 -0700)]
am b343fc4a: am 550a4871: am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce

* commit 'b343fc4ab76d38830e86cfd5b923dbfcc50339a9':
  Remove redeye filter.

11 years agoam 9aefbe13: am 5aa6cb20: am 49ee213f: Merge "Add method for returning SoundPool...
Sascha Haeberling [Thu, 18 Apr 2013 01:59:04 +0000 (18:59 -0700)]
am 9aefbe13: am 5aa6cb20: am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce

* commit '9aefbe13d8dfb74ca011ca5fca9823b2dcd7ac73':
  Add method for returning SoundPool audio type.

11 years agoam 550a4871: am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce
Ruben Brunk [Thu, 18 Apr 2013 01:56:12 +0000 (18:56 -0700)]
am 550a4871: am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce

* commit '550a4871904503748660f0d4fc524e83a5756707':
  Remove redeye filter.

11 years agoam 5aa6cb20: am 49ee213f: Merge "Add method for returning SoundPool audio type."...
Sascha Haeberling [Thu, 18 Apr 2013 01:56:11 +0000 (18:56 -0700)]
am 5aa6cb20: am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce

* commit '5aa6cb20f0971c633982711666f5be7a61cc37d6':
  Add method for returning SoundPool audio type.

11 years agoam 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce
Ruben Brunk [Thu, 18 Apr 2013 01:52:20 +0000 (18:52 -0700)]
am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce

* commit '869cb0484c1c9e77d089abe198817709d3e89eb9':
  Remove redeye filter.

11 years agoam 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos...
Sascha Haeberling [Thu, 18 Apr 2013 01:52:19 +0000 (18:52 -0700)]
am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce

* commit '49ee213fbb0f3434002693889bdae3e7c0d5b378':
  Add method for returning SoundPool audio type.

11 years agoMerge "Remove redeye filter." into gb-ub-photos-bryce
Ruben Brunk [Thu, 18 Apr 2013 01:49:53 +0000 (01:49 +0000)]
Merge "Remove redeye filter." into gb-ub-photos-bryce

11 years agoMerge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
Sascha Haeberling [Thu, 18 Apr 2013 01:48:34 +0000 (01:48 +0000)]
Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce

11 years agoRemove redeye filter.
Ruben Brunk [Thu, 18 Apr 2013 01:39:27 +0000 (18:39 -0700)]
Remove redeye filter.

Bug: 8609003
Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a

11 years agoam 0ee15ec9: am dd42cac8: am 12cd0222: Merge "improve pinch to zoom behavior" into...
John Hoford [Thu, 18 Apr 2013 00:48:56 +0000 (17:48 -0700)]
am 0ee15ec9: am dd42cac8: am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce

* commit '0ee15ec9f463f8b6c8e8294e4e4fc5d99bb707dd':
  improve pinch to zoom behavior

11 years agoam dd42cac8: am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos...
John Hoford [Thu, 18 Apr 2013 00:45:01 +0000 (17:45 -0700)]
am dd42cac8: am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce

* commit 'dd42cac8336dd6651968fe87e63bac4d84a81b21':
  improve pinch to zoom behavior

11 years agoam 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
John Hoford [Thu, 18 Apr 2013 00:39:47 +0000 (17:39 -0700)]
am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce

* commit '12cd022273f14a64d9cdf79aa6a27feb099b9107':
  improve pinch to zoom behavior

11 years agoMerge "improve pinch to zoom behavior" into gb-ub-photos-bryce
John Hoford [Thu, 18 Apr 2013 00:36:52 +0000 (00:36 +0000)]
Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce

11 years agoam 4bcc3286: am 133f92d4: am 1c7d2bc2: First part of asset drop
Michael Kolb [Thu, 18 Apr 2013 00:17:53 +0000 (17:17 -0700)]
am 4bcc3286: am 133f92d4: am 1c7d2bc2: First part of asset drop

* commit '4bcc3286df4879744ce073e71691674b4d413697':
  First part of asset drop

11 years agoam 133f92d4: am 1c7d2bc2: First part of asset drop
Michael Kolb [Thu, 18 Apr 2013 00:14:05 +0000 (17:14 -0700)]
am 133f92d4: am 1c7d2bc2: First part of asset drop

* commit '133f92d47e420aa9c6455122fa67daa22a3910e8':
  First part of asset drop

11 years agoam 1c7d2bc2: First part of asset drop
Michael Kolb [Thu, 18 Apr 2013 00:08:37 +0000 (17:08 -0700)]
am 1c7d2bc2: First part of asset drop

* commit '1c7d2bc293a1ff824db768756d0309dfbc7f08d8':
  First part of asset drop

11 years agoFirst part of asset drop
Michael Kolb [Wed, 17 Apr 2013 23:01:32 +0000 (16:01 -0700)]
First part of asset drop

  Bug: 8640131

Added new assets, updated front/back menu entry.

Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53

11 years agoimprove pinch to zoom behavior
John Hoford [Wed, 17 Apr 2013 20:35:03 +0000 (13:35 -0700)]
improve pinch to zoom behavior

bug:8630925
Change-Id: Ica4c4ab83e726901a8e729056529aa8379cb52ae

11 years agoAdd method for returning SoundPool audio type.
Sascha Haeberling [Wed, 17 Apr 2013 21:55:44 +0000 (14:55 -0700)]
Add method for returning SoundPool audio type.

  Bug: 7402245

Change-Id: Ib45ef78265a66d59f0b27473d9dfcdfa4624c8fa

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Apr 2013 18:42:35 +0000 (11:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5e257c70b129f65097d46e80f46a4f81ef444d40
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Apr 2013 18:42:13 +0000 (11:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ifa9719cff3e8c9694ae010df054468110d02130e
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Apr 2013 18:41:51 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE

Change-Id: I40c3456be1b6c6cecda7cc3c8c819972c7e42c6b
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Apr 2013 18:40:56 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icabf4e0f4daf66081fdd133b2a5f0c98aa030009
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Apr 2013 18:40:24 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: I964583b655d810df84aff9b5462aeca7199ed1f1
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Apr 2013 18:39:48 +0000 (11:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibddba812775d4c197ceab7640c2f1bfce26eb4b3
Auto-generated-cl: translation import

11 years agoam 6e6a0c2d: am f4f9e425: am 75408cd3: Add accessibility to video player controller.
ztenghui [Wed, 17 Apr 2013 18:30:51 +0000 (11:30 -0700)]
am 6e6a0c2d: am f4f9e425: am 75408cd3: Add accessibility to video player controller.

* commit '6e6a0c2d3bb78b399fe265e3432a952e3ee9c030':
  Add accessibility to video player controller.

11 years agoam f4f9e425: am 75408cd3: Add accessibility to video player controller.
ztenghui [Wed, 17 Apr 2013 18:26:06 +0000 (11:26 -0700)]
am f4f9e425: am 75408cd3: Add accessibility to video player controller.

* commit 'f4f9e425d631c863503f509180015e1d7eca820b':
  Add accessibility to video player controller.

11 years agoam 75408cd3: Add accessibility to video player controller.
ztenghui [Wed, 17 Apr 2013 18:24:36 +0000 (11:24 -0700)]
am 75408cd3: Add accessibility to video player controller.

* commit '75408cd38e7efe0755addcf3170932c8b3190bc1':
  Add accessibility to video player controller.

11 years agoAdd accessibility to video player controller.
ztenghui [Tue, 16 Apr 2013 20:52:07 +0000 (13:52 -0700)]
Add accessibility to video player controller.

bug:5714277

cherry pick the Carlsbad CL:
https://googleplex-android-review.git.corp.google.com/#/c/297944/

Change-Id: If0de1ec250a211890e1914d89e8b61780542a675

11 years agoUsage statistics for sharing.
Flavio Lerda [Tue, 16 Apr 2013 08:46:07 +0000 (09:46 +0100)]
Usage statistics for sharing.

Bug: 8433834
Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3

11 years agoam 071544b6: am 19191a4f: am 83bd8d34: Remove History panel
nicolasroard [Wed, 17 Apr 2013 00:55:35 +0000 (17:55 -0700)]
am 071544b6: am 19191a4f: am 83bd8d34: Remove History panel

* commit '071544b6003966b4154e78ce5a91ca1267031406':
  Remove History panel

11 years agoam 19191a4f: am 83bd8d34: Remove History panel
nicolasroard [Wed, 17 Apr 2013 00:51:24 +0000 (17:51 -0700)]
am 19191a4f: am 83bd8d34: Remove History panel

* commit '19191a4f58f4d80529b3400d1bd653faeacfbc2a':
  Remove History panel

11 years agoam 83bd8d34: Remove History panel
nicolasroard [Wed, 17 Apr 2013 00:46:10 +0000 (17:46 -0700)]
am 83bd8d34: Remove History panel

* commit '83bd8d346d295e4fe06212da957feb77ee23c04d':
  Remove History panel

11 years agoRemove History panel
nicolasroard [Wed, 17 Apr 2013 00:09:20 +0000 (17:09 -0700)]
Remove History panel

Now that we have the state, history
is not that useful. For clarity's sake
we are removing it.

bug:8620913
bug:8503386
bug:8324322
bug:8324023
Change-Id: Ife86f3ab67c05d5781234496c7518866b506631b

11 years agoam c10b3066: am 965a99b8: am 113e0fbd: Merge "Shows final set of filters in UI."...
Ruben Brunk [Wed, 17 Apr 2013 00:06:45 +0000 (17:06 -0700)]
am c10b3066: am 965a99b8: am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce

* commit 'c10b3066e063e14cc9bf9cbecf6f8098f955340b':
  Shows final set of filters in UI.

11 years agoam 965a99b8: am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos...
Ruben Brunk [Wed, 17 Apr 2013 00:04:41 +0000 (17:04 -0700)]
am 965a99b8: am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce

* commit '965a99b87b38bc1a846c7dfb4349d399f9e1bc1e':
  Shows final set of filters in UI.

11 years agoam 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
Ruben Brunk [Wed, 17 Apr 2013 00:02:38 +0000 (17:02 -0700)]
am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce

* commit '113e0fbd251966629719f390e43b320b84751304':
  Shows final set of filters in UI.

11 years agoMerge "Shows final set of filters in UI." into gb-ub-photos-bryce
Ruben Brunk [Tue, 16 Apr 2013 23:59:56 +0000 (23:59 +0000)]
Merge "Shows final set of filters in UI." into gb-ub-photos-bryce

11 years agoShows final set of filters in UI.
Ruben Brunk [Tue, 16 Apr 2013 23:25:31 +0000 (16:25 -0700)]
Shows final set of filters in UI.

Bug: 8609003
Change-Id: Id7530da3e11fb88a964b881ba8f8fad70b40bc23

11 years agoam c44633a0: am 6aa5d2df: am 953f109b: Merge "Fix face unlock failure" into gb-ub...
Doris Liu [Tue, 16 Apr 2013 23:20:18 +0000 (16:20 -0700)]
am c44633a0: am 6aa5d2df: am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce

* commit 'c44633a0e53ad406bc2629196b69bec325581b66':
  Fix face unlock failure

11 years agoam 92a587f9: am ccc18a73: am 03332473: Make convertBitmap() protected so that Frames...
nicolasroard [Tue, 16 Apr 2013 23:20:17 +0000 (16:20 -0700)]
am 92a587f9: am ccc18a73: am 03332473: Make convertBitmap() protected so that Frames can use it.

* commit '92a587f98ab0e7f40ce1c6ba5b164057dad7363c':
  Make convertBitmap() protected so that Frames can use it.

11 years agoam 6aa5d2df: am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce
Doris Liu [Tue, 16 Apr 2013 23:16:26 +0000 (16:16 -0700)]
am 6aa5d2df: am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce

* commit '6aa5d2dfbf4890a027512d114759864fc4207025':
  Fix face unlock failure

11 years agoam ccc18a73: am 03332473: Make convertBitmap() protected so that Frames can use it.
nicolasroard [Tue, 16 Apr 2013 23:16:25 +0000 (16:16 -0700)]
am ccc18a73: am 03332473: Make convertBitmap() protected so that Frames can use it.

* commit 'ccc18a734f2f3de9230a09b0d31a9ce27baef000':
  Make convertBitmap() protected so that Frames can use it.