OSDN Git Service

android-x86/packages-apps-Camera2.git
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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 bd141b5a: Support drawing in different orientation in Gallery.
Chih-Chung Chang [Mon, 30 Apr 2012 09:31:31 +0000 (02:31 -0700)]
am bd141b5a: Support drawing in different orientation in Gallery.

* commit 'bd141b5a51c96f6fcaddfa547f0928ce69cf0755':
  Support drawing in different orientation in Gallery.

12 years agoam 23a5e6f2: Merge "Remove unused code." into jb-dev
Pin Ting [Mon, 30 Apr 2012 08:18:38 +0000 (01:18 -0700)]
am 23a5e6f2: Merge "Remove unused code." into jb-dev

* commit '23a5e6f233f688f2e1ca2b10b5d1c615a263e83d':
  Remove unused code.

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 agoRemove unused code.
Pin Ting [Mon, 30 Apr 2012 06:43:11 +0000 (14:43 +0800)]
Remove unused code.

Change-Id: Icd68f286a8b97594495f56d6b4bfa2e785462f5d

12 years agoam 68e76bd4: (-s ours) Merge "Make \'Edit\' behave more consistent with \'Crop\'...
Yuli Huang [Mon, 30 Apr 2012 04:36:19 +0000 (21:36 -0700)]
am 68e76bd4: (-s ours) Merge "Make \'Edit\' behave more consistent with \'Crop\'. DO NOT MERGE." into jb-dev

* commit '68e76bd4cad9c9b15ae1307de09e847e0891ee3c':
  Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE.

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 agoam 74976b13: Do not use card effect for camera screen nail.
Wu-cheng Li [Thu, 26 Apr 2012 12:25:26 +0000 (05:25 -0700)]
am 74976b13: Do not use card effect for camera screen nail.

* commit '74976b1397fe34b212741bd92e30fa25aaec7ad8':
  Do not use card effect for camera screen nail.

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 agoam 78824571: Make sure action bar is hidden when camera starts.
Wu-cheng Li [Thu, 26 Apr 2012 10:27:18 +0000 (03:27 -0700)]
am 78824571: Make sure action bar is hidden when camera starts.

* commit '788245711658188131ae2670e44fb6ca8ad5d53a':
  Make sure action bar is hidden when camera starts.

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 agoMake 'Edit' behave more consistent with 'Crop'.
Yuli Huang [Wed, 25 Apr 2012 15:51:52 +0000 (23:51 +0800)]
Make 'Edit' behave more consistent with 'Crop'.

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

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

12 years agoMerge "Fix 6046987 The header on the contextual action bar when multiple photos are...
Ray Chen [Mon, 23 Apr 2012 02:05:55 +0000 (19:05 -0700)]
Merge "Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky b:6046987"

12 years agoMerge "Fix a UI bug in rendering a rotated image."
Owen Lin [Fri, 20 Apr 2012 03:47:43 +0000 (20:47 -0700)]
Merge "Fix a UI bug in rendering a rotated image."

12 years agoFix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs...
Ray Chen [Fri, 20 Apr 2012 02:58:20 +0000 (10:58 +0800)]
Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80
b:6208468

Both getDataManager and getImageCacheService use the same lock but the latter method is blocked on
RandomAccessFile's open syscall. The lock should be separated because they're independent and
getDataManager is very frequently used too.

Change-Id: I4d44cfc949f45a31c7200c8327115bc4b7fde60f

12 years agoPatch 2 for MR1.
Chih-Chung Chang [Wed, 21 Mar 2012 11:01:30 +0000 (19:01 +0800)]
Patch 2 for MR1.

Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425

12 years agoPatch for MR1.
Chih-Chung Chang [Tue, 20 Mar 2012 12:56:49 +0000 (20:56 +0800)]
Patch for MR1.

Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180

12 years agoMerge "In filmstrip, show placeholders for pictures not loaded yet."
Chih-Chung Chang [Thu, 19 Apr 2012 13:25:24 +0000 (06:25 -0700)]
Merge "In filmstrip, show placeholders for pictures not loaded yet."

12 years agoIn filmstrip, show placeholders for pictures not loaded yet.
Chih-Chung Chang [Thu, 19 Apr 2012 12:14:11 +0000 (20:14 +0800)]
In filmstrip, show placeholders for pictures not loaded yet.

Change-Id: I037f1f054da4a3800045d5b89724341ac22272a5

