OSDN Git Service

android-x86/packages-apps-Gallery2.git
12 years agoam 8f526423: (-s ours) am b3dc6118: Merge "Import translations. DO NOT MERGE" into...
Eric Fischer [Thu, 3 May 2012 22:02:34 +0000 (15:02 -0700)]
am 8f526423: (-s ours) am b3dc6118: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '8f526423ad187254bbb5dc93c6d5499bc4bba72b':
  Import translations. DO NOT MERGE

12 years agoam b3dc6118: Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Thu, 3 May 2012 21:59:26 +0000 (14:59 -0700)]
am b3dc6118: Merge "Import translations. DO NOT MERGE" into jb-dev

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

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 3 May 2012 21:57:27 +0000 (14:57 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Thu, 3 May 2012 21:56:25 +0000 (14:56 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 3 May 2012 20:53:19 +0000 (13:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iba1e4fc3cb7158b32e25db047fc0793e21d52c48

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 3 May 2012 20:53:08 +0000 (13:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icd8c0249e077f2848cd3df3c2375114ae3e2e3c8

12 years agoam ecd0e033: (-s ours) am 92b5162f: Import translations. DO NOT MERGE
Eric Fischer [Thu, 3 May 2012 19:57:12 +0000 (12:57 -0700)]
am ecd0e033: (-s ours) am 92b5162f: Import translations. DO NOT MERGE

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

12 years agoam 92b5162f: Import translations. DO NOT MERGE
Eric Fischer [Thu, 3 May 2012 19:55:23 +0000 (12:55 -0700)]
am 92b5162f: Import translations. DO NOT MERGE

* commit '92b5162fc3edb48dcda5019881fdad1f70f0cb16':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 3 May 2012 19:48:38 +0000 (12:48 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6f229f2f85af67c76d057e23c22c6ccba7795f85

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 3 May 2012 19:48:21 +0000 (12:48 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iefc176de3ac6c1b849ced8c547ea35c3db68834b

12 years agoam 833808e5: am 609a25b9: Merge "Add camera icon for camera roll." into jb-dev
Chih-Chung Chang [Thu, 3 May 2012 10:36:10 +0000 (03:36 -0700)]
am 833808e5: am 609a25b9: Merge "Add camera icon for camera roll." into jb-dev

* commit '833808e552f2821e532efa04ff9a53780f19999b':
  Add camera icon for camera roll.

12 years agoam 97b7b78c: am 3ab1028f: Merge "Fix NPE in onFullScreenChanged message handler....
Chih-Chung Chang [Thu, 3 May 2012 10:36:08 +0000 (03:36 -0700)]
am 97b7b78c: am 3ab1028f: Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev

* commit '97b7b78cc8473b85367de3cc713d7bc8a8d33beb':
  Fix NPE in onFullScreenChanged message handler. Bug: 6430929

12 years agoam 609a25b9: Merge "Add camera icon for camera roll." into jb-dev
Chih-Chung Chang [Thu, 3 May 2012 10:34:03 +0000 (03:34 -0700)]
am 609a25b9: Merge "Add camera icon for camera roll." into jb-dev

* commit '609a25b98a576e788c3eff507bc162616d1e64bd':
  Add camera icon for camera roll.

12 years agoam 3ab1028f: Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929...
Chih-Chung Chang [Thu, 3 May 2012 10:34:02 +0000 (03:34 -0700)]
am 3ab1028f: Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev

* commit '3ab1028ff9965615d6f90e5073c8d23775c51bb2':
  Fix NPE in onFullScreenChanged message handler. Bug: 6430929

12 years agoMerge "Add camera icon for camera roll." into jb-dev
Chih-Chung Chang [Thu, 3 May 2012 10:32:06 +0000 (03:32 -0700)]
Merge "Add camera icon for camera roll." into jb-dev

12 years agoMerge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev
Chih-Chung Chang [Thu, 3 May 2012 10:31:42 +0000 (03:31 -0700)]
Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev

12 years agoAdd camera icon for camera roll.
Chih-Chung Chang [Thu, 3 May 2012 09:53:05 +0000 (17:53 +0800)]
Add camera icon for camera roll.

Bug: 6411709
Change-Id: I2476dba7edb2b763f3b7727f0034fa300cf0287a

12 years agoFix NPE in onFullScreenChanged message handler.
Chih-Chung Chang [Thu, 3 May 2012 03:41:05 +0000 (11:41 +0800)]
Fix NPE in onFullScreenChanged message handler.
Bug: 6430929

Also tweak the timing of showing action bar and the timing of unlock orientation.

Change-Id: I1af4703ccf99f5257e9724a20d0aa216d20e13c2

12 years agoam b1df47da: am 2f61a1c9: Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
Yuli Huang [Thu, 3 May 2012 09:40:40 +0000 (02:40 -0700)]
am b1df47da: am 2f61a1c9: Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.

* commit 'b1df47daee28114b7971a369fd65305fbf0a32e1':
  Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.

12 years agoam 2f61a1c9: Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
Yuli Huang [Thu, 3 May 2012 09:38:29 +0000 (02:38 -0700)]
am 2f61a1c9: Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.

* commit '2f61a1c91f323ecd4ea5e385eb2b543517a23a0d':
  Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.

12 years agoSimplify Yes/No/Cancel dialog to Yes/Cancel dialog.
Yuli Huang [Thu, 3 May 2012 07:59:23 +0000 (15:59 +0800)]
Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.

Simplify the dialog options to confirm if the user wants to discard
unsaved edited photo, similar to MMS asking if the user wants to discard
the unsent message.

bug:6436477
Change-Id: Ic5af09a1ed46033a25b4ac42bf05b9739f6e8447

12 years agoam af0adede: am 37531196: Merge "Fix NPE because of concurrent access in both GL...
Yuli Huang [Thu, 3 May 2012 06:02:09 +0000 (23:02 -0700)]
am af0adede: am 37531196: Merge "Fix NPE because of concurrent access in both GL and main threads." into jb-dev

* commit 'af0adedefa3d2a283cfa58390cf7925823bf7fda':
  Fix NPE because of concurrent access in both GL and main threads.

12 years agoam 37531196: Merge "Fix NPE because of concurrent access in both GL and main threads...
Yuli Huang [Thu, 3 May 2012 06:00:44 +0000 (23:00 -0700)]
am 37531196: Merge "Fix NPE because of concurrent access in both GL and main threads." into jb-dev

* commit '37531196bbecc15a8bf035381afeb61279a947ae':
  Fix NPE because of concurrent access in both GL and main threads.

12 years agoMerge "Fix NPE because of concurrent access in both GL and main threads." into jb-dev
Yuli Huang [Thu, 3 May 2012 05:58:51 +0000 (22:58 -0700)]
Merge "Fix NPE because of concurrent access in both GL and main threads." into jb-dev

12 years agoam eb30a86c: am 61f94714: Show/hide action bar at the right time.
Chih-Chung Chang [Thu, 3 May 2012 05:55:22 +0000 (22:55 -0700)]
am eb30a86c: am 61f94714: Show/hide action bar at the right time.

* commit 'eb30a86c5ef0c7e8027ab942d53e2c3c6b780437':
  Show/hide action bar at the right time.

12 years agoam 61f94714: Show/hide action bar at the right time.
Chih-Chung Chang [Thu, 3 May 2012 05:53:45 +0000 (22:53 -0700)]
am 61f94714: Show/hide action bar at the right time.

* commit '61f94714c3702115d2f89bb5f8829697be0c3680':
  Show/hide action bar at the right time.

12 years agoShow/hide action bar at the right time.
Chih-Chung Chang [Wed, 2 May 2012 12:05:16 +0000 (20:05 +0800)]
Show/hide action bar at the right time.

Bug: 6399476

Change-Id: I5046b2e73822ebadd94680f61d87db183b40b5c2

12 years agoam 38045795: am 06c6401e: Turn on unlockOrientation to make onConfigurationChanged...
Pin Ting [Thu, 3 May 2012 05:00:13 +0000 (22:00 -0700)]
am 38045795: am 06c6401e: Turn on unlockOrientation to make onConfigurationChanged in camera work.

* commit '38045795891d4bbc925f068073393ac66cb979c6':
  Turn on unlockOrientation to make onConfigurationChanged in camera work.

12 years agoam 06c6401e: Turn on unlockOrientation to make onConfigurationChanged in camera work.
Pin Ting [Thu, 3 May 2012 04:58:45 +0000 (21:58 -0700)]
am 06c6401e: Turn on unlockOrientation to make onConfigurationChanged in camera work.

* commit '06c6401eededc2ec842ba4994a838c2ded0a666c':
  Turn on unlockOrientation to make onConfigurationChanged in camera work.

12 years agoFix NPE because of concurrent access in both GL and main threads.
Yuli Huang [Wed, 2 May 2012 11:03:54 +0000 (19:03 +0800)]
Fix NPE because of concurrent access in both GL and main threads.

bug:6411187
Change-Id: I811c83f49837ee921436fec0c6b1bf2de0156e0a

12 years agoTurn on unlockOrientation to make onConfigurationChanged in camera work.
Pin Ting [Thu, 3 May 2012 00:26:17 +0000 (08:26 +0800)]
Turn on unlockOrientation to make onConfigurationChanged in camera work.

Bug:6304805
Change-Id: Ia5a8df4153a7ddc7847a8a3744a3537120edb143

12 years agoam 6870d401: (-s ours) am d570731b: Import translations. DO NOT MERGE
Eric Fischer [Wed, 2 May 2012 19:22:38 +0000 (12:22 -0700)]
am 6870d401: (-s ours) am d570731b: Import translations. DO NOT MERGE

* commit '6870d401f34adc29c6f84a70b26689138ede2896':
  Import translations. DO NOT MERGE

12 years agoam d570731b: Import translations. DO NOT MERGE
Eric Fischer [Wed, 2 May 2012 19:20:25 +0000 (12:20 -0700)]
am d570731b: Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 2 May 2012 18:06:33 +0000 (11:06 -0700)]
Import translations. DO NOT MERGE

Change-Id: I173ebbf3160eb55506dc6695b18d6267d3fca885

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 2 May 2012 18:06:12 +0000 (11:06 -0700)]
Import translations. DO NOT MERGE

Change-Id: I80d90a523de8148c14e643b3d81e5d1be7108a86

12 years agoam b0c6de54: am 33f8567d: Fix the Camera controls disappearing after zooming problem.
Chih-Chung Chang [Wed, 2 May 2012 12:55:48 +0000 (05:55 -0700)]
am b0c6de54: am 33f8567d: Fix the Camera controls disappearing after zooming problem.

* commit 'b0c6de54e6555c6be9f13c362aaeae63dc18023d':
  Fix the Camera controls disappearing after zooming problem.

12 years agoam 33f8567d: Fix the Camera controls disappearing after zooming problem.
Chih-Chung Chang [Wed, 2 May 2012 12:53:39 +0000 (05:53 -0700)]
am 33f8567d: Fix the Camera controls disappearing after zooming problem.

* commit '33f8567dd5003e4bb342683f3768ab7552648b02':
  Fix the Camera controls disappearing after zooming problem.

12 years agoFix the Camera controls disappearing after zooming problem.
Chih-Chung Chang [Tue, 1 May 2012 07:35:02 +0000 (15:35 +0800)]
Fix the Camera controls disappearing after zooming problem.

Bug: 6392682
Change-Id: I065c52b44c02f9314e58e82846cdf22e2d940eab

12 years agoam fe2b997f: am f50ce2b7: Fix \'Edit\' and \'Crop\' behaviors.
Yuli Huang [Wed, 2 May 2012 10:46:19 +0000 (03:46 -0700)]
am fe2b997f: am f50ce2b7: Fix \'Edit\' and \'Crop\' behaviors.

* commit 'fe2b997fbbc24d9bb118bf5cb9d36d3b2f38663d':
  Fix 'Edit' and 'Crop' behaviors.

12 years agoam f50ce2b7: Fix \'Edit\' and \'Crop\' behaviors.
Yuli Huang [Wed, 2 May 2012 10:44:58 +0000 (03:44 -0700)]
am f50ce2b7: Fix \'Edit\' and \'Crop\' behaviors.

* commit 'f50ce2b708c0c70930a346206fdd526f53ae6004':
  Fix 'Edit' and 'Crop' behaviors.

12 years agoFix 'Edit' and 'Crop' behaviors.
Yuli Huang [Tue, 1 May 2012 16:50:56 +0000 (00:50 +0800)]
Fix 'Edit' and 'Crop' behaviors.

1. Make Gallery show edited local photo after resuming, similar to how
it shows cropped local photo after resuming.
2. Fix inconsistency between cropping local/PWA photo.

bug:6168430
Change-Id: Ia350e0c67f05969ad42f56b9693c09c3b6433d3c

12 years agoam 32a000c6: am edd4807d: Merge "Change thumbnail\'s position only when it is invisib...
Owen Lin [Wed, 2 May 2012 10:32:19 +0000 (03:32 -0700)]
am 32a000c6: am edd4807d: Merge "Change thumbnail\'s position only when it is invisible." into jb-dev

* commit '32a000c60f5fb18f46f8683df79f89f02574257b':
  Change thumbnail's position only when it is invisible.

12 years agoam d1314e75: am 603f9090: Merge "Fix a issue that we are trying upload a recycled...
Owen Lin [Wed, 2 May 2012 10:32:19 +0000 (03:32 -0700)]
am d1314e75: am 603f9090: Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev

* commit 'd1314e754bfb077ec868848c5b0a639ac2d9a60e':
  Fix a issue that we are trying upload a recycled tile.

12 years agoam cd7842a9: am 0820262b: Merge "Add support to draw on texture." into jb-dev
Owen Lin [Wed, 2 May 2012 10:32:19 +0000 (03:32 -0700)]
am cd7842a9: am 0820262b: Merge "Add support to draw on texture." into jb-dev

* commit 'cd7842a9d3686bf8002f811fe4c21d5fe601ebfb':
  Add support to draw on texture.

12 years agoam edd4807d: Merge "Change thumbnail\'s position only when it is invisible." into...
Owen Lin [Wed, 2 May 2012 10:30:56 +0000 (03:30 -0700)]
am edd4807d: Merge "Change thumbnail\'s position only when it is invisible." into jb-dev

* commit 'edd4807d55c34683fdf87770559bd16a5f9163d7':
  Change thumbnail's position only when it is invisible.

12 years agoam 603f9090: Merge "Fix a issue that we are trying upload a recycled tile." into...
Owen Lin [Wed, 2 May 2012 10:30:49 +0000 (03:30 -0700)]
am 603f9090: Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev

* commit '603f9090bed0908374eda827be2c08a7a1b8d8c2':
  Fix a issue that we are trying upload a recycled tile.

12 years agoam 0820262b: Merge "Add support to draw on texture." into jb-dev
Owen Lin [Wed, 2 May 2012 10:30:48 +0000 (03:30 -0700)]
am 0820262b: Merge "Add support to draw on texture." into jb-dev

* commit '0820262bea846c466706ab488d038747ddcdd747':
  Add support to draw on texture.

12 years agoMerge "Change thumbnail's position only when it is invisible." into jb-dev
Owen Lin [Wed, 2 May 2012 10:29:17 +0000 (03:29 -0700)]
Merge "Change thumbnail's position only when it is invisible." into jb-dev

12 years agoMerge "Fix a issue that we are trying upload a recycled tile." into jb-dev
Owen Lin [Wed, 2 May 2012 10:08:51 +0000 (03:08 -0700)]
Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev

12 years agoMerge "Add support to draw on texture." into jb-dev
Owen Lin [Wed, 2 May 2012 10:08:31 +0000 (03:08 -0700)]
Merge "Add support to draw on texture." into jb-dev

12 years agoChange thumbnail's position only when it is invisible.
Owen Lin [Wed, 2 May 2012 09:22:52 +0000 (17:22 +0800)]
Change thumbnail's position only when it is invisible.

bug:6393694
Change-Id: I33f41c3c894b4c6d28e0832cfd4badbfca3a4f64

12 years agoAdd support to draw on texture.
Owen Lin [Tue, 24 Apr 2012 06:08:44 +0000 (14:08 +0800)]
Add support to draw on texture.

Change-Id: I95dd5d29352692b702503969e1ebe07bc91a8a73

12 years agoam fd2347f6: am eea90e65: Merge "Fix photo rotates incorrectly in crop image." into...
Owen Lin [Wed, 2 May 2012 07:36:11 +0000 (00:36 -0700)]
am fd2347f6: am eea90e65: Merge "Fix photo rotates incorrectly in crop image." into jb-dev

* commit 'fd2347f60dbb11de6f4c3e3bbe48471dace3f848':
  Fix photo rotates incorrectly in crop image.

12 years agoam eea90e65: Merge "Fix photo rotates incorrectly in crop image." into jb-dev
Owen Lin [Wed, 2 May 2012 07:33:51 +0000 (00:33 -0700)]
am eea90e65: Merge "Fix photo rotates incorrectly in crop image." into jb-dev

* commit 'eea90e65dcfcd1c9b2c8cfcbb9b20855f380a72a':
  Fix photo rotates incorrectly in crop image.

12 years agoFix a issue that we are trying upload a recycled tile.
Owen Lin [Fri, 27 Apr 2012 10:17:35 +0000 (18:17 +0800)]
Fix a issue that we are trying upload a recycled tile.

bug:5779992
Change-Id: I2503c87e9cea4e8b0ad5250b1508d06f44125779

12 years agoMerge "Fix photo rotates incorrectly in crop image." into jb-dev
Owen Lin [Wed, 2 May 2012 07:31:16 +0000 (00:31 -0700)]
Merge "Fix photo rotates incorrectly in crop image." into jb-dev

12 years agoam d42f82b3: (-s ours) am 814360ae: Merge "Import translations. DO NOT MERGE" into...
Eric Fischer [Tue, 1 May 2012 20:33:33 +0000 (13:33 -0700)]
am d42f82b3: (-s ours) am 814360ae: Merge "Import translations. DO NOT MERGE" into jb-dev

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

12 years agoam 814360ae: Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 1 May 2012 20:31:26 +0000 (13:31 -0700)]
am 814360ae: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '814360ae97d59e333440076b5517fff0c6be5ca9':
  Import translations. DO NOT MERGE

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 1 May 2012 20:29:02 +0000 (13:29 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 1 May 2012 20:28:45 +0000 (13:28 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 1 May 2012 18:36:20 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE

Change-Id: I40d1d3dafb1bb71b6478dbfd56afc630b962113d

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 1 May 2012 18:36:07 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE

Change-Id: I17da847d9cf238a770caa867bd27ea227797d71f

12 years agoam a1630d9f: (-s ours) am 1f0f6c7e: Import translations. DO NOT MERGE
Eric Fischer [Tue, 1 May 2012 17:37:40 +0000 (10:37 -0700)]
am a1630d9f: (-s ours) am 1f0f6c7e: Import translations. DO NOT MERGE

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

12 years agoam 1f0f6c7e: Import translations. DO NOT MERGE
Eric Fischer [Tue, 1 May 2012 17:35:30 +0000 (10:35 -0700)]
am 1f0f6c7e: Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 1 May 2012 17:28:25 +0000 (10:28 -0700)]
Import translations. DO NOT MERGE

Change-Id: I166d8c1f6827bc0fac7b4f0436f59aac67394633

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 1 May 2012 17:28:09 +0000 (10:28 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5a1227b0df7f6744d13a263ea433ccadccc76be8

12 years agoam 43c69e0d: am dd97a122: Increase localization string limit.
Yuli Huang [Tue, 1 May 2012 15:01:39 +0000 (08:01 -0700)]
am 43c69e0d: am dd97a122: Increase localization string limit.

* commit '43c69e0df9fd0f1237e1d05ecb8b40ca0f06bfb5':
  Increase localization string limit.

12 years agoam dd97a122: Increase localization string limit.
Yuli Huang [Tue, 1 May 2012 14:59:46 +0000 (07:59 -0700)]
am dd97a122: Increase localization string limit.

* commit 'dd97a122cc8992c31d0ded4313b925fa5612dbf1':
  Increase localization string limit.

12 years agoam b5d5adf0: am 86c2de0e: am 5e73eda6: Merge "Add missing xhdpi icon to Gallery2"
Jean-Baptiste Queru [Tue, 1 May 2012 13:52:38 +0000 (06:52 -0700)]
am b5d5adf0: am 86c2de0e: am 5e73eda6: Merge "Add missing xhdpi icon to Gallery2"

* commit 'b5d5adf0c803132245bdb7202fe0cd6a7e5043c4':
  Add missing xhdpi icon to Gallery2

12 years agoam 86c2de0e: am 5e73eda6: Merge "Add missing xhdpi icon to Gallery2"
Jean-Baptiste Queru [Tue, 1 May 2012 13:49:54 +0000 (06:49 -0700)]
am 86c2de0e: am 5e73eda6: Merge "Add missing xhdpi icon to Gallery2"

* commit '86c2de0e1e09633be5e2de56ecb2a7efcc08305e':
  Add missing xhdpi icon to Gallery2

12 years agoam 5e73eda6: Merge "Add missing xhdpi icon to Gallery2"
Jean-Baptiste Queru [Tue, 1 May 2012 13:46:18 +0000 (06:46 -0700)]
am 5e73eda6: Merge "Add missing xhdpi icon to Gallery2"

* commit '5e73eda63d73a3e0f94d6ef633d7704e31b8e48e':
  Add missing xhdpi icon to Gallery2

12 years agoMerge "Add missing xhdpi icon to Gallery2"
Jean-Baptiste Queru [Tue, 1 May 2012 12:52:33 +0000 (05:52 -0700)]
Merge "Add missing xhdpi icon to Gallery2"

12 years agoIncrease localization string limit.
Yuli Huang [Mon, 30 Apr 2012 23:12:23 +0000 (07:12 +0800)]
Increase localization string limit.

bug:6421026
Change-Id: I8a296c37287605680eaaeda5765257cf45d5fc8e

12 years agoam 654f786f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Mon, 30 Apr 2012 21:03:48 +0000 (14:03 -0700)]
am 654f786f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '654f786f369a2740435fc27a728d85ae2504d429':
  Import translations. DO NOT MERGE

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Mon, 30 Apr 2012 20:56:43 +0000 (13:56 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Mon, 30 Apr 2012 20:56:32 +0000 (13:56 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoam 642ed688: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Mon, 30 Apr 2012 20:13:34 +0000 (13:13 -0700)]
am 642ed688: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '642ed688019936b7bab712977f30c28659da63cb':
  Import translations. DO NOT MERGE

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Mon, 30 Apr 2012 20:06:33 +0000 (13:06 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Mon, 30 Apr 2012 20:06:21 +0000 (13:06 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoam 50213b69: Merge "Don\'t enter film mode automatically when moving from camera...
Wei Huang [Mon, 30 Apr 2012 20:01:00 +0000 (13:01 -0700)]
am 50213b69: Merge "Don\'t enter film mode automatically when moving from camera preview to picture." into jb-dev

* commit '50213b692c09a0121d066d8e1101ec253898e934':
  Don't enter film mode automatically when moving from camera preview to picture.

12 years agoMerge "Don't enter film mode automatically when moving from camera preview to picture...
Wei Huang [Mon, 30 Apr 2012 19:56:30 +0000 (12:56 -0700)]
Merge "Don't enter film mode automatically when moving from camera preview to picture." into jb-dev

12 years agoDon't enter film mode automatically when moving from camera preview to picture.
Chih-Chung Chang [Mon, 30 Apr 2012 18:58:59 +0000 (02:58 +0800)]
Don't enter film mode automatically when moving from camera preview to picture.

Also don't follow the scaling touch once we decide to change film mode, this makes the animation smoother.

Change-Id: I45f97bd8c3cc90666370afeb1c18d21dfcc87c06

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 30 Apr 2012 18:50:37 +0000 (11:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: I81d0c999c8cc273044a4b8fbab92f6223ddd4654

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 30 Apr 2012 18:50:26 +0000 (11:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iaa63de7b4ec73667fb08073608aec374dbc9529c

12 years agoam acac98ca: Merge "Fix black screen when viewing Gmail image file attachment. Bug...
Chih-Chung Chang [Mon, 30 Apr 2012 18:33:13 +0000 (11:33 -0700)]
am acac98ca: Merge "Fix black screen when viewing Gmail image file attachment. Bug: 6415848" into jb-dev

* commit 'acac98ca45868dffc77efab154b07d3842879760':
  Fix black screen when viewing Gmail image file attachment. Bug: 6415848

12 years agoMerge "Fix black screen when viewing Gmail image file attachment. Bug: 6415848" into...
Chih-Chung Chang [Mon, 30 Apr 2012 18:27:28 +0000 (11:27 -0700)]
Merge "Fix black screen when viewing Gmail image file attachment. Bug: 6415848" into jb-dev

12 years agoFix black screen when viewing Gmail image file attachment.
Chih-Chung Chang [Mon, 30 Apr 2012 18:25:09 +0000 (02:25 +0800)]
Fix black screen when viewing Gmail image file attachment.
Bug: 6415848

Change-Id: Iec369866be6b5546fbd8cb77eb95a29f92e00b84

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 30 Apr 2012 17:45:24 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie9afe62f6e6189c1053bf72da89eaab4e902bb64

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 30 Apr 2012 17:45:08 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idb5ec471d418db5894e27985b90b9c2d57575660

12 years agoam 57263d33: Fix crash when select all is pressed.
Wu-cheng Li [Mon, 30 Apr 2012 17:23:57 +0000 (10:23 -0700)]
am 57263d33: Fix crash when select all is pressed.

* commit '57263d33064e4fce39b88b54f73e425f66a550eb':
  Fix crash when select all is pressed.

12 years agoFix crash when select all is pressed.
Wu-cheng Li [Mon, 30 Apr 2012 15:49:17 +0000 (23:49 +0800)]
Fix crash when select all is pressed.

bug:6411186
Change-Id: Iaa71a320bc4d6d70aade41d5144f75ba6db36e6d

12 years agoam b1e9fd89: Fix Back behavior in gallery grid and remove camera preview tile.
Chih-Chung Chang [Mon, 30 Apr 2012 11:40:48 +0000 (04:40 -0700)]
am b1e9fd89: Fix Back behavior in gallery grid and remove camera preview tile.

* commit 'b1e9fd893d62adae1f92d29dfc08bc76f8764491':
  Fix Back behavior in gallery grid and remove camera preview tile.

12 years agoFix Back behavior in gallery grid and remove camera preview tile.
Chih-Chung Chang [Mon, 30 Apr 2012 09:33:21 +0000 (17:33 +0800)]
Fix Back behavior in gallery grid and remove camera preview tile.

Bug: 6411801
Bug: 6411709

Change-Id: Iebd7db06d44d315ac67eb8c5133b86044fce30c4

12 years agoam 82af7be9: Merge "Expose delete button in action bar in portrait." into jb-dev
Wu-cheng Li [Mon, 30 Apr 2012 10:48:07 +0000 (03:48 -0700)]
am 82af7be9: Merge "Expose delete button in action bar in portrait." into jb-dev

* commit '82af7be9e2053965ee4f524cae4912b20ccbd8fa':
  Expose delete button in action bar in portrait.

12 years agoam b5dc542f: Do not show action bar on camera.
Wu-cheng Li [Mon, 30 Apr 2012 10:44:58 +0000 (03:44 -0700)]
am b5dc542f: Do not show action bar on camera.

* commit 'b5dc542fbaeaf99bebdcf775ef0e034e89e88eae':
  Do not show action bar on camera.

12 years agoMerge "Expose delete button in action bar in portrait." into jb-dev
Wu-cheng Li [Mon, 30 Apr 2012 10:44:31 +0000 (03:44 -0700)]
Merge "Expose delete button in action bar in portrait." into jb-dev

12 years agoDo not show action bar on camera.
Wu-cheng Li [Mon, 30 Apr 2012 10:36:22 +0000 (18:36 +0800)]
Do not show action bar on camera.

bug:6411406
Change-Id: I4fbb95c9913046b4d5b1cfa4ede10490d156ed3f

12 years agoam 3d99b968: Merge "Use gallery icon for action bar app icon in camera." into jb-dev
Wu-cheng Li [Mon, 30 Apr 2012 10:01:17 +0000 (03:01 -0700)]
am 3d99b968: Merge "Use gallery icon for action bar app icon in camera." into jb-dev

* commit '3d99b968eef7d81ca34420d437d48cacb4ce94bd':
  Use gallery icon for action bar app icon in camera.

12 years agoMerge "Use gallery icon for action bar app icon in camera." into jb-dev
Wu-cheng Li [Mon, 30 Apr 2012 09:57:11 +0000 (02:57 -0700)]
Merge "Use gallery icon for action bar app icon in camera." into jb-dev

12 years agoUse gallery icon for action bar app icon in camera.
Wu-cheng Li [Mon, 30 Apr 2012 09:43:01 +0000 (17:43 +0800)]
Use gallery icon for action bar app icon in camera.

bug:6410923
Change-Id: Ie5b7c5a6b852ed59b61ee0cc4e462dee991167b8