OSDN Git Service

android-x86/packages-apps-Gallery2.git
12 years agoam 43db778f: am c2f441dc: Merge "Mark FileCache initialized after init really goes...
Hung-ying Tyan [Wed, 9 May 2012 17:11:53 +0000 (10:11 -0700)]
am 43db778f: am c2f441dc: Merge "Mark FileCache initialized after init really goes through." into jb-dev

* commit '43db778f6b5206b2c9e3a429f0fefccd98b87d0a':
  Mark FileCache initialized after init really goes through.

12 years agoam d48bc97b: am 11a3c9c6: Merge "Fix 6360834 Select All is shown in place of Deselect...
Ray Chen [Wed, 9 May 2012 17:11:52 +0000 (10:11 -0700)]
am d48bc97b: am 11a3c9c6: Merge "Fix 6360834 Select All is shown in place of Deselect all option" into jb-dev

* commit 'd48bc97be8709cc227b0f82f1296fd5b98932c2c':
  Fix 6360834 Select All is shown in place of Deselect all option

12 years agoam 4f7f1090: am 78d5dac0: Crop-image doesn\'t show its title in the action-bar.
Yuli Huang [Wed, 9 May 2012 17:11:52 +0000 (10:11 -0700)]
am 4f7f1090: am 78d5dac0: Crop-image doesn\'t show its title in the action-bar.

* commit '4f7f109070a8940dfa7e1992a9f7e2fec6e4bf00':
  Crop-image doesn't show its title in the action-bar.

12 years agoam e722b26f: (-s ours) am b79e7627: Import translations. DO NOT MERGE
Eric Fischer [Wed, 9 May 2012 17:11:51 +0000 (10:11 -0700)]
am e722b26f: (-s ours) am b79e7627: Import translations. DO NOT MERGE

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

12 years agoam 8bd75ae0: am 2ef46ed2: Better orientation change handling.
Chih-Chung Chang [Wed, 9 May 2012 17:11:51 +0000 (10:11 -0700)]
am 8bd75ae0: am 2ef46ed2: Better orientation change handling.

* commit '8bd75ae0a35105eddb885f6377d73d26159b8820':
  Better orientation change handling.

12 years agoam 2c7dccde: am ec9a0335: Keep the last page if finish() is rejected.
Owen Lin [Wed, 9 May 2012 17:11:50 +0000 (10:11 -0700)]
am 2c7dccde: am ec9a0335: Keep the last page if finish() is rejected.

* commit '2c7dccde7734643fd6e1a68b769c383c587b7601':
  Keep the last page if finish() is rejected.

12 years agoam c2f441dc: Merge "Mark FileCache initialized after init really goes through." into...
Hung-ying Tyan [Wed, 9 May 2012 08:50:16 +0000 (01:50 -0700)]
am c2f441dc: Merge "Mark FileCache initialized after init really goes through." into jb-dev

* commit 'c2f441dc1ed400dc446240e9360eeff3d8c8f07c':
  Mark FileCache initialized after init really goes through.

12 years agoam 11a3c9c6: Merge "Fix 6360834 Select All is shown in place of Deselect all option...
Ray Chen [Wed, 9 May 2012 08:49:59 +0000 (01:49 -0700)]
am 11a3c9c6: Merge "Fix 6360834 Select All is shown in place of Deselect all option" into jb-dev

* commit '11a3c9c68185f05eb390697f5c037c6000aea6de':
  Fix 6360834 Select All is shown in place of Deselect all option

12 years agoam 78d5dac0: Crop-image doesn\'t show its title in the action-bar.
Yuli Huang [Wed, 9 May 2012 08:49:59 +0000 (01:49 -0700)]
am 78d5dac0: Crop-image doesn\'t show its title in the action-bar.

* commit '78d5dac00fd19fdc34269aae7653f9f4839dc357':
  Crop-image doesn't show its title in the action-bar.