12 years agoFix 6046987 The header on the contextual action bar when multiple photos are selected...
Ray Chen [Thu, 19 Apr 2012 09:14:40 +0000 (17:14 +0800)]
Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky
b:6046987

Change-Id: I86c79cf4d8995bfa0faab95ecd61e89879847630

12 years agoFix a UI bug in rendering a rotated image.
Owen Lin [Thu, 19 Apr 2012 07:09:12 +0000 (15:09 +0800)]
Fix a UI bug in rendering a rotated image.

Change-Id: I14f9f74c5d810dfbb56151722c7f604522fea938

12 years agoMerge "Allow filmstrip to scroll before the screennail is loaded."
Chih-Chung Chang [Thu, 19 Apr 2012 06:53:35 +0000 (23:53 -0700)]
Merge "Allow filmstrip to scroll before the screennail is loaded."

12 years agoAllow filmstrip to scroll before the screennail is loaded.
Chih-Chung Chang [Thu, 19 Apr 2012 05:34:48 +0000 (13:34 +0800)]
Allow filmstrip to scroll before the screennail is loaded.

Change-Id: I9aa7405902c4bfb7e4946cfe4e1263314a958686

12 years agoam 3abf8faf: am 42c1892a: Patch 2 for MR1.
Chih-Chung Chang [Wed, 18 Apr 2012 16:31:59 +0000 (09:31 -0700)]
am 3abf8faf: am 42c1892a: Patch 2 for MR1.

* commit '3abf8faf44da51a63243b7cc943cdb0055141ef4':

12 years agoam 402e680d: am 4745319b: Patch for MR1.
Chih-Chung Chang [Wed, 18 Apr 2012 16:31:58 +0000 (09:31 -0700)]
am 402e680d: am 4745319b: Patch for MR1.

* commit '402e680d220e73d80c5889e129fab459af9713c5':

12 years agoFilm strip should be accessible only when an image is its default state.
Chih-Chung Chang [Wed, 18 Apr 2012 12:08:57 +0000 (20:08 +0800)]
Film strip should be accessible only when an image is its default state.

Change-Id: I4df0db809f6a3f8d28b4e7bbbcddc3fa19d35387

12 years agoAdd thumb pool the cache Bitmap used for thumbnails.
Chih-Chung Chang [Tue, 17 Apr 2012 12:35:14 +0000 (20:35 +0800)]
Add thumb pool the cache Bitmap used for thumbnails.

Change-Id: Ib710f2a6fc1aa86fe4abdd18d1fa7ac71396a3b4

12 years agoMerge "Add page tap listener."
Wu-cheng Li [Wed, 18 Apr 2012 12:09:05 +0000 (05:09 -0700)]
Merge "Add page tap listener."

12 years agoAdd page tap listener.
Wu-cheng Li [Wed, 18 Apr 2012 09:10:02 +0000 (17:10 +0800)]
Add page tap listener.

Camera needs this for touch focus and video snapshot.

bug:6313318

Change-Id: Ie0b8129160c2a79d4b20fab2173027cddfee7a79

12 years agoMerge "Slower scrolling for fling in filmstrip mode."
Owen Lin [Wed, 18 Apr 2012 10:22:10 +0000 (03:22 -0700)]
Merge "Slower scrolling for fling in filmstrip mode."

12 years agoFix NPE in onContentDirty.
Owen Lin [Tue, 17 Apr 2012 08:21:12 +0000 (16:21 +0800)]
Fix NPE in onContentDirty.

onContentDirty is suppose to be called in Main thread.

Change-Id: Ic6a0fba8abd8a3e17d400bcfc5b82d272b07bc41

12 years agoFix NPE in SlotView.
Owen Lin [Tue, 17 Apr 2012 07:38:36 +0000 (15:38 +0800)]
Fix NPE in SlotView.

This NPE is actually a concurrent issue. We shall lock renderring when we clean up
the slots' data. But it didn't, so it may access to null data.

Change-Id: I2a8abfbb77f83bd9a240477fa53216ce69b7774d
fix: 6302487
fix: 6308873

12 years agoFix b/6318340: window range isn't updated when data size changes.
Yuli Huang [Tue, 17 Apr 2012 11:05:52 +0000 (19:05 +0800)]
Fix b/6318340: window range isn't updated when data size changes.

bug:6318340
Change-Id: I2098ddc75fe1a4422a20ab90f02a12c9be85c31e