OSDN Git Service
Owen Lin [Fri, 14 Sep 2012 07:04:36 +0000 (00:04 -0700)]
Merge "Cancel the loading task when clicking on back in Cropping." into gb-ub-photos-arches
Baligh Uddin [Fri, 14 Sep 2012 02:15:14 +0000 (19:15 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Bobby Georgescu [Thu, 13 Sep 2012 22:46:40 +0000 (15:46 -0700)]
Animate correctly when opening single-photo album
Bug:
7164177
Change-Id: I5ce60a8e842e3ddf0e356568f17ee488edef23cd
Baligh Uddin [Thu, 13 Sep 2012 17:26:15 +0000 (10:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I726d6cc6d3948b7a6ddf248ec17e4db91689344a
Auto-generated-cl: translation import
Owen Lin [Thu, 13 Sep 2012 07:38:57 +0000 (15:38 +0800)]
Cancel the loading task when clicking on back in Cropping.
bug:
5636363
Change-Id: I0e00b6119c4d184328002d1b2128e33ababc798b
Bobby Georgescu [Wed, 12 Sep 2012 23:37:53 +0000 (16:37 -0700)]
When tapping single-photo albums, launch photo directly
Bug:
7145102
Change-Id: I75c66f2f37fc11f3846fdbd40083787ba38af207
Teng-Hui Zhu [Wed, 12 Sep 2012 22:53:09 +0000 (15:53 -0700)]
Merge "Make ndk-build happy for Gallery jni." into gb-ub-photos-arches
Bobby Georgescu [Wed, 12 Sep 2012 20:48:50 +0000 (13:48 -0700)]
Reskin: Fix stability bugs introduced by reskin
Bug:
7150348
Bug:
7144206
Bug:
7050303
If PhotoPage is launched/resumed on a completely empty
album (for instance, if Gallery was opened to the Camera
folder and paused, all photos were deleted via the Camera
app, and then Gallery is resumed), bail out of PhotoPage
since it cannot handle this. Also fixes an NPE.
Change-Id: I162ff5ad149c322704c8af7d4705d87ae6c6098a
Bobby Georgescu [Wed, 12 Sep 2012 07:14:01 +0000 (00:14 -0700)]
Merge "Reskin: fix bug introduce by Gallery reskin" into gb-ub-photos-arches
Bobby Georgescu [Wed, 12 Sep 2012 00:02:03 +0000 (17:02 -0700)]
Launch next-gen editor if present and show FX button
Bug:
7050303
Shows editor button on the photo page and launches the
next-gen photo editor if it is present on the device.
Change-Id: I4058cffaec3fc4b446bd90dbecb809681d3255ea
Teng-Hui Zhu [Tue, 11 Sep 2012 21:24:02 +0000 (14:24 -0700)]
Make ndk-build happy for Gallery jni.
Need to specify the APP_PLATFORM to support egl.h when running ndk-build locally.
Change-Id: Ic2bf1e8b8021816063a123f5c2398727ea4b0493
Bobby Georgescu [Tue, 11 Sep 2012 20:47:27 +0000 (13:47 -0700)]
Reskin: fix bug introduce by Gallery reskin
Bug:
7146147
Bug:
7050303
Change-Id: Ia9782868937cc9a03e4c8b5f77033d13d80d5d8a
Bobby Georgescu [Tue, 11 Sep 2012 19:37:45 +0000 (12:37 -0700)]
Merge "Reskin: stop at first photo after swipe from camera" into gb-ub-photos-arches
Bobby Georgescu [Tue, 11 Sep 2012 18:18:36 +0000 (11:18 -0700)]
Reskin: stop at first photo after swipe from camera
Bug:
6399763
Bug:
7050303
Change-Id: I433bead637416f3c6e47fdc7567bb5de7575c01c
George Mount [Tue, 11 Sep 2012 17:42:56 +0000 (10:42 -0700)]
Merge "Separate build for AOSP and Google panorama modules." into gb-ub-photos-arches
Teng-Hui Zhu [Fri, 24 Aug 2012 21:50:37 +0000 (14:50 -0700)]
Add the UI elements for video trim activity.
1. Refactored the classes to support both the video play and trim.
Now the common code for controller overlay is in CommonControllerOverlay,
which is basically the same as the original MovieControllerOverlay without
animation. Because in trimming, we don't want to hide all the controller.
The specific animations are implemented in the sub-classes which are
TrimControllerOverlay and MovieControllerOverlay.
At the same time, TrimTimeBar extended TimeBar to support the extra
trimming start scrubber and end scrubber.
The interface between the timebar and the controllerOverlay are kept almost
the same way, except adding the trimming info when necessary.
With all these, the activity of TrimVideo now relied on the TrimTimeBar
and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar
and MovieControllerOverlay.
2. Hook the TrimVideo activity with the trim menu.
Note that the icons are temporary for now, still need UX input on that.
bug:
7093055
Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b
George Mount [Mon, 10 Sep 2012 23:03:49 +0000 (16:03 -0700)]
Separate build for AOSP and Google panorama modules.
Change-Id: Icb1059569914711a704334282566d898f58d1a30
Chih-Chung Chang [Thu, 6 Sep 2012 12:02:09 +0000 (20:02 +0800)]
Do not accept fling gesture after we changed from/to filmstrip mode.
Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905
Owen Lin [Tue, 11 Sep 2012 04:24:31 +0000 (21:24 -0700)]
Merge "Don't start filmstrip mode in Get Content mode." into gb-ub-photos-arches
Owen Lin [Tue, 4 Sep 2012 08:53:42 +0000 (16:53 +0800)]
Ensure peekObject is called in the syncrhonization block.
bug:
7019598
Change-Id: If153287078826afc9827ea64364b4fb64f2b3a5f
Owen Lin [Tue, 11 Sep 2012 04:10:18 +0000 (21:10 -0700)]
Merge "Remove the space before colons in details." into gb-ub-photos-arches
Wu-cheng Li [Mon, 10 Sep 2012 10:28:15 +0000 (18:28 +0800)]
Add attribution of icons.
Change-Id: I5c7a5580ec4bd6313a3f536f0b9e3927d8ab624e
Owen Lin [Tue, 11 Sep 2012 03:47:52 +0000 (11:47 +0800)]
Don't start filmstrip mode in Get Content mode.
Change-Id: Ib04f5c134d44b2d8e80e7fdecf2503e950487837
fix:
7135936
Michael Kolb [Tue, 11 Sep 2012 01:57:46 +0000 (18:57 -0700)]
Merge "Enable new camera UI" into gb-ub-photos-arches
Bobby Georgescu [Mon, 10 Sep 2012 23:06:11 +0000 (16:06 -0700)]
Merge "Improvements to empty album behavior in Gallery" into gb-ub-photos-arches
Bobby Georgescu [Sun, 9 Sep 2012 22:15:45 +0000 (15:15 -0700)]
Improvements to empty album behavior in Gallery
Bug:
7131332
Bug:
7009464
Toasts are now immediately dismissed if a non-empty album
is selected, and dismissed once Picasa Albums load at an
otherwise empty gallery root. The alert added in a previous
prompt has been replaced with a Toast also.
Change-Id: Icca79ab264b94979eedcf78e5c3899af745d8813
Doris Liu [Mon, 10 Sep 2012 22:17:47 +0000 (15:17 -0700)]
More logging added for monkey crash
The crash is difficult to repro. So I'm adding more logging here to help figure out what caused the crash next time it happens.
Bug:
6495745
Change-Id: Ib6a47f45e0508bc5def61fdc9f4e4a488b48ad92
Michael Kolb [Mon, 10 Sep 2012 22:14:56 +0000 (15:14 -0700)]
Enable new camera UI
Bug:
7139361
Leave both icons in launcher for comparisons
Change-Id: I9ecf0af5f27f5fc3e8be092a54188238d51b281e
George Mount [Mon, 10 Sep 2012 20:29:59 +0000 (13:29 -0700)]
Remove VIEW activity from LightCycle.
Bug
7133257
Change-Id: I4b3c968ceaa01d9461a788553f23bf7694ac4b3c
George Mount [Fri, 7 Sep 2012 17:36:25 +0000 (10:36 -0700)]
Show play icon for panorama.
Bug
7124494
Change-Id: I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3
Doris Liu [Mon, 10 Sep 2012 17:24:45 +0000 (10:24 -0700)]
Merge "Back button should progress through the app" into gb-ub-photos-arches
Baligh Uddin [Mon, 10 Sep 2012 16:54:08 +0000 (09:54 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Mon, 10 Sep 2012 16:35:50 +0000 (09:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I432b178fd229f51b6a9f780471801f6a2172abbd
Auto-generated-cl: translation import
Baligh Uddin [Mon, 10 Sep 2012 15:23:12 +0000 (08:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7434d5a9fd137cf2ee2931f0f9df7eeae7c8ad54
Auto-generated-cl: translation import
Wu-cheng Li [Mon, 10 Sep 2012 08:17:53 +0000 (16:17 +0800)]
Do not allow panorama viewer in secure album.
bug:
7053266
Change-Id: I5195638e03e5eb32d47b50b7b568a40cd8a222d9
Wu-cheng Li [Mon, 10 Sep 2012 07:20:12 +0000 (15:20 +0800)]
Fix build error in old version of java.
Change-Id: I2f88846a10afd696d7dd94ddeee767c3d89d5ccf
Bobby Georgescu [Mon, 10 Sep 2012 05:35:21 +0000 (22:35 -0700)]
Fix import statement breaking build
Change-Id: I0d2acb3ece6ed2aea04033f911a69b266b6cc7de
Bobby Georgescu [Fri, 7 Sep 2012 00:14:02 +0000 (17:14 -0700)]
Reskin: switching between filmstrip and grid in album
Bug:
7050303
Bug:
6541425
Allows switching between the filmstrip and the grid views
within albums and launches camera roll in filmstrip mode
by default. Also fixes animation issue when animating from
full-screen to grid view.
Change-Id: I2a37b92c129cc090fd807973f7e3e82fed207cd3
Doris Liu [Fri, 7 Sep 2012 21:33:52 +0000 (14:33 -0700)]
Back button should progress through the app
When Gallery is launched via notification, back button should progress through the app before return to Home
Bug:
6925612
Change-Id: I9da2120c6f607f8b6d3fa57d8a70225bc66fb8ef
George Mount [Fri, 7 Sep 2012 18:01:37 +0000 (11:01 -0700)]
Merge "Use XmpUtil to detect panorama instead of caption." into gb-ub-photos-arches
George Mount [Fri, 7 Sep 2012 14:39:01 +0000 (07:39 -0700)]
Use XmpUtil to detect panorama instead of caption.
Bug
7124493
Change-Id: I7a21206b47aea701428132d8500fa0873cb3c91a
Wu-cheng Li [Wed, 5 Sep 2012 09:29:41 +0000 (17:29 +0800)]
Update media items when a picture is deleted in secure album.
Query the database and only show the media items that
still exist.
bug:
7053266
Change-Id: Ic8c1b8c514e59741436bca14e918ef100eaf14f8
Baligh Uddin [Thu, 6 Sep 2012 21:12:29 +0000 (14:12 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Hung-ying Tyan [Thu, 6 Sep 2012 10:11:21 +0000 (03:11 -0700)]
Merge "Fix some typos and style in ExifTag" into gb-ub-photos-arches
Hung-ying Tyan [Thu, 6 Sep 2012 10:08:04 +0000 (03:08 -0700)]
Merge "Rearrange the constants in ExifTag" into gb-ub-photos-arches
Earl Ou [Wed, 5 Sep 2012 09:59:23 +0000 (17:59 +0800)]
Fix some typos and style in ExifTag
Change-Id: I2f8a8f0e529d6db9132ac57e09e86fcc18aba842
Earl Ou [Thu, 30 Aug 2012 06:46:58 +0000 (14:46 +0800)]
Rearrange the constants in ExifTag
Change-Id: I62ab6e52869dfa5b3fee7993bd109f4c5eed91a9
Doris Liu [Thu, 6 Sep 2012 02:51:58 +0000 (19:51 -0700)]
Fix tap to focus, back button to camera on Manta
Changed the move threshold from a hard coded value to be proportional to the size of the view.
Bug:
7080033
Bug:
7066859
Change-Id: Id7b81fb3da1783951886d43fe9a3df35186af985
George Mount [Wed, 5 Sep 2012 22:01:20 +0000 (15:01 -0700)]
Merge "Change lightcycle call to be in Gallery's package" into gb-ub-photos-arches
George Mount [Wed, 5 Sep 2012 20:14:16 +0000 (13:14 -0700)]
Change lightcycle call to be in Gallery's package
Bug
7076869
Change-Id: I315b660d8a7cd84db6d06f0aa38275c7f5e4b4a6
Bobby Georgescu [Wed, 5 Sep 2012 20:00:04 +0000 (13:00 -0700)]
Merge "Increase threshold for logging texture size warnings" into gb-ub-photos-arches
Bobby Georgescu [Wed, 5 Sep 2012 18:33:05 +0000 (11:33 -0700)]
Merge "Reskin: darker gray placeholder colors in gallery" into gb-ub-photos-arches
Baligh Uddin [Wed, 5 Sep 2012 17:00:54 +0000 (10:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80a4c7ddfb4d26b59b7adcd9c34248aae768f861
Auto-generated-cl: translation import
Angus Kong [Tue, 4 Sep 2012 10:05:45 +0000 (18:05 +0800)]
Move LightCycle checking to the closed source.
bug:
7076779
Change-Id: Ieebe0343a46257ca07f06483beb9391a90d7727a
Owen Lin [Wed, 5 Sep 2012 08:12:48 +0000 (16:12 +0800)]
Remove the space before colons in details.
bug:
6587084
Change-Id: Ifdbe24e84fb55c1892edb5652455274fc3775291
Owen Lin [Wed, 5 Sep 2012 07:59:34 +0000 (00:59 -0700)]
Merge "Revert "Remove the previewImage and staticWallpaperPreview."" into gb-ub-photos-arches
Bobby Georgescu [Tue, 4 Sep 2012 23:50:00 +0000 (16:50 -0700)]
Reskin: darker gray placeholder colors in gallery
Bug:
7106371
Bug:
7050303
Change-Id: I68eaa46ef4632778d5f9b6fb2c57d513e8c4c433
Baligh Uddin [Tue, 4 Sep 2012 19:02:07 +0000 (12:02 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Bobby Georgescu [Tue, 4 Sep 2012 18:51:56 +0000 (11:51 -0700)]
Increase threshold for logging texture size warnings
Bug:
7094140
Change-Id: I0dc56dc92db6821527ceb71e49c3e83d818340c2
Owen Lin [Tue, 4 Sep 2012 08:54:39 +0000 (01:54 -0700)]
Merge "Make a time jump when user clicks outsides the scrubber." into gb-ub-photos-arches
Owen Lin [Tue, 4 Sep 2012 07:29:11 +0000 (00:29 -0700)]
Merge "Set inMutable to true if we may reuse the bitmap." into gb-ub-photos-arches
Owen Lin [Tue, 4 Sep 2012 07:17:18 +0000 (15:17 +0800)]
Make a time jump when user clicks outsides the scrubber.
bug:
7080593
Change-Id: I913aee6e416c10d68403d7f9d4102d4dcc41e1d4
Owen Lin [Tue, 4 Sep 2012 03:44:57 +0000 (11:44 +0800)]
Set inMutable to true if we may reuse the bitmap.
bug:
7092330
Change-Id: I0def7e2e9ce57d09ba7f5e001b33cc605a6af44c
Hung-ying Tyan [Tue, 4 Sep 2012 01:56:00 +0000 (09:56 +0800)]
Fix NPE in CropImage.changeExifImageSizeTag().
Bug:
7099850
Change-Id: Ib7b3b7d9fddaf53853bcc98b9588dfadda0aee6f
Owen Lin [Mon, 3 Sep 2012 06:27:27 +0000 (23:27 -0700)]
Merge "Fix NPE when deleting a photo in Clustering mode." into gb-ub-photos-arches
Hung-ying Tyan [Mon, 3 Sep 2012 03:12:58 +0000 (20:12 -0700)]
Merge "Handle other header tag in ExifParser before APP1" into gb-ub-photos-arches
Hung-ying Tyan [Mon, 3 Sep 2012 03:12:43 +0000 (20:12 -0700)]
Merge "Handle mis-ordered APP segment in ExifOutputStream" into gb-ub-photos-arches
Hung-ying Tyan [Mon, 3 Sep 2012 03:12:27 +0000 (20:12 -0700)]
Merge "Remove the parameter of getAllExifTags() in IfdData" into gb-ub-photos-arches
Hung-ying Tyan [Mon, 3 Sep 2012 03:12:12 +0000 (20:12 -0700)]
Merge "Fix some typos and style in previous CL" into gb-ub-photos-arches
Hung-ying Tyan [Mon, 3 Sep 2012 03:11:35 +0000 (20:11 -0700)]
Merge "Save EXIF info to cropped picasa image with the new EXIF lib." into gb-ub-photos-arches
Baligh Uddin [Fri, 31 Aug 2012 14:33:05 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c4f92160aade1405f96383212cda95f6b75f38f
Auto-generated-cl: translation import
Earl Ou [Fri, 31 Aug 2012 02:52:18 +0000 (10:52 +0800)]
Handle other header tag in ExifParser before APP1
Change-Id: I44398e3ed054de441810b795daff8d1edb06df59
Earl Ou [Fri, 31 Aug 2012 01:59:20 +0000 (09:59 +0800)]
Handle mis-ordered APP segment in ExifOutputStream
Change-Id: Ic5ce13d17658e24d1ae42009d3ab30ae538cee10
Wu-cheng Li [Fri, 31 Aug 2012 07:52:54 +0000 (00:52 -0700)]
Merge "Use FLAG_SHOW_WHEN_LOCKED for secure album." into gb-ub-photos-arches
Wu-cheng Li [Thu, 30 Aug 2012 08:44:32 +0000 (16:44 +0800)]
Use FLAG_SHOW_WHEN_LOCKED for secure album.
The activity needs this flag to be on top of the lock screen
when the camera is started from the secure lock screen.
bug:
5955016
Change-Id: If554a3f7fef4c03a981c83afe22b8c4980b954d1
Wu-Cheng Li [Fri, 31 Aug 2012 06:26:53 +0000 (23:26 -0700)]
Merge "Add api check for FLAG_SECURE." into gb-ub-photos-arches
Ahbong Chang [Thu, 30 Aug 2012 07:16:50 +0000 (15:16 +0800)]
Add api check for FLAG_SECURE.
Bug:
7023285
Change-Id: I515123a7454595846bbea6369c05cd22b7d2ec60
Baligh Uddin [Fri, 31 Aug 2012 05:23:44 +0000 (22:23 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Earl Ou [Fri, 31 Aug 2012 01:55:58 +0000 (09:55 +0800)]
Remove the parameter of getAllExifTags() in IfdData
Change-Id: Iec7f04a9866c53caa2d66d5ea6f679460980b378
Earl Ou [Fri, 31 Aug 2012 01:58:49 +0000 (09:58 +0800)]
Fix some typos and style in previous CL
Change-Id: If78c0bfebccb20b0c4dad42a11b5dd0946b4e172
Earl Ou [Thu, 30 Aug 2012 04:02:43 +0000 (12:02 +0800)]
Save EXIF info to cropped picasa image with the new EXIF lib.
Bug:
5248023
Change-Id: I35f401826f4fa586e9899e3ca5f5f9b9ab39b28e
Earl Ou [Thu, 30 Aug 2012 04:01:05 +0000 (12:01 +0800)]
Add prefix to GPS tag in ExifTag
Change-Id: Ib07d2847ddcbed3b06d07afa2a6d5851c27760b1
Earl Ou [Wed, 29 Aug 2012 07:45:30 +0000 (15:45 +0800)]
Re-save Exif info for cropped local image
Bug:
5248023
Change-Id: I744330f28b887bff4d12937e06f8d20db153ac7e
Owen Lin [Thu, 30 Aug 2012 07:51:55 +0000 (00:51 -0700)]
Merge "ExifOutputStream" into gb-ub-photos-arches
Owen Lin [Wed, 29 Aug 2012 03:53:10 +0000 (11:53 +0800)]
Remove unused resources and fix some warnings.
Change-Id: I075977150c7da7650e723e29406f24ae2e23ea97
Owen Lin [Thu, 30 Aug 2012 07:36:53 +0000 (15:36 +0800)]
Fix NPE when deleting a photo in Clustering mode.
bug:
7075760
Change-Id: I64b278b8c9436ada23738f28510736dcf7e18755
Hung-ying Tyan [Thu, 30 Aug 2012 06:55:33 +0000 (23:55 -0700)]
Merge "Add equals() function in ExifData, IfdData, and ExifTag" into gb-ub-photos-arches
Hung-ying Tyan [Thu, 30 Aug 2012 06:52:55 +0000 (23:52 -0700)]
Merge "Redesign the set function of ExifTag" into gb-ub-photos-arches
Earl Ou [Tue, 28 Aug 2012 10:39:49 +0000 (18:39 +0800)]
ExifOutputStream
Change-Id: I9f2de77e87a502ccdadba0b18658621028c538c9
Earl Ou [Wed, 29 Aug 2012 04:12:24 +0000 (12:12 +0800)]
Add equals() function in ExifData, IfdData, and ExifTag
Change-Id: I96c5767354548d0f0d7571fd1d8812e1ab54a5c4
Earl Ou [Wed, 29 Aug 2012 02:21:23 +0000 (10:21 +0800)]
Redesign the set function of ExifTag
Change-Id: Iaf5632d759fe14c167cba54099b99719b31e3431
Owen Lin [Thu, 30 Aug 2012 02:45:37 +0000 (19:45 -0700)]
Merge "Fix OOM in TileImageView." into gb-ub-photos-arches
Baligh Uddin [Thu, 30 Aug 2012 00:36:06 +0000 (17:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I381c77c04e94bce19bde5edd7ce7057b54fa2a8f
Auto-generated-cl: translation import
Bobby Georgescu [Wed, 29 Aug 2012 23:30:50 +0000 (16:30 -0700)]
Merge "Reskin: Correctly position rotated thumbs in album listing" into gb-ub-photos-arches
Bobby Georgescu [Tue, 28 Aug 2012 21:42:57 +0000 (14:42 -0700)]
Reskin: Correctly position rotated thumbs in album listing
Bug:
7067732
Bug:
7050303
Changing the slots to be non-square surfaced a small math
error, and also raised the question of where exactly to
render the texture. The solution that makes the most sense
given the current design is to fit the thumbnail (which is
always square in our case) in the largest square that fits
inside the slot, and aligned to the top.
Change-Id: I98d94ad9255399aa4f1e5c403ff81811674bb264
Angus Kong [Fri, 24 Aug 2012 11:30:08 +0000 (19:30 +0800)]
Invoke LightCycle viewer for panoramas.
1. Add SUPPORT_PANORAMA_VIEW to supported operations.
2. Add helper methods in LightCycleHelper:
a. checks if the image file is a panorama.
b. invokes the panorama view activity.
bug:
6912297
Change-Id: I7909e49632cad02a795943a113bca6aec17df9dd
Hung-ying Tyan [Wed, 29 Aug 2012 09:31:41 +0000 (02:31 -0700)]
Merge "Fix pinch out gesture for film strip mode on gingerbread." into gb-ub-photos-arches
Owen Lin [Wed, 29 Aug 2012 08:36:08 +0000 (16:36 +0800)]
Fix OOM in TileImageView.
The problem is we keep too many decoded images in the upload queue.
Those images will be free after it getting uploaded.
However, there is a bug which suspend the uploading sometimes.
Change-Id: Id97c04eba974cc77e5d8c50588b0cbef776f79da
fix:
6995091
Owen Lin [Wed, 29 Aug 2012 08:46:38 +0000 (01:46 -0700)]
Merge "Fix NPE in viewing single image." into gb-ub-photos-arches
Hung-ying Tyan [Wed, 29 Aug 2012 06:15:32 +0000 (14:15 +0800)]
Fix pinch out gesture for film strip mode on gingerbread.
On crespo running Android 2.3.6, a pinch out gesture results in the following
call sequence: onDown(), onUp() and then onSingleTapUp(). The correct sequence
for a single-tap-up gesture should be: onDown(), onSingleTapUp() and onUp().
The call sequence for a pinch out gesture in JB is: onDown() and then onUp().
Base on these observations, a condition is added in onSingleTapUp() to filter
out the false alarm where onSingleTapUp() is called within a pinch out gesture.
Bug:
7023717
Change-Id: I010b87f95c3197a299a7d907ce32e93a1d5e958f
OSDN Git Service