12 years agoam b79e7627: Import translations. DO NOT MERGE
Eric Fischer [Wed, 9 May 2012 08:48:01 +0000 (01:48 -0700)]
am b79e7627: Import translations. DO NOT MERGE

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

12 years agoam 2ef46ed2: Better orientation change handling.
Chih-Chung Chang [Wed, 9 May 2012 08:46:22 +0000 (01:46 -0700)]
am 2ef46ed2: Better orientation change handling.

* commit '2ef46ed28b28b355d7f3f1432c7b1196b832a859':
  Better orientation change handling.

12 years agoam ec9a0335: Keep the last page if finish() is rejected.
Owen Lin [Wed, 9 May 2012 08:46:19 +0000 (01:46 -0700)]
am ec9a0335: Keep the last page if finish() is rejected.

* commit 'ec9a033559f34e5407387cb7d095aee27ddc337b':
  Keep the last page if finish() is rejected.

12 years agoMerge "Mark FileCache initialized after init really goes through." into jb-dev
Hung-ying Tyan [Wed, 9 May 2012 08:08:46 +0000 (01:08 -0700)]
Merge "Mark FileCache initialized after init really goes through." into jb-dev

12 years agoMerge "Fix 6360834 Select All is shown in place of Deselect all option" into jb-dev
Ray Chen [Wed, 9 May 2012 03:54:30 +0000 (20:54 -0700)]
Merge "Fix 6360834 Select All is shown in place of Deselect all option" into jb-dev

12 years agoCrop-image doesn't show its title in the action-bar.
Yuli Huang [Wed, 9 May 2012 03:01:11 +0000 (11:01 +0800)]
Crop-image doesn't show its title in the action-bar.

bug:6464608
Change-Id: I7b463beaa96f5f475812ec4f0c3de1118a6d0895

12 years agoMark FileCache initialized after init really goes through.
Hung-ying Tyan [Wed, 9 May 2012 02:38:11 +0000 (10:38 +0800)]
Mark FileCache initialized after init really goes through.

Bug: 5988196
Change-Id: Ia826ce6a33c200a2cd09c21d7ef22f4dd161caa9

12 years agoFix 6360834 Select All is shown in place of Deselect all option
Ray Chen [Thu, 3 May 2012 05:10:51 +0000 (13:10 +0800)]
Fix 6360834 Select All is shown in place of Deselect all option

The CL changes the SelectionManager's toggle method so it changes itself to
inverse selection mode when all items are already selected, and onSelectionModeChange
will be triggered so the listener can update the selection menu (Select all/Deselect all)
and ActionBar.

Change-Id: I570a299cc8fd7d1d5acab948f9c6531a9adde486
b: 6360834

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

Change-Id: I92195544c0e69468c5aab4e7132d6e5d8ce53945

12 years agoam 67ef88e7: (-s ours) am dc0e7625: Import translations. DO NOT MERGE
Eric Fischer [Tue, 8 May 2012 18:32:18 +0000 (11:32 -0700)]
am 67ef88e7: (-s ours) am dc0e7625: Import translations. DO NOT MERGE

* commit '67ef88e7f29283e2dce92f7267d3f07e169408b6':
  Import translations. DO NOT MERGE

12 years agoBetter orientation change handling.
Chih-Chung Chang [Tue, 8 May 2012 09:57:33 +0000 (17:57 +0800)]
Better orientation change handling.

Bug 6451117: Preview location is wrong after rotating the device quickly
Bug 6444303: The preview location is wrong when camera is started upside down on tablet
Bug 6451710: Tap to focus broken in landscape

Change-Id: I12fd57d6618ec5521ccc6efcbf65de57ff2ea3d2

12 years agoKeep the last page if finish() is rejected.
Owen Lin [Fri, 4 May 2012 03:46:29 +0000 (11:46 +0800)]
Keep the last page if finish() is rejected.

bug: 6414642
Change-Id: I480edc43608c08088177113cb3607d517c91e9f6

