OSDN Git Service

android-x86/packages-apps-Gallery2.git
12 years agoam 6033e075: Merge "Better data change handling for PhotoDataAdapter and PhotoView...
Chih-Chung Chang [Fri, 11 May 2012 10:34:49 +0000 (03:34 -0700)]
am 6033e075: Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev

* commit '6033e0754ee1e1270cef74e12e40a4f9f2408e91':
  Better data change handling for PhotoDataAdapter and PhotoView.

12 years agoMerge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev
Chih-Chung Chang [Fri, 11 May 2012 10:31:10 +0000 (03:31 -0700)]
Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev

12 years agoBetter data change handling for PhotoDataAdapter and PhotoView.
Chih-Chung Chang [Fri, 11 May 2012 09:20:53 +0000 (17:20 +0800)]
Better data change handling for PhotoDataAdapter and PhotoView.

Change-Id: I0f67d918b95000d10786d2035286e036346bfa4e

12 years agoam da438c77: Merge "Make sure we won\'t upload recycled bitmap." into jb-dev
Owen Lin [Fri, 11 May 2012 06:15:49 +0000 (23:15 -0700)]
am da438c77: Merge "Make sure we won\'t upload recycled bitmap." into jb-dev

* commit 'da438c77120c0ec5a626f78c5dc48dc1c2b0ea26':
  Make sure we won't upload recycled bitmap.

12 years agoMerge "Make sure we won't upload recycled bitmap." into jb-dev
Owen Lin [Fri, 11 May 2012 04:17:31 +0000 (21:17 -0700)]
Merge "Make sure we won't upload recycled bitmap." into jb-dev

12 years agoam d2e409d1: Merge "Add freeze/unfreeze for GLRootView." into jb-dev
Chih-Chung Chang [Thu, 10 May 2012 16:26:28 +0000 (09:26 -0700)]
am d2e409d1: Merge "Add freeze/unfreeze for GLRootView." into jb-dev

* commit 'd2e409d1dd54160483edac3a420f59bc5d83fcc6':
  Add freeze/unfreeze for GLRootView.

12 years agoam 91c1435e: Merge "Handle ScreenNail size change." into jb-dev
Chih-Chung Chang [Thu, 10 May 2012 16:26:07 +0000 (09:26 -0700)]
am 91c1435e: Merge "Handle ScreenNail size change." into jb-dev

* commit '91c1435ea3a25a7c0e071ecf378ed58690b8a650':
  Handle ScreenNail size change.

12 years agoMerge "Add freeze/unfreeze for GLRootView." into jb-dev
Chih-Chung Chang [Thu, 10 May 2012 08:46:43 +0000 (01:46 -0700)]
Merge "Add freeze/unfreeze for GLRootView." into jb-dev

12 years agoAdd freeze/unfreeze for GLRootView.
Chih-Chung Chang [Thu, 10 May 2012 03:03:35 +0000 (11:03 +0800)]
Add freeze/unfreeze for GLRootView.

Change-Id: Ieb78041fea22b064d176ea1318cf5883d5d4c94f

12 years agoMerge "Handle ScreenNail size change." into jb-dev
Chih-Chung Chang [Thu, 10 May 2012 03:24:21 +0000 (20:24 -0700)]
Merge "Handle ScreenNail size change." into jb-dev

12 years agoHandle ScreenNail size change.
Chih-Chung Chang [Wed, 9 May 2012 13:17:10 +0000 (21:17 +0800)]
Handle ScreenNail size change.

Bug: 6355399
Change-Id: Ice7560c12aa06cf8ac58cc3883f0888b5c6e71a5

12 years agoam 7b6ce039: Merge "Revert "Fix 6360834 Select All is shown in place of Deselect...
Chih-Chung Chang [Wed, 9 May 2012 10:31:27 +0000 (03:31 -0700)]
am 7b6ce039: Merge "Revert "Fix 6360834 Select All is shown in place of Deselect all option"" into jb-dev

* commit '7b6ce03945499a76fd888058a1e6092c34ba8d67':
  Revert "Fix 6360834 Select All is shown in place of Deselect all option"

12 years agoMerge "Revert "Fix 6360834 Select All is shown in place of Deselect all option""...
Chih-Chung Chang [Wed, 9 May 2012 10:03:24 +0000 (03:03 -0700)]
Merge "Revert "Fix 6360834 Select All is shown in place of Deselect all option"" into jb-dev

12 years agoRevert "Fix 6360834 Select All is shown in place of Deselect all option"
Ray Chen [Wed, 9 May 2012 08:56:29 +0000 (16:56 +0800)]
Revert "Fix 6360834 Select All is shown in place of Deselect all option"

This reverts commit c90170e80b934700c3e2b9978374fb73a910f68c.

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 agoMake sure we won't upload recycled bitmap.
Owen Lin [Wed, 9 May 2012 05:38:21 +0000 (13:38 +0800)]
Make sure we won't upload recycled bitmap.

bug: 6465117
Change-Id: I97553ba9da0256cfedde3a5752224380b1a3ee6f

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 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:28 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie522d1506aea36e73a326270218df5ba0fd5c4a5

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 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 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 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 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 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 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 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 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 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 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: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 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 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 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" 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:08 +0000 (13:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icd8c0249e077f2848cd3df3c2375114ae3e2e3c8

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:21 +0000 (12:48 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iefc176de3ac6c1b849ced8c547ea35c3db68834b

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 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 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 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 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 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:12 +0000 (11:06 -0700)]
Import translations. DO NOT MERGE

Change-Id: I80d90a523de8148c14e643b3d81e5d1be7108a86

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 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 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 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.