OSDN Git Service

android-x86/packages-apps-Gallery2.git
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 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.

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 agoFix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileI...
Ray Chen [Wed, 2 May 2012 07:31:38 +0000 (15:31 +0800)]
Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail

RegionDecoder is run in a lower priority thread but it uses the same lock as setScreenNail while decoding, so a priority inversion causes this ANR.
The change tries to separate the lock so setScreenNail doesn't have to wait on the decoding process so the ANR could be avoided.

Change-Id: I02cc26fa0535adaa57cdcf94b819970e179311d1
b:6341866

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

Change-Id: I17da847d9cf238a770caa867bd27ea227797d71f

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

Change-Id: I5a1227b0df7f6744d13a263ea433ccadccc76be8

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

Change-Id: Iaa63de7b4ec73667fb08073608aec374dbc9529c

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

Change-Id: Idb5ec471d418db5894e27985b90b9c2d57575660

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

12 years agoSupport drawing in different orientation in Gallery.
Chih-Chung Chang [Thu, 26 Apr 2012 02:10:49 +0000 (10:10 +0800)]
Support drawing in different orientation in Gallery.

Bug 6312994: Swipe UX: do not directly show the camera roll when camera starts
Bug 6313191: Swipe UX: Change swipe direction after the user rotated the device
Bug 6313192: Swiping UX: make Gallery display in rotated mode
Bug 6399447: Filmstrip: in Gallery, pressing Back from filmstrip doesn't perform the right animation
Bug 6399974: Filmstrip: when swiping from full-screen photo to filmstrip mode, camera view and the photo-roll don't align correctly
Bug 6400014: Swiping UX: in Camera portrait mode, tapping on the Thumbnail doesn't align camera view and the photo-roll correctly
Bug 6401075: Able to scroll through the gallery pics while capturing video.
Bug 6405087: Filmstrip does not change with orientation

Change-Id: I8c479d87800c63b7a95c199c0c1c3bc512d66d42

12 years agoMerge "Remove unused code." into jb-dev
Pin Ting [Mon, 30 Apr 2012 08:14:22 +0000 (01:14 -0700)]
Merge "Remove unused code." into jb-dev

12 years agoExpose delete button in action bar in portrait.
Wu-cheng Li [Mon, 30 Apr 2012 07:02:56 +0000 (15:02 +0800)]
Expose delete button in action bar in portrait.

bug:6411759
Change-Id: I135edad5ab7d1194c774e7d5ee680cf3ba3206ad

12 years agoRemove unused code.
Pin Ting [Mon, 30 Apr 2012 06:43:11 +0000 (14:43 +0800)]
Remove unused code.

Change-Id: Icd68f286a8b97594495f56d6b4bfa2e785462f5d

12 years agoMerge "Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE." into jb-dev
Yuli Huang [Mon, 30 Apr 2012 04:31:21 +0000 (21:31 -0700)]
Merge "Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE." into jb-dev

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 27 Apr 2012 17:38:35 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5f364684f5e0d05d5e8cbbef3d4b6bbc40229061

12 years agoMake 'Edit' behave more consistent with 'Crop'. DO NOT MERGE.
Yuli Huang [Wed, 25 Apr 2012 15:51:52 +0000 (23:51 +0800)]
Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE.

1. Save edited PWA photo in 'dowload', same as cropped images.
2. Fix Crop-image toast may show strings without i18n.
bug:6168430

Change-Id: Ic99a478e684597d3dc1a105c4f592dd98d8f227d

12 years agoFix photo rotates incorrectly in crop image.
Owen Lin [Fri, 27 Apr 2012 08:11:58 +0000 (16:11 +0800)]
Fix photo rotates incorrectly in crop image.

bug:6399424
Change-Id: Icc0aca5e9abcd643f8e246211e37bd177bf8ff31

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

Change-Id: I6b49535f98a414ec3c7989099d09f37a70ff5e00

12 years agoDo not use card effect for camera screen nail.
Wu-cheng Li [Thu, 26 Apr 2012 10:36:54 +0000 (18:36 +0800)]
Do not use card effect for camera screen nail.

bug:6402571
Change-Id: I362e675ea4160b7b940e0da4bd018e0e8c7add57

12 years agoMake sure action bar is hidden when camera starts.
Wu-cheng Li [Thu, 26 Apr 2012 08:21:56 +0000 (16:21 +0800)]
Make sure action bar is hidden when camera starts.

bug:6402552

Change-Id: I2ec39e607a505490e431181eb40e259102b9a773

12 years agoHide action bar when camera screen nail is displayed.
Wu-cheng Li [Tue, 24 Apr 2012 10:58:58 +0000 (18:58 +0800)]
Hide action bar when camera screen nail is displayed.