12 years agoam dc0e7625: Import translations. DO NOT MERGE
Eric Fischer [Mon, 7 May 2012 20:17:12 +0000 (13:17 -0700)]
am dc0e7625: Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 7 May 2012 19:09:40 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia266db1c3715c642e2035b8d0b7b269d07a0a0f6

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 7 May 2012 19:09:28 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie522d1506aea36e73a326270218df5ba0fd5c4a5

12 years agoam ae7f737d: am 625d51a1: Fix back-button\'s behavior in Crop.
Yuli Huang [Mon, 7 May 2012 16:03:23 +0000 (09:03 -0700)]
am ae7f737d: am 625d51a1: Fix back-button\'s behavior in Crop.

* commit 'ae7f737d29f2298a7f2f8e64672776895b96cd3a':
  Fix back-button's behavior in Crop.

12 years agoam 625d51a1: Fix back-button\'s behavior in Crop.
Yuli Huang [Mon, 7 May 2012 16:00:52 +0000 (09:00 -0700)]
am 625d51a1: Fix back-button\'s behavior in Crop.

* commit '625d51a1d6e8cbc5884fdcdddeebcd85454935da':
  Fix back-button's behavior in Crop.

12 years agoFix back-button's behavior in Crop.
Yuli Huang [Mon, 7 May 2012 15:35:42 +0000 (23:35 +0800)]
Fix back-button's behavior in Crop.

bug:6452504
Change-Id: Ic11dd58c613764e3e6cf7a35135678777e49a4ef

12 years agoam 5cc74cb6: am 194feaf5: Merge "Set default buffer size for SurfaceTexture." into...
Chih-Chung Chang [Mon, 7 May 2012 14:52:20 +0000 (07:52 -0700)]
am 5cc74cb6: am 194feaf5: Merge "Set default buffer size for SurfaceTexture." into jb-dev

* commit '5cc74cb64f20d106e9214cbfd0daabf364ed5249':
  Set default buffer size for SurfaceTexture.

12 years agoam 194feaf5: Merge "Set default buffer size for SurfaceTexture." into jb-dev
Chih-Chung Chang [Mon, 7 May 2012 14:49:30 +0000 (07:49 -0700)]
am 194feaf5: Merge "Set default buffer size for SurfaceTexture." into jb-dev

* commit '194feaf54ddf55455c22ddfd2812f8dc0ed9d25b':
  Set default buffer size for SurfaceTexture.

12 years agoMerge "Set default buffer size for SurfaceTexture." into jb-dev
Chih-Chung Chang [Mon, 7 May 2012 14:47:27 +0000 (07:47 -0700)]
Merge "Set default buffer size for SurfaceTexture." into jb-dev

12 years agoam c51ad6ef: am 4b69c5f5: Remove PhotoPage spinner shown in the action-bar.
Yuli Huang [Mon, 7 May 2012 14:18:12 +0000 (07:18 -0700)]
am c51ad6ef: am 4b69c5f5: Remove PhotoPage spinner shown in the action-bar.

* commit 'c51ad6ef8510dc5ba06616e9f1d36cb21db8ab74':
  Remove PhotoPage spinner shown in the action-bar.

12 years agoam 4b69c5f5: Remove PhotoPage spinner shown in the action-bar.
Yuli Huang [Mon, 7 May 2012 14:15:22 +0000 (07:15 -0700)]
am 4b69c5f5: Remove PhotoPage spinner shown in the action-bar.

* commit '4b69c5f52e8ef3209bc0b6889c4a6355614607ca':
  Remove PhotoPage spinner shown in the action-bar.

12 years agoRemove PhotoPage spinner shown in the action-bar.
Yuli Huang [Mon, 7 May 2012 07:05:41 +0000 (15:05 +0800)]
Remove PhotoPage spinner shown in the action-bar.

Remove spinners shown for loading data out of view.
bug:5406790

