OSDN Git Service
Owen Lin [Thu, 17 May 2012 20:04:35 +0000 (13:04 -0700)]
Fix a NPE found by Moneky.
AlbumLabelMaker.mBitmapPool could be null if the setLabelWidth()
has never been called or called with width as 0.
bug:
6510386
Change-Id: Idaaa0a1a7239271ba3ae3217e65029b382464c10
The Android Automerger [Thu, 17 May 2012 16:25:53 +0000 (09:25 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 17 May 2012 14:04:59 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Yuli Huang [Thu, 17 May 2012 03:32:15 +0000 (11:32 +0800)]
Smooth opening animation by modifying interpolation curve.
bug:
5367032
Change-Id: I15ad839ede723591f081be200c1c16a8a9a901d0
Yuli Huang [Thu, 17 May 2012 02:25:16 +0000 (19:25 -0700)]
Merge "Fix card effect shown in opening animation." into jb-dev
Chih-Chung Chang [Thu, 17 May 2012 01:49:33 +0000 (18:49 -0700)]
Merge "Handle layout change between pausing and resuming." into jb-dev
Owen Lin [Thu, 17 May 2012 01:28:49 +0000 (18:28 -0700)]
Merge "Remove the black layer in MovieActivity." into jb-dev
Chih-Chung Chang [Thu, 17 May 2012 00:37:10 +0000 (17:37 -0700)]
Handle layout change between pausing and resuming.
Bug:
6468414
Change-Id: Ib190b620bea5a60f12d6075beaeb3bcd10b87802
Owen Lin [Wed, 16 May 2012 17:54:14 +0000 (10:54 -0700)]
Fix a dead lock while we freeze the screen.
bug:
6504696
Change-Id: If960967142bb0df773ce075bf76f5726c37e1d27
Owen Lin [Wed, 16 May 2012 20:52:02 +0000 (13:52 -0700)]
Remove the black layer in MovieActivity.
bug:
6491674
Change-Id: I45323fde110b05eda2a342c8f0a85a3ba219d1da
Owen Lin [Wed, 16 May 2012 20:40:25 +0000 (13:40 -0700)]
Merge "Fix a dead lock while we freeze the screen." into jb-dev
Owen Lin [Wed, 16 May 2012 17:54:14 +0000 (10:54 -0700)]
Fix a dead lock while we freeze the screen.
bug:
6504696
Change-Id: If960967142bb0df773ce075bf76f5726c37e1d27
Owen Lin [Wed, 16 May 2012 20:24:06 +0000 (13:24 -0700)]
Merge "Hide the share button if the shared URI is not "content:"." into jb-dev
Eric Fischer [Wed, 16 May 2012 18:29:06 +0000 (11:29 -0700)]
Restore deleted string still referenced from menu resource.
Change-Id: I518dc004a92ee68682c2085c8d2f002896198feb
Eric Fischer [Wed, 16 May 2012 18:29:06 +0000 (11:29 -0700)]
Restore deleted string still referenced from menu resource.
Change-Id: I518dc004a92ee68682c2085c8d2f002896198feb
Eric Fischer [Wed, 16 May 2012 17:41:05 +0000 (10:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie35416e91d38c143eaa7d2898d60215d534c0ae6
Owen Lin [Tue, 15 May 2012 23:56:59 +0000 (16:56 -0700)]
Hide the share button if the shared URI is not "content:".
bug:
6494818
Change-Id: I70a2997c07c19433cadee34fa348d27445bf2647
The Android Automerger [Wed, 16 May 2012 14:04:50 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Yuli Huang [Tue, 15 May 2012 17:38:06 +0000 (01:38 +0800)]
Fix card effect shown in opening animation.
bug:
6495753
Change-Id: I7a640c2dddef0b7c58e0b7d5a00cbc4aab6ec43d
Yuli Huang [Tue, 15 May 2012 14:36:59 +0000 (22:36 +0800)]
Avoid black screen when PhotoPage just starts.
bug:
5367032
Change-Id: I6bd56026ec32bcee972d69855966750b9a57cdf4
Ray Chen [Wed, 16 May 2012 01:23:46 +0000 (18:23 -0700)]
Merge "Fix
6470803 De-jank for video playback in fullscreen" into jb-dev
Ray Chen [Wed, 16 May 2012 01:22:13 +0000 (18:22 -0700)]
Merge "Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev
Ray Chen [Tue, 15 May 2012 03:22:21 +0000 (11:22 +0800)]
Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
Per request, change the confirm dialog message to "Delete the selected item(s)?"
b:
6046544
Change-Id: I46f7fd42a9f9fbf2399aca78ed9b2e67a15acb65
Owen Lin [Wed, 16 May 2012 00:38:52 +0000 (17:38 -0700)]
Merge "Add animation for the paddings in SlotView." into jb-dev
Eric Fischer [Tue, 15 May 2012 22:29:21 +0000 (15:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6a4cfc400038645f49db5604b6bd58b5207aa96
The Android Automerger [Tue, 15 May 2012 14:05:34 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Mon, 14 May 2012 18:24:28 +0000 (11:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6c64cb7f77eeae21d806cd2bcf0c72784fb433a
Owen Lin [Wed, 9 May 2012 03:32:32 +0000 (11:32 +0800)]
Add animation for the paddings in SlotView.
bug:
6383118
Change-Id: I034be207f73b027de448cef562a534f986d0cbe1
The Android Automerger [Mon, 14 May 2012 14:04:52 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Ray Chen [Fri, 11 May 2012 13:50:28 +0000 (21:50 +0800)]
Fix
6470803 De-jank for video playback in fullscreen
b:
6470803
Change-Id: I91fd8430c34e84eac45c33070f0f571627e96820
Wu-cheng Li [Fri, 11 May 2012 12:41:04 +0000 (05:41 -0700)]
Merge "Remove behind screenOrientation from camera activities." into jb-dev
Wu-cheng Li [Fri, 11 May 2012 12:25:22 +0000 (20:25 +0800)]
Remove behind screenOrientation from camera activities.
Camera has both landscape and portrait layouts. Screen orientation
will be set in onCreate. "behind" is not needed anymore.
bug:
6480864
Change-Id: I6fe3bbe85addf30bae0d037fdddd0ee8569238de
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
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
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
The Android Automerger [Thu, 10 May 2012 14:04:47 +0000 (07:04 -0700)]
merge in jb-release history after reset to 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
Chih-Chung Chang [Thu, 10 May 2012 03:03:35 +0000 (11:03 +0800)]
Add freeze/unfreeze for GLRootView.
Change-Id: Ieb78041fea22b064d176ea1318cf5883d5d4c94f
Chih-Chung Chang [Thu, 10 May 2012 03:24:21 +0000 (20:24 -0700)]
Merge "Handle ScreenNail size change." into jb-dev
The Android Automerger [Wed, 9 May 2012 14:47:24 +0000 (07:47 -0700)]
merge in jb-release history after reset to jb-dev
Chih-Chung Chang [Wed, 9 May 2012 13:17:10 +0000 (21:17 +0800)]
Handle ScreenNail size change.
Bug:
6355399
Change-Id: Ice7560c12aa06cf8ac58cc3883f0888b5c6e71a5
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
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.
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
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
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
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
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
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
Eric Fischer [Tue, 8 May 2012 19:17:19 +0000 (12:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I92195544c0e69468c5aab4e7132d6e5d8ce53945
The Android Automerger [Tue, 8 May 2012 15:23:16 +0000 (08:23 -0700)]
merge in jb-release history after reset to jb-dev
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
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
Eric Fischer [Mon, 7 May 2012 19:09:28 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie522d1506aea36e73a326270218df5ba0fd5c4a5
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
Chih-Chung Chang [Mon, 7 May 2012 14:47:27 +0000 (07:47 -0700)]
Merge "Set default buffer size for SurfaceTexture." into jb-dev
The Android Automerger [Mon, 7 May 2012 14:04:02 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
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
Hung-ying Tyan [Mon, 7 May 2012 11:33:41 +0000 (04:33 -0700)]
Merge "Add UNIQUE to EntrySchema." into jb-dev
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
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
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
Chih-Chung Chang [Sat, 5 May 2012 19:25:16 +0000 (03:25 +0800)]
Fix
6429662: Video snapshot doesn't work
Change-Id: I6414be7f00ee103b7047128fdc92e03ca87c7703
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
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
The Android Automerger [Sun, 6 May 2012 21:21:58 +0000 (14:21 -0700)]
merge in jb-release history after reset to 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
Yuli Huang [Sat, 5 May 2012 09:42:32 +0000 (17:42 +0800)]
Fix a TODO by replacing a string.
Change-Id: I17216e0ca83a185842bc69151fcf8c5136e2b873
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
The Android Automerger [Fri, 4 May 2012 23:15:21 +0000 (16:15 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Fri, 4 May 2012 19:05:03 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e32bdca2eaa33696ebf0ef14df3c78de98e99d9
Hung-ying Tyan [Fri, 4 May 2012 10:07:48 +0000 (18:07 +0800)]
Add UNIQUE to EntrySchema.
Change-Id: I0fbf69a60aafe8d7a82241467d077c48beadbf49
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
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
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
Eric Fischer [Thu, 3 May 2012 21:56:25 +0000 (14:56 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Thu, 3 May 2012 20:53:08 +0000 (13:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icd8c0249e077f2848cd3df3c2375114ae3e2e3c8
Eric Fischer [Thu, 3 May 2012 19:48:21 +0000 (12:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iefc176de3ac6c1b849ced8c547ea35c3db68834b
The Android Automerger [Thu, 3 May 2012 14:18:06 +0000 (07:18 -0700)]
merge in jb-release history after reset to 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
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
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
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
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
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
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
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
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
Eric Fischer [Wed, 2 May 2012 18:06:12 +0000 (11:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80d90a523de8148c14e643b3d81e5d1be7108a86
The Android Automerger [Wed, 2 May 2012 14:09:21 +0000 (07:09 -0700)]
merge in jb-release history after reset to jb-dev
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
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
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
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
Owen Lin [Wed, 2 May 2012 10:08:31 +0000 (03:08 -0700)]
Merge "Add support to draw on texture." into jb-dev
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
Owen Lin [Tue, 24 Apr 2012 06:08:44 +0000 (14:08 +0800)]
Add support to draw on texture.
Change-Id: I95dd5d29352692b702503969e1ebe07bc91a8a73
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
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
Owen Lin [Wed, 2 May 2012 07:31:16 +0000 (00:31 -0700)]
Merge "Fix photo rotates incorrectly in crop image." into jb-dev
OSDN Git Service