bug:6363385
Change-Id: Ic37afa779339cfe5f66f0a40cbf4870ff1a6a0ee

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 25 Apr 2012 17:35:01 +0000 (10:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: I725031b6fd65e573b5852b98aace63bd8ebe15e8

12 years agoMerge "Increase blue layer alpha to make highlights more evident."
Yuli Huang [Wed, 25 Apr 2012 09:05:16 +0000 (02:05 -0700)]
Merge "Increase blue layer alpha to make highlights more evident."

12 years agoMerge "Remove scissor tests."
Chih-Chung Chang [Wed, 25 Apr 2012 09:03:00 +0000 (02:03 -0700)]
Merge "Remove scissor tests."

12 years agoFix 6376466 After deleting photo, the next one will be shown too dark
Ray Chen [Wed, 25 Apr 2012 06:58:50 +0000 (14:58 +0800)]
Fix 6376466 After deleting photo, the next one will be shown too dark
b:6376466

Change-Id: I7328215c45995d6ae1813ed861da3ad826809461

12 years agoRemove scissor tests.
Chih-Chung Chang [Wed, 25 Apr 2012 07:57:14 +0000 (15:57 +0800)]
Remove scissor tests.

Change-Id: I9f2c462a251e518ce5954dde0eb6e509734254c4

12 years agoIncrease blue layer alpha to make highlights more evident.
Yuli Huang [Wed, 25 Apr 2012 07:52:46 +0000 (15:52 +0800)]
Increase blue layer alpha to make highlights more evident.

bug:6145331
Change-Id: I0d8848a3f66885509dcde315e3403be0bb248bd6

12 years agoFix NPE in Gallery.
Owen Lin [Fri, 20 Apr 2012 10:42:22 +0000 (18:42 +0800)]
Fix NPE in Gallery.

This happens if user set type in an intent. But we get a different type from
content resolver.

Change-Id: Iabafce7f7aaff23a7a9ee09e1d38ab50049abc88
fix: 6358473

12 years agoMerge "Don't do capture animation if we don't have Camera ScreenNail."
Chih-Chung Chang [Wed, 25 Apr 2012 04:05:43 +0000 (21:05 -0700)]
Merge "Don't do capture animation if we don't have Camera ScreenNail."

12 years agoDon't do capture animation if we don't have Camera ScreenNail.
Chih-Chung Chang [Wed, 25 Apr 2012 03:50:08 +0000 (11:50 +0800)]
Don't do capture animation if we don't have Camera ScreenNail.

Also make "Back" jump to first picture instead of the previous one.

Bug: 6388263

Change-Id: Idf78363cf3952bf66c6b0688e79d99c01956cd07

12 years agoam 082ea423: am 49826d43: Reconcile with ics-mr1-release
The Android Open Source Project [Tue, 24 Apr 2012 22:19:35 +0000 (15:19 -0700)]
am 082ea423: am 49826d43: Reconcile with ics-mr1-release

* commit '082ea4230f5892379cb0eebfd87d1594e51987ec':
  Patch 2 for MR1.
  Patch for MR1.

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

Change-Id: Ibdcd41844e4c0e170db6dfc3fdd40f6bbc9e09e3

12 years agoAdd capture animation in Gallery.
Chih-Chung Chang [Fri, 20 Apr 2012 12:06:19 +0000 (20:06 +0800)]
Add capture animation in Gallery.

Change-Id: Ibf95cc64f37a4518377e64124af6606c4f14cdaa

12 years agoMerge "Add a method to disable toggle status bar."
Wu-cheng Li [Tue, 24 Apr 2012 10:42:48 +0000 (03:42 -0700)]
Merge "Add a method to disable toggle status bar."

12 years agoAdd a method to disable toggle status bar.
Wu-cheng Li [Tue, 24 Apr 2012 10:33:10 +0000 (18:33 +0800)]
Add a method to disable toggle status bar.

Camera does not show status bar in both landscape and
portrait.

bug:6378178

Change-Id: I80cead9c0e2ef0256288aafead6bd1a96cc93d7b

12 years agoMerge "Add prominent highlights for touch feedback."
Yuli Huang [Tue, 24 Apr 2012 09:50:48 +0000 (02:50 -0700)]
Merge "Add prominent highlights for touch feedback."

12 years agoMerge "Add Raw2DTexture."
Angus Kong [Tue, 24 Apr 2012 08:49:21 +0000 (01:49 -0700)]
Merge "Add Raw2DTexture."

12 years agoAdd Raw2DTexture.
Angus Kong [Wed, 11 Apr 2012 10:49:15 +0000 (18:49 +0800)]
Add Raw2DTexture.

Raw2DTexture is a wrapper of GL 2D texture. It also support copy other
texture's content into this texture.

bug:5988937

Change-Id: Ib4f6ff7ed2f6ea499517536366b511b7984a9b98

12 years agoAdd prominent highlights for touch feedback.
Yuli Huang [Tue, 24 Apr 2012 07:20:28 +0000 (15:20 +0800)]
Add prominent highlights for touch feedback.

Mimic the system UI to fade out highlights on touch releases.
bug:6145331
bug:5379176

Change-Id: I44c9245a926b2c5eb46b28d494c6393ba7f0c30c

12 years agoam 49826d43: Reconcile with ics-mr1-release
The Android Open Source Project [Mon, 23 Apr 2012 21:42:28 +0000 (14:42 -0700)]
am 49826d43: Reconcile with ics-mr1-release

* commit '49826d43d1911939ccb1ac1ee9755ba5057065f6':
  Patch 2 for MR1.
  Patch for MR1.

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Mon, 23 Apr 2012 21:40:27 +0000 (14:40 -0700)]
Reconcile with ics-mr1-release

Change-Id: If202c8b713a5d273115764c404cbe45a88c8d658

12 years agoFix 6046544 Deleting a photo takes multiple steps and the flow is inconsistent with...
Ray Chen [Thu, 5 Apr 2012 09:25:43 +0000 (17:25 +0800)]
Fix 6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps

This CL adds a confirm dialog to delete command and removes all confirm/cancel menu items from the actionbar.

b:6046544
Change-Id: I3afe7b59b4f6d1216e192a621621f7bf544e1919

12 years agoMerge "Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey...
Ray Chen [Mon, 23 Apr 2012 02:06:03 +0000 (19:06 -0700)]
Merge "Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80 b:6208468"