Change-Id: Iffaf97937b86b869559a27f190941c1de263e422

12 years agoam d1d86037: am 8f1c528d: Merge "Add UNIQUE to EntrySchema." into jb-dev
Hung-ying Tyan [Mon, 7 May 2012 11:52:55 +0000 (04:52 -0700)]
am d1d86037: am 8f1c528d: Merge "Add UNIQUE to EntrySchema." into jb-dev

* commit 'd1d86037aa7170fc8c76da4879eecd405931bc07':
  Add UNIQUE to EntrySchema.

12 years agoam 45a5a26e: am 5e1b1159: Add \'process\' attribute for PhotoEditor.
Yuli Huang [Mon, 7 May 2012 11:52:54 +0000 (04:52 -0700)]
am 45a5a26e: am 5e1b1159: Add \'process\' attribute for PhotoEditor.

* commit '45a5a26efd45113cc981acc98d3d16a331b091f0':
  Add 'process' attribute for PhotoEditor.

12 years agoam 8f1c528d: Merge "Add UNIQUE to EntrySchema." into jb-dev
Hung-ying Tyan [Mon, 7 May 2012 11:50:10 +0000 (04:50 -0700)]
am 8f1c528d: Merge "Add UNIQUE to EntrySchema." into jb-dev

* commit '8f1c528dde90caf2d667634f769772cdac1d674d':
  Add UNIQUE to EntrySchema.

12 years agoam 5e1b1159: Add \'process\' attribute for PhotoEditor.
Yuli Huang [Mon, 7 May 2012 11:50:01 +0000 (04:50 -0700)]
am 5e1b1159: Add \'process\' attribute for PhotoEditor.

* commit '5e1b1159cb4e9cde0c92ef5a873ab4bae094314c':
  Add 'process' attribute for PhotoEditor.

12 years agoMerge "Add UNIQUE to EntrySchema." into jb-dev
Hung-ying Tyan [Mon, 7 May 2012 11:33:41 +0000 (04:33 -0700)]
Merge "Add UNIQUE to EntrySchema." into jb-dev

12 years agoSet default buffer size for SurfaceTexture.
Chih-Chung Chang [Mon, 7 May 2012 11:00:53 +0000 (19:00 +0800)]
Set default buffer size for SurfaceTexture.

This is needed for Panorama.

Change-Id: I452335cfec6357aef7b66ecac003a4b0ca0fd9fe

12 years agoAdd 'process' attribute for PhotoEditor.
Yuli Huang [Mon, 7 May 2012 10:13:29 +0000 (18:13 +0800)]
Add 'process' attribute for PhotoEditor.

PhotoEditor, similar to CropImage, demands much memory and should run in
another process to avoid OOM because of too fragmented memory.
bug:6318340

Change-Id: Ic5a71959435f66b8b7bc9b1c80baf8a70ccfecaf

12 years agoam 415474d0: am ba12eae9: Add transition for card deck effect.
Chih-Chung Chang [Mon, 7 May 2012 07:55:34 +0000 (00:55 -0700)]
am 415474d0: am ba12eae9: Add transition for card deck effect.

* commit '415474d0d79194fcb2b13a5464d6da9f02ecd4ac':
  Add transition for card deck effect.

12 years agoam ba12eae9: Add transition for card deck effect.
Chih-Chung Chang [Mon, 7 May 2012 07:52:45 +0000 (00:52 -0700)]
am ba12eae9: Add transition for card deck effect.

* commit 'ba12eae90b5b1a80ee002aa0df8c5c5189c4faa3':
  Add transition for card deck effect.

12 years agoAdd transition for card deck effect.
Chih-Chung Chang [Sun, 6 May 2012 18:29:37 +0000 (02:29 +0800)]
Add transition for card deck effect.

Bug 6442785: Controls disappear & preview surface gets warped after deleting just taken video
Bug 6399861: Filmstrip: Pinch-out animation in fullscreen photo > filmstrip should be metaphorically consistent with the stack of cards model
Bug 6429677: Gray shadow shows up when start

