OSDN Git Service
Eric Fischer [Tue, 20 Sep 2011 22:22:12 +0000 (15:22 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I05691313203444b01ae86ba89fb53358d036a1c8
Ruei-sung Lin [Thu, 15 Sep 2011 07:25:19 +0000 (15:25 +0800)]
parameter change to match api
Cherry-pick to fix b/
5339529.
Change-Id: Id84274e60c0feb8019f3418bd1f1feed0542ca51
Ray Chen [Mon, 19 Sep 2011 06:20:18 +0000 (14:20 +0800)]
Fix
5329642 Gallery crashes when viewing Details on certain photos
AddressResolvingListener (mAdapter) is not set until constructor returns, so NPE is thrown
if the resolving happens really fast. This CL uses 'this' instead of mAdapter.
Change-Id: Ifce0ea92a3eb5c794a73cf0e89a236ff3d948c18
Eric Fischer [Fri, 16 Sep 2011 22:32:01 +0000 (15:32 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I9f2fd3f5354c2b75fc86eb99e670e6ff21fd653b
Marius Renn [Thu, 15 Sep 2011 00:10:01 +0000 (17:10 -0700)]
Update for compatibility with Effects API naming change.
Part of bugfix
5287103.
NOTE: This will fix the build, but temporarily break the Doodle effect
on the photo editor. Will check in fixes later.
Change-Id: I4a0e1696965c296ac9388c2ee9c49c0bdcaaf5a1
Ray Chen [Wed, 14 Sep 2011 16:41:28 +0000 (09:41 -0700)]
Merge "Fix
5288270 PTP camera gallery launch, prompts the user to "select all" instead if "Deselect all""
Chih-Chung Chang [Wed, 14 Sep 2011 12:42:17 +0000 (05:42 -0700)]
Merge "Fix
5196286: Crash if the last clustered album is deleted."
Ray Chen [Sat, 10 Sep 2011 07:29:51 +0000 (15:29 +0800)]
Fix
5288270 PTP camera gallery launch, prompts the user to "select all" instead if "Deselect all"
Change-Id: I80bcb347d3d2384e3fd18d2692ab459e0d39e86f
Chih-Chung Chang [Wed, 14 Sep 2011 10:00:42 +0000 (18:00 +0800)]
Fix
5196286: Crash if the last clustered album is deleted.
Change-Id: I5e451d3cebd61c31465cba56aebe66cc3a999e2d
Yuli Huang [Wed, 14 Sep 2011 08:16:55 +0000 (01:16 -0700)]
Merge "Fix b/
5182741: Add 'Edit' title in the action-bar."
Owen Lin [Wed, 14 Sep 2011 07:51:39 +0000 (00:51 -0700)]
Merge "Use different UIs for phone's portrait mode in manage offline page."
Yuli Huang [Wed, 14 Sep 2011 07:00:33 +0000 (15:00 +0800)]
Fix b/
5182741: Add 'Edit' title in the action-bar.
Change-Id: I3964bfcb23818f2f3f8364475f74b401f7eed097
Owen Lin [Wed, 14 Sep 2011 06:44:43 +0000 (23:44 -0700)]
Merge "Fix picasa images rotate incorrectly."
Owen Lin [Fri, 9 Sep 2011 05:33:44 +0000 (13:33 +0800)]
Use different UIs for phone's portrait mode in manage offline page.
fix:
5100503
The original UI design is not suitable for phone's portait mode. I move the
UIs from GL view to android View to get better support.
Change-Id: Ice5f536129f66b51cdaf4db1be750be7bc072c7f
Chih-Chung Chang [Wed, 14 Sep 2011 04:07:17 +0000 (12:07 +0800)]
Fix
5280798: Click on filmstrip during swiping causes crash.
After swiping animation finishes we move to the previous
picture. But if during the animation the user clicks the first
thumbnail on the filmstrip, we will have no previous picture
to move to.
Now disallow clicking on the filmstrip during the swiping animation.
Change-Id: Ie910c346cbf35543fedb6812b04c8e78faab0d0f
Owen Lin [Tue, 13 Sep 2011 02:45:22 +0000 (10:45 +0800)]
Change theme for GallerySettings.
fix:
5290466
Change-Id: Ib6051f6f8e83d077df029b938b77d3619a4653ed
Chih-Chung Chang [Tue, 13 Sep 2011 07:25:15 +0000 (00:25 -0700)]
Merge "Fix
5058723: Don't show screennails of videos in slide show"
Chih-Chung Chang [Tue, 13 Sep 2011 04:51:49 +0000 (21:51 -0700)]
Merge "Fix
5284804: Kill 3D tilt effect based on device rotation."
Chih-Chung Chang [Fri, 9 Sep 2011 08:41:54 +0000 (16:41 +0800)]
Fix
5058723: Don't show screennails of videos in slide show
Change-Id: I25c3ee3f1ae69c9c54c1e579a6469ee20f1774be
Yuli Huang [Tue, 13 Sep 2011 04:30:40 +0000 (21:30 -0700)]
Merge "Fix b/
4643148: Make PhotoEditor integrated into Gallery."
Chih-Chung Chang [Tue, 13 Sep 2011 03:58:17 +0000 (11:58 +0800)]
Fix
5284804: Kill 3D tilt effect based on device rotation.
Change-Id: Ic8a81d591e42fc97b6ca8eca2b6c66cd90f74cdc
Eric Fischer [Mon, 12 Sep 2011 18:48:14 +0000 (11:48 -0700)]
Import revised translations.
Change-Id: Ib0e2131240074ef02677a61acfd796f8900db9c6
Eric Fischer [Mon, 12 Sep 2011 17:20:40 +0000 (10:20 -0700)]
Merge "Import revised translations."
Eric Fischer [Mon, 12 Sep 2011 16:52:13 +0000 (09:52 -0700)]
Import revised translations.
Change-Id: Ica26d038fb954438100062d2bb451eacfaa4bf90
Yuli Huang [Mon, 12 Sep 2011 14:25:30 +0000 (22:25 +0800)]
Fix b/
4643148: Make PhotoEditor integrated into Gallery.
1. Move PhotoEditor code/resources into Gallery for single apk.
2. Change PhotoEditor package to com.android.gallery3d.photoeditor.
3. Rename PhotoEditor resources to avoid mess up Gallery resources.
4. Move Doodle effect from fix-effects to color-effects.
5. Update PhotoEditor bottom action-bar background.
Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4
Justin Ho [Mon, 12 Sep 2011 14:33:47 +0000 (07:33 -0700)]
Merge "Updated Gallery2 widget dimens Bug:
5278970"
Owen Lin [Mon, 12 Sep 2011 04:45:16 +0000 (12:45 +0800)]
Fix picasa images rotate incorrectly.
fix:
5268469
Change-Id: I58fc4a6d4a10c2952040eedee5936efa949b66e2
Yuli Huang [Fri, 9 Sep 2011 09:09:39 +0000 (17:09 +0800)]
Move PhotoEditor strings into Gallery2.
1. Rename Gallery string "crop" to "crop_action".
2. Rename PhotoEditor string "app_name" to "photoeditor_name".
Change-Id: I22279e7e45b690f22fe8e0e8dd645bb4df821646
Eric Fischer [Fri, 9 Sep 2011 18:30:41 +0000 (11:30 -0700)]
Merge "Import revised translations."
Eric Fischer [Fri, 9 Sep 2011 18:30:31 +0000 (11:30 -0700)]
Merge "Restore deleted strings still referenced from menus."
Justin Ho [Fri, 9 Sep 2011 15:56:48 +0000 (08:56 -0700)]
Updated Gallery2 widget dimens
Bug:
5278970
Change-Id: Ia650a167bf44baf202fdee527a52af4148d2e8ae
Chih-Chung Chang [Fri, 9 Sep 2011 08:38:55 +0000 (01:38 -0700)]
Merge "Fix
5221190: Make movie player background black."
Chih-Chung Chang [Thu, 8 Sep 2011 11:15:45 +0000 (19:15 +0800)]
Fix
5221190: Make movie player background black.
Change-Id: I2ffb81a2b0aa267a14f7fbe03afe3c3e95dd1069
Owen Lin [Fri, 9 Sep 2011 05:39:46 +0000 (22:39 -0700)]
Merge "Revert "bug #
5252975: guard against null bitmap object, don't NPE.""
Chih-Chung Chang [Fri, 9 Sep 2011 04:54:46 +0000 (21:54 -0700)]
Merge "Fix
5189194: Change color of borders."
Chih-Chung Chang [Fri, 9 Sep 2011 04:34:04 +0000 (12:34 +0800)]
Fix
5189194: Change color of borders.
Change-Id: I9b1c5da91ac6314e9f38926efb0e2ed569ad4b4c
Ray Chen [Fri, 9 Sep 2011 03:54:42 +0000 (20:54 -0700)]
Merge "Fix
5267234 com.google.android.gallery3d: java.lang.IllegalArgumentException: The stateview to be finished is not at the top of the stack:"
Ray Chen [Fri, 9 Sep 2011 03:20:58 +0000 (11:20 +0800)]
Fix
5267234 com.google.android.gallery3d: java.lang.IllegalArgumentException:
The stateview to be finished is not at the top of the stack:
setNavigationMode triggers recursive tabs onSelected events.
Change-Id: Id9f58b4a73c4d7836b62e33e2f9b3676ba3f95c2
Eric Fischer [Thu, 8 Sep 2011 22:44:35 +0000 (15:44 -0700)]
Import revised translations.
Change-Id: I626154da45e8cc168585c56f4fc0dc0df42c681f
Eric Fischer [Thu, 8 Sep 2011 22:41:28 +0000 (15:41 -0700)]
Restore deleted strings still referenced from menus.
Change-Id: Ib3a08b56f278387fd277601f0baaf09d42f7ce09
Ray Chen [Thu, 8 Sep 2011 14:28:50 +0000 (07:28 -0700)]
Merge "Fix
5247983 posted photos from multiple accounts showing up in same folder"
Ray Chen [Thu, 8 Sep 2011 08:34:33 +0000 (16:34 +0800)]
Fix
5247983 posted photos from multiple accounts showing up in same folder
Change-Id: I892134b49fceb5d5467d689e6d6a92169980940b
Chih-Chung Chang [Thu, 8 Sep 2011 03:51:11 +0000 (11:51 +0800)]
Fix
5263604: View not attached to window manager.
We need to make sure the dialog is dismissed before onDestroy
is finished so we still have the window. (We do it in onPause.)
Change-Id: I896583a67e117c9e4c5a1312541d67efa01295bf
Owen Lin [Wed, 7 Sep 2011 08:56:45 +0000 (01:56 -0700)]
Merge "Copy exif data for cropped image."
Owen Lin [Fri, 2 Sep 2011 13:15:42 +0000 (21:15 +0800)]
Copy exif data for cropped image.
fix:
5248023
Change-Id: I2f59bfd96ca7533195f7019cc76080579dff8d1e
Owen Lin [Wed, 7 Sep 2011 06:51:36 +0000 (23:51 -0700)]
Merge "Fix a no-thumbnail error message."
Owen Lin [Tue, 6 Sep 2011 11:46:46 +0000 (19:46 +0800)]
Fix a no-thumbnail error message.
This happens if we cancel the first image reqest and then resend another
in a very short time. We may got an null image for the first request and
think this is a invalid bitmap.
Change-Id: I9ab62a658c281ef3d197474a5db50579e560f1bd
Owen Lin [Tue, 6 Sep 2011 08:21:15 +0000 (16:21 +0800)]
Revert "bug #
5252975: guard against null bitmap object, don't NPE."
This reverts commit
7012ebe1c85e538c572e23d4cb98cad88699c782.
We would like to know the crash as soon as possible.
bug:
5252975
Hung-ying Tyan [Tue, 6 Sep 2011 06:45:28 +0000 (14:45 +0800)]
Suppress log from Utils.parseXXXSafely().
Callers already expect non-number strings with these calls. No need to print
out the stack trace.
Change-Id: I27226ca50e4e7e906939505ad5d53906e8999e95
Owen Lin [Mon, 5 Sep 2011 04:12:16 +0000 (21:12 -0700)]
Merge "Move resources related to sync to Gallery2."
Owen Lin [Fri, 2 Sep 2011 08:06:47 +0000 (16:06 +0800)]
Move resources related to sync to Gallery2.
fix:
5241300
Change-Id: I03ff96478a0e43b9d6c8e327034bda46fc071664
Owen Lin [Tue, 30 Aug 2011 02:38:59 +0000 (10:38 +0800)]
Improve the performance of Reviewing a photo.
fix:
5144370
There is two componenet in the photo page. One is the large photo and the
other is the thumbnail strip. They idenpendently load their own data and images.
This change fixes several issues here:
1. Prevent sending to many jobs to ThreadPool and block others.
In a worse case, if the thumbnail strip send image requests first,
it may block the ThreadPool very long.
2. Improve the performance of extracting thumbnails from local files.
Now we try to extract the thumbnails from EXIF data first.
Change-Id: I45100d4daa025efb479f47c4f105de2b4731b498
Wei Huang [Fri, 2 Sep 2011 18:40:00 +0000 (11:40 -0700)]
bug #
5252975: guard against null bitmap object, don't NPE.
- check for null Bitmap object before using.
Change-Id: I99d85916dae45128d67be084860d66dd89ec2f95
Ray Chen [Fri, 2 Sep 2011 07:28:36 +0000 (00:28 -0700)]
Merge "Fix a few monkey issues:
5157713 and
5157712 Add debugging message for
5192628."
Ray Chen [Wed, 31 Aug 2011 08:37:04 +0000 (16:37 +0800)]
Fix a few monkey issues:
5157713 and
5157712
Add debugging message for
5192628.
Change-Id: I257cabf1a93be256ed84aeaf3c9a871ecc5b1171
Owen Lin [Fri, 2 Sep 2011 04:00:30 +0000 (21:00 -0700)]
Merge "Remove resources for Settings."
Owen Lin [Fri, 2 Sep 2011 00:43:37 +0000 (17:43 -0700)]
Merge "Fix alias not found issue."
Justin Ho [Thu, 1 Sep 2011 15:51:16 +0000 (08:51 -0700)]
Unused assets removed from Gallery2
Bug:
5032006
Change-Id: Ie9c5a902b874d6ad2be7bcee5477222a47e0c834
Owen Lin [Tue, 23 Aug 2011 08:45:30 +0000 (16:45 +0800)]
Remove resources for Settings.
Change-Id: I59a95966cbe9c90553716111ecddb84623002610
Owen Lin [Thu, 1 Sep 2011 06:11:19 +0000 (14:11 +0800)]
Fix alias not found issue.
Also remove note message in proguard.
Change-Id: I7e15a3b00d7caf32565d035f6c972d302e38d49f
Owen Lin [Wed, 31 Aug 2011 04:12:55 +0000 (21:12 -0700)]
Merge "Revert "Revert "Move resource to sync library."""
Ray Chen [Tue, 30 Aug 2011 08:34:18 +0000 (16:34 +0800)]
Debugging
5166199. Add log messages for analysis.
Change-Id: I1786e540b5bf19460dcca06acd8a77c9287593f8
Ray Chen [Tue, 30 Aug 2011 06:40:09 +0000 (14:40 +0800)]
Fix
5188208 [UI] Remove action bar title in Photo/Video view for portrait phone
Change-Id: I20fba5894e46536f6972bc812d7f2aa5f52840b5
Ray Chen [Tue, 30 Aug 2011 04:06:17 +0000 (12:06 +0800)]
Fix
5189197: NPE in MovieActivity
Change-Id: I58f9e2c0840b4d752c2f795451ed4bc8212bb1ce
Ray Chen [Wed, 31 Aug 2011 02:29:22 +0000 (19:29 -0700)]
Merge "Fix
5134299 [UI] Select photo or album activities should have a Cancel label not x icon"
Wei Huang [Tue, 30 Aug 2011 18:33:24 +0000 (11:33 -0700)]
bug #
5234237: fix NPE in Gallery
- mActivity.getGalleryActionBar() can return null, check for null before using it.
Change-Id: Ib84d5d56e51e6098adee9323c5e8d5c78f9a76e8
Wei Huang [Tue, 30 Aug 2011 17:22:41 +0000 (10:22 -0700)]
Merge "Fix
4975579 PTP: Unable to load the thumbnails while connected to camera"
Owen Lin [Tue, 30 Aug 2011 05:52:55 +0000 (13:52 +0800)]
Revert "Revert "Move resource to sync library.""
This reverts commit
779377e489158b8db0be1168002f4416f4ef319c.
Ray Chen [Tue, 30 Aug 2011 03:46:09 +0000 (11:46 +0800)]
Fix
5134299 [UI] Select photo or album activities should have a Cancel label not x icon
Change-Id: I77c4cd2f8b27e48786d410bd39a16c918a7407b3
Owen Lin [Sun, 28 Aug 2011 02:50:21 +0000 (10:50 +0800)]
Fix several issues in Gallery2.
fix:
5189318 - use transparent background for tabs
fix:
5174277 - menu mailfunctioned after slideshow (a hack):
fix:
5153387 - wrong tab is selected in album set page
Change-Id: I68092039e566b5f7409ae509f65b227b06da16bb
Wei Huang [Mon, 29 Aug 2011 20:03:03 +0000 (13:03 -0700)]
Revert "Move resource to sync library."
This reverts commit
50602e846230d8d944b81c651b11f40c8d21221c.
Ray Chen [Mon, 29 Aug 2011 10:39:55 +0000 (18:39 +0800)]
Fix
4975579 PTP: Unable to load the thumbnails while connected to camera
There's a deadlock in threadpool. The fix has been verified.
Change-Id: I000527f55fc2a3777bd4bb06817a9967b2f50488
Owen Lin [Mon, 29 Aug 2011 08:27:35 +0000 (01:27 -0700)]
Merge "Make sure the sides of a backup image are less than 1024."
Owen Lin [Mon, 29 Aug 2011 07:29:56 +0000 (15:29 +0800)]
Make sure the sides of a backup image are less than 1024.
fix:
5117367
In this case(
5117367), the original backup image would be 2325x1029,
which exceeds the limit of an texture and thus shows a blank image.
Change-Id: I3176e191c68199308fe3770c10ee0ae2d310c96a
Owen Lin [Fri, 26 Aug 2011 06:57:34 +0000 (14:57 +0800)]
Move resource to sync library.
Change-Id: I9bcd9f65b0e222d2a54eef505096706f586fc1a6
Owen Lin [Sun, 28 Aug 2011 07:20:22 +0000 (00:20 -0700)]
Merge "Use getEmbeddedPicture to get thumbnail of a picture."
Owen Lin [Sun, 28 Aug 2011 07:15:19 +0000 (00:15 -0700)]
Merge "Launch Gallery from review intent."
Owen Lin [Sat, 27 Aug 2011 11:58:52 +0000 (04:58 -0700)]
Merge "Fix:
5217165, cannot edit downloaded image"
Eric Fischer [Fri, 26 Aug 2011 21:56:25 +0000 (14:56 -0700)]
Import revised translations.
Change-Id: I545c2484686c2123c73566939f89503820a16f23
Owen Lin [Fri, 26 Aug 2011 14:34:13 +0000 (22:34 +0800)]
Fix:
5217165, cannot edit downloaded image
The contentUri of the download image is "file:///xxx". Thus, it cannot get the correct
file type. So, we pass the mimetype in the intent to fix this issue.
Change-Id: I49b4b96472eb6a1561fbada95190c829728c037e
Owen Lin [Fri, 26 Aug 2011 14:03:03 +0000 (22:03 +0800)]
Use getEmbeddedPicture to get thumbnail of a picture.
Change-Id: I69d0d2129906eb780df3940f0bdce0e84c5e2b1d
fix:
4190748
Ray Chen [Fri, 26 Aug 2011 13:15:07 +0000 (21:15 +0800)]
Fix
5133608 [UI] Details should be displayed as a system dialog in phone UI
We need this to reset the grid drawer.
Change-Id: Iead6568db1903d7e722f0e8154388ccd8f1aee67
Owen Lin [Fri, 26 Aug 2011 12:45:35 +0000 (20:45 +0800)]
Launch Gallery from review intent.
Change-Id: Iaa2e9bdfde3ac6566dd65464ece82f4a5ced6831
fix:
3462852
Ray Chen [Wed, 24 Aug 2011 03:40:04 +0000 (11:40 +0800)]
Fix
5133608 [UI] Details should be displayed as a system dialog in phone UI
Fix
5132798 [UI] Details popup on tablet is incorrectly placed and should not have x icon to close
Fix
5199822 Long press and select "detail" shows details of another item
Change-Id: I0e992ded8a154edb1c7a81b75d0461d5bf309f31
Ray Chen [Fri, 26 Aug 2011 06:49:13 +0000 (23:49 -0700)]
Merge "Fix
5205456 After sharing multiple images, the selection should be cleared"
Ray Chen [Thu, 25 Aug 2011 03:43:40 +0000 (11:43 +0800)]
Fix
5188970 Cannot close Gallery when opened from Email/Gmail
Change-Id: I7af203a9aec8ebaf6c33fa592c996f917e0caca8
Ray Chen [Thu, 25 Aug 2011 03:34:20 +0000 (11:34 +0800)]
Fix
5199444 In crop interface, check button and X button should be switched
Change-Id: I96e83c6a7afe9aef7c3ac54d8902fb5495e4b76d
Ray Chen [Fri, 19 Aug 2011 04:35:29 +0000 (12:35 +0800)]
Fix
5027908 Crash in MMS while attaching a picture from Picasa
Change-Id: I7f67a7da5191f0ec8fbe3fc3c2d79e54394c4715
Owen Lin [Wed, 24 Aug 2011 12:58:27 +0000 (05:58 -0700)]
Merge "Fix shortcup broken issue."
Owen Lin [Thu, 18 Aug 2011 13:48:19 +0000 (21:48 +0800)]
Fix shortcup broken issue.
fix:
5154308
Change-Id: I5cd2ef8efb84d4f356b3fe93106bddf10e0823cc
Owen Lin [Wed, 24 Aug 2011 07:45:08 +0000 (15:45 +0800)]
Fix cannot edit picasa synced images.
Change-Id: Ic2df3f6a8a93711c8616b1532acef12d67341062
fix:
5202762
Ray Chen [Wed, 24 Aug 2011 07:18:31 +0000 (15:18 +0800)]
Fix
5205456 After sharing multiple images, the selection should be cleared
Change-Id: I9fd12d371269197e1e05a6c49dae2b9a81ae4ca0
Owen Lin [Tue, 23 Aug 2011 05:46:19 +0000 (22:46 -0700)]
Merge "Fix unknown type for GL issue."
Eric Fischer [Mon, 22 Aug 2011 18:16:22 +0000 (11:16 -0700)]
Import revised translations.
Change-Id: I6069ac29facfbd1e43c9b844e722b9645e8376dd
Owen Lin [Fri, 19 Aug 2011 08:26:29 +0000 (16:26 +0800)]
Fix unknown type for GL issue.
fix:
5171449
Change-Id: Ib62e3237584144e94be6be773c292002bea5d21c
Ray Chen [Fri, 19 Aug 2011 03:24:35 +0000 (20:24 -0700)]
Merge "Fix
5179285 "Show on Map" intent for geotagged images mis-formatted in French"
Ray Chen [Fri, 19 Aug 2011 03:24:29 +0000 (20:24 -0700)]
Merge "Fix
5179825 Toast is created in a unprepared looper."
Ray Chen [Fri, 19 Aug 2011 03:00:00 +0000 (11:00 +0800)]
Fix
5158515 [UI] Slideshow action in portrait Photo/Video and Video playback views should be in the overflow/menu
Change-Id: If3171b9db1ad2f9f238f1fd5625ac9a1ed7d5ef0
Ray Chen [Fri, 19 Aug 2011 02:48:49 +0000 (10:48 +0800)]
Fix
5179825 Toast is created in a unprepared looper.
Change-Id: I80021755bc012340ed00fa52a20bf560369e9368
Ray Chen [Fri, 19 Aug 2011 02:45:53 +0000 (10:45 +0800)]
Fix
5179285 "Show on Map" intent for geotagged images mis-formatted in French
Change-Id: I4af6b549b534786163505d41b181888d347743d9