Change-Id: I408cf250e67b4def20f5f15621fe57d7845c90f9

12 years agoam 6b7f29a6: am 6575794a: Fix 6429662: Video snapshot doesn\'t work
Chih-Chung Chang [Mon, 7 May 2012 05:05:09 +0000 (22:05 -0700)]
am 6b7f29a6: am 6575794a: Fix 6429662: Video snapshot doesn\'t work

* commit '6b7f29a6b5f48fe3b4f131ae82688de020b9a25c':
  Fix 6429662: Video snapshot doesn't work

12 years agoam 1945e5f8: am d9355113: Put play video icon at the same place of the screennails.
Chih-Chung Chang [Mon, 7 May 2012 05:05:03 +0000 (22:05 -0700)]
am 1945e5f8: am d9355113: Put play video icon at the same place of the screennails.

* commit '1945e5f8a6e153f986a7d344a57fda4eaa762ae7':
  Put play video icon at the same place of the screennails.

12 years agoam 6575794a: Fix 6429662: Video snapshot doesn\'t work
Chih-Chung Chang [Mon, 7 May 2012 05:02:27 +0000 (22:02 -0700)]
am 6575794a: Fix 6429662: Video snapshot doesn\'t work

* commit '6575794a9c09f22d5721e212c093e0a2df376d0c':
  Fix 6429662: Video snapshot doesn't work

12 years agoam d9355113: Put play video icon at the same place of the screennails.
Chih-Chung Chang [Mon, 7 May 2012 05:02:26 +0000 (22:02 -0700)]
am d9355113: Put play video icon at the same place of the screennails.

* commit 'd9355113da391f8bbddef1d2a2126ce6edc72291':
  Put play video icon at the same place of the screennails.

12 years agoam 61b079eb: am 66ca848b: Tapping on the camera icon no matter what should open camera.
Chih-Chung Chang [Mon, 7 May 2012 03:24:29 +0000 (20:24 -0700)]
am 61b079eb: am 66ca848b: Tapping on the camera icon no matter what should open camera.

* commit '61b079eb67fe8ff3449070e1cc62344c22096de9':
  Tapping on the camera icon no matter what should open camera.

12 years agoam 66ca848b: Tapping on the camera icon no matter what should open camera.
Chih-Chung Chang [Mon, 7 May 2012 03:22:57 +0000 (20:22 -0700)]
am 66ca848b: Tapping on the camera icon no matter what should open camera.

* commit '66ca848b2f58b813d366642088d274a1b7c4a90c':
  Tapping on the camera icon no matter what should open camera.

12 years agoFix 6429662: Video snapshot doesn't work
Chih-Chung Chang [Sat, 5 May 2012 19:25:16 +0000 (03:25 +0800)]
Fix 6429662: Video snapshot doesn't work

Change-Id: I6414be7f00ee103b7047128fdc92e03ca87c7703

12 years agoPut play video icon at the same place of the screennails.
Chih-Chung Chang [Sat, 5 May 2012 17:24:22 +0000 (01:24 +0800)]
Put play video icon at the same place of the screennails.

Bug: 6412197
Change-Id: Idaae46c598035639907a85f726b763b80bd9572d

12 years agoTapping on the camera icon no matter what should open camera.
Chih-Chung Chang [Fri, 4 May 2012 13:54:01 +0000 (21:54 +0800)]
Tapping on the camera icon no matter what should open camera.

Bug: 6437677
Change-Id: I41ead463652c11986825744465f181ca75674c60

12 years agoam f93fa04f: am 4b24522a: Merge "Add support for Beaming multiple pictures." into...
Martijn Coenen [Sat, 5 May 2012 17:58:32 +0000 (10:58 -0700)]
am f93fa04f: am 4b24522a: Merge "Add support for Beaming multiple pictures." into jb-dev

* commit 'f93fa04fb3b449b1cf3ec838ee365ded7608a8fd':
  Add support for Beaming multiple pictures.

12 years agoam 4b24522a: Merge "Add support for Beaming multiple pictures." into jb-dev
Martijn Coenen [Sat, 5 May 2012 17:55:49 +0000 (10:55 -0700)]
am 4b24522a: Merge "Add support for Beaming multiple pictures." into jb-dev

* commit '4b24522afa79ccee3b021d57fcd475f476014585':
  Add support for Beaming multiple pictures.

12 years agoMerge "Add support for Beaming multiple pictures." into jb-dev
Martijn Coenen [Sat, 5 May 2012 17:53:58 +0000 (10:53 -0700)]
Merge "Add support for Beaming multiple pictures." into jb-dev

12 years agoam a74fb3ec: am 88cc2ca5: Fix a TODO by replacing a string.
Yuli Huang [Sat, 5 May 2012 10:32:48 +0000 (03:32 -0700)]
am a74fb3ec: am 88cc2ca5: Fix a TODO by replacing a string.

* commit 'a74fb3ecde26749f23b4613f6823505f38e7ee5d':
  Fix a TODO by replacing a string.

12 years agoam 88cc2ca5: Fix a TODO by replacing a string.
Yuli Huang [Sat, 5 May 2012 10:30:53 +0000 (03:30 -0700)]
am 88cc2ca5: Fix a TODO by replacing a string.

* commit '88cc2ca5f5596762a5546ec7426756f2036be455':
  Fix a TODO by replacing a string.

12 years agoFix a TODO by replacing a string.
Yuli Huang [Sat, 5 May 2012 09:42:32 +0000 (17:42 +0800)]
Fix a TODO by replacing a string.

Change-Id: I17216e0ca83a185842bc69151fcf8c5136e2b873

12 years agoam fe77cad5: am c2fcc7a6: Don\'t show spinner to avoid janky transition.
Yuli Huang [Sat, 5 May 2012 09:42:29 +0000 (02:42 -0700)]
am fe77cad5: am c2fcc7a6: Don\'t show spinner to avoid janky transition.

* commit 'fe77cad5114cc5d19843ca93feefe1a5e9d7dab0':
  Don't show spinner to avoid janky transition.

12 years agoam c2fcc7a6: Don\'t show spinner to avoid janky transition.
Yuli Huang [Sat, 5 May 2012 09:40:38 +0000 (02:40 -0700)]
am c2fcc7a6: Don\'t show spinner to avoid janky transition.

* commit 'c2fcc7a681070e6c1d024ecf60b6a2a3e3f1a68b':
  Don't show spinner to avoid janky transition.

12 years agoDon't show spinner to avoid janky transition.
Yuli Huang [Thu, 3 May 2012 15:36:51 +0000 (23:36 +0800)]
Don't show spinner to avoid janky transition.

bug:5406790
Change-Id: Ieea09f43d5230e1507c16001ec12b3ea6e3c3f0e

12 years agoam d9954e12: (-s ours) am 3191875f: Import translations. DO NOT MERGE
Eric Fischer [Fri, 4 May 2012 20:30:05 +0000 (13:30 -0700)]
am d9954e12: (-s ours) am 3191875f: Import translations. DO NOT MERGE

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

12 years agoam 3191875f: Import translations. DO NOT MERGE
Eric Fischer [Fri, 4 May 2012 20:27:13 +0000 (13:27 -0700)]
am 3191875f: Import translations. DO NOT MERGE

* commit '3191875f78461ae828d689e9607ff152adbc73fe':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 4 May 2012 19:05:17 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7f9521775fb29c3d2fb4b65165600167c9ee9706

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 4 May 2012 19:05:03 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1e32bdca2eaa33696ebf0ef14df3c78de98e99d9

12 years agoAdd UNIQUE to EntrySchema.
Hung-ying Tyan [Fri, 4 May 2012 10:07:48 +0000 (18:07 +0800)]
Add UNIQUE to EntrySchema.

Change-Id: I0fbf69a60aafe8d7a82241467d077c48beadbf49

12 years agoam f44bad78: am afb49dcc: Use activity-alias to disable camera icon dynamically.
Chih-Chung Chang [Fri, 4 May 2012 08:34:26 +0000 (01:34 -0700)]
am f44bad78: am afb49dcc: Use activity-alias to disable camera icon dynamically.

* commit 'f44bad78efc5a3fd3f07bbf88f57e8c0de279649':
  Use activity-alias to disable camera icon dynamically.

12 years agoam 88db064e: am 17ffedda: Fix 6399813: tapping on a photo that isn\'t in the middle...
Chih-Chung Chang [Fri, 4 May 2012 08:34:26 +0000 (01:34 -0700)]
am 88db064e: am 17ffedda: Fix 6399813: tapping on a photo that isn\'t in the middle of the screen doesn\'t select it.

* commit '88db064e5c19c8401ba6b0757779f28cd063b9e5':
  Fix 6399813: tapping on a photo that isn't in the middle of the screen doesn't select it.

12 years agoam afb49dcc: Use activity-alias to disable camera icon dynamically.
Chih-Chung Chang [Fri, 4 May 2012 08:32:37 +0000 (01:32 -0700)]
am afb49dcc: Use activity-alias to disable camera icon dynamically.

* commit 'afb49dcc1e3d6db6364cdc35d42e694803b3475e':
  Use activity-alias to disable camera icon dynamically.

12 years agoam 17ffedda: Fix 6399813: tapping on a photo that isn\'t in the middle of the screen...
Chih-Chung Chang [Fri, 4 May 2012 08:32:36 +0000 (01:32 -0700)]
am 17ffedda: Fix 6399813: tapping on a photo that isn\'t in the middle of the screen doesn\'t select it.

* commit '17ffedda6e3ed57b38afbb775594cf30d83fc652':
  Fix 6399813: tapping on a photo that isn't in the middle of the screen doesn't select it.

12 years agoUse activity-alias to disable camera icon dynamically.
Chih-Chung Chang [Fri, 4 May 2012 07:26:02 +0000 (15:26 +0800)]
Use activity-alias to disable camera icon dynamically.

Bug: 6438794

Change-Id: Ie2184979f95187eac2411f07b8caee2cad4c4add

12 years agoFix 6399813: tapping on a photo that isn't in the middle of the screen doesn't select it.
Chih-Chung Chang [Thu, 3 May 2012 10:22:59 +0000 (18:22 +0800)]
Fix 6399813: tapping on a photo that isn't in the middle of the screen doesn't select it.

Also make tapping while flinging stop the scroll instead of opening the item.

Change-Id: Iefef4738d7d74b29e4594ea3ae2cb1c91e0e17ab

12 years agoam dc4944e5: am 4cbf2b13: Merge "Fix 6341866 ANR in com.google.android.gallery3d...
Ray Chen [Fri, 4 May 2012 02:22:52 +0000 (19:22 -0700)]
am dc4944e5: am 4cbf2b13: Merge "Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail" into jb-dev

* commit 'dc4944e5a9a1f0daba6b92498ecaa5ba86249b82':
  Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail

12 years agoam 4cbf2b13: Merge "Fix 6341866 ANR in com.google.android.gallery3d due to com.androi...
Ray Chen [Fri, 4 May 2012 02:08:58 +0000 (19:08 -0700)]
am 4cbf2b13: Merge "Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail" into jb-dev

* commit '4cbf2b139b6588ed6f9c0cec1d9185c5b72fdea6':
  Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail

12 years agoMerge "Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d...
Ray Chen [Fri, 4 May 2012 02:07:13 +0000 (19:07 -0700)]
Merge "Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail" into jb-dev

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.