OSDN Git Service
Alan Newberger [Wed, 6 Nov 2013 04:47:39 +0000 (20:47 -0800)]
am
2bcb8d1f: add \'capturing\' string for in process indicators
* commit '
2bcb8d1ff1c448d4c22e9172f2bb83839d1759cb':
add 'capturing' string for in process indicators
Alan Newberger [Wed, 6 Nov 2013 04:15:01 +0000 (20:15 -0800)]
add 'capturing' string for in process indicators
This string can be used for in progess screen indicators.
Bug:
11505806
Change-Id: I3b0e3809b8389cfea2059b239d09a3e0766a77c6
Ruben Brunk [Wed, 6 Nov 2013 02:45:26 +0000 (18:45 -0800)]
am
404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
* commit '
404d7eb0029e1dcb94d38b0595fdd84345207b0a':
camera: Ensure camera release for lockscreen transition.
Ruben Brunk [Wed, 6 Nov 2013 02:43:16 +0000 (02:43 +0000)]
Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
Doris Liu [Wed, 6 Nov 2013 02:06:55 +0000 (18:06 -0800)]
am
d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
* commit '
d1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4':
Make sure preview aspect ratio is updated
Doris Liu [Wed, 6 Nov 2013 02:04:37 +0000 (02:04 +0000)]
Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
Ruben Brunk [Tue, 5 Nov 2013 23:53:28 +0000 (15:53 -0800)]
camera: Ensure camera release for lockscreen transition.
Bug:
11063890
Change-Id: Iec7fb672571166ee5a560a8245b56affa627e88b
Doris Liu [Tue, 5 Nov 2013 23:25:26 +0000 (15:25 -0800)]
Make sure preview aspect ratio is updated
Bug:
11509233
Change-Id: Ide6f5bbe0abe7ed45e56b3f34c19204c1294afc7
Baligh Uddin [Tue, 5 Nov 2013 23:15:46 +0000 (23:15 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 00:11:00 +0000 (16:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0f4b4f2b969168513e77763bcd64027fc2a67445
Auto-generated-cl: translation import
Alan Newberger [Mon, 4 Nov 2013 22:58:38 +0000 (14:58 -0800)]
am
bf4ce93c: Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad
* commit '
bf4ce93c84400357a28f78a76df62b550e7f85d1':
adjust keyguard camera layout to make buttons match
Alan Newberger [Mon, 4 Nov 2013 22:55:20 +0000 (22:55 +0000)]
Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad
Doris Liu [Mon, 4 Nov 2013 22:26:11 +0000 (14:26 -0800)]
am
3493ba2a: Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad
* commit '
3493ba2a0a2e91a093c5fddad60bc1f1e56b91b5':
Preserve high resolution image on touch during zoom
Doris Liu [Mon, 4 Nov 2013 22:22:44 +0000 (22:22 +0000)]
Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad
Alan Newberger [Mon, 4 Nov 2013 22:22:04 +0000 (14:22 -0800)]
am
7f044e2e: Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad
* commit '
7f044e2eb182f1d1ae023d55f30757439a17ee09':
Adjust HDR options menu details
Alan Newberger [Mon, 4 Nov 2013 22:19:48 +0000 (22:19 +0000)]
Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad
Alan Newberger [Mon, 4 Nov 2013 22:12:26 +0000 (14:12 -0800)]
Adjust HDR options menu details
To better align HDR/HDR+ menu options with other menu options,
shortening the description and making it all caps.
Bug:
11481286
Change-Id: I05ddb3594d1680b11259f128cc1e4aa7954892f8
Doris Liu [Mon, 4 Nov 2013 22:03:28 +0000 (14:03 -0800)]
Preserve high resolution image on touch during zoom
Bug:
11477449
Change-Id: I08b33cee258de1f90e5fa60e6483834dd5197bd2
Sascha Haeberling [Mon, 4 Nov 2013 21:59:30 +0000 (13:59 -0800)]
am
ba1b30b7: Check for media service being present before capture.
* commit '
ba1b30b7793a8a881493a9fc48f27d503db2405b':
Check for media service being present before capture.
Sascha Haeberling [Mon, 4 Nov 2013 20:11:34 +0000 (12:11 -0800)]
Check for media service being present before capture.
Bug:
11508325
Change-Id: I0997f9bff63b1cdb3c33272acc8617b30c07424a
Alan Newberger [Fri, 1 Nov 2013 20:39:30 +0000 (13:39 -0700)]
am
ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad
* commit '
ccfafd95cd4fa046df9d43469d28152f8a04bfed':
Add Samsung front camera resolutions
Alan Newberger [Fri, 1 Nov 2013 20:37:16 +0000 (20:37 +0000)]
Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad
Michael Kolb [Tue, 4 Jun 2013 18:40:20 +0000 (11:40 -0700)]
Add Samsung front camera resolutions
Bug:
11462711
Bug:
9275928
Change-Id: Ibe6bc8af214eab1fc5f4119823d32ef7876288f5
Sascha Haeberling [Fri, 1 Nov 2013 16:58:31 +0000 (09:58 -0700)]
am
238d6ec7: Add new notification icon.
* commit '
238d6ec7a9a7a33ceeb5de9cd0dd22cea6a1bff7':
Add new notification icon.
Sascha Haeberling [Fri, 1 Nov 2013 16:47:58 +0000 (09:47 -0700)]
Add new notification icon.
Bug:
11417480
Change-Id: I072a1348d515b2cd435748e2db2824e98a604413
Baligh Uddin [Fri, 1 Nov 2013 14:49:33 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Ruben Brunk [Thu, 31 Oct 2013 20:43:24 +0000 (13:43 -0700)]
am
6ff701f5: Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad
* commit '
6ff701f5c8744583a73588f301374ff7e683ff15':
gcam: Add generic preview fps range selection.
Ruben Brunk [Thu, 31 Oct 2013 20:40:45 +0000 (20:40 +0000)]
Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad
Alan Newberger [Wed, 30 Oct 2013 21:36:08 +0000 (14:36 -0700)]
am
761306fa: Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
* commit '
761306fadfa94b538f43e8cf3463bf6d22814947':
Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
Alan Newberger [Wed, 30 Oct 2013 19:51:21 +0000 (12:51 -0700)]
Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
CameraUtil.launchGallery incorrectly describes a mechanism to call an APP_GALLERY
category intent. Since we're using Gallery icon we should go direct to Gallery,
which IntentHelper already does. Simply removed the util class and call the
helper direct from the activity. Also noticed during testing that the SecureCamera
was not correctly showing the Gallery icon, though its behavior would take user
to Gallery. Finally, removing restriction that the video player intent should
go to Gallery, instead it should route to system preferred intent.
Bug:
11065256
Change-Id: I941f9469de169919c4bac6c91dde7e577921f737
Baligh Uddin [Wed, 30 Oct 2013 18:47:15 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I87da2fbfde7c44784a1597a7158dd385ce65d21a
Auto-generated-cl: translation import
Ruben Brunk [Wed, 30 Oct 2013 01:28:32 +0000 (18:28 -0700)]
gcam: Add generic preview fps range selection.
Bug:
11433097
Change-Id: Ice0f7ad3cd0684183298ce03bab3038a41316cf6
Andy Huibers [Wed, 30 Oct 2013 00:40:33 +0000 (17:40 -0700)]
am
cec75e40: Fix rotation bug for animated thumbnail shown after capture.
* commit '
cec75e408a2d451b90bac5f06e10906ffcafff33':
Fix rotation bug for animated thumbnail shown after capture.
Andy Huibers [Tue, 29 Oct 2013 23:03:58 +0000 (16:03 -0700)]
Fix rotation bug for animated thumbnail shown after capture.
Bug:
11420737
Change-Id: I55b90137b362d0b3b98aba34114537e0f6107b8c
Doris Liu [Tue, 29 Oct 2013 00:28:46 +0000 (17:28 -0700)]
am
af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
* commit '
af714f9ec3264211cb00139ffe0f05d55085ffc2':
Fix the mapping between preview UI and camera sensor
Doris Liu [Tue, 29 Oct 2013 00:27:08 +0000 (00:27 +0000)]
Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
ztenghui [Mon, 28 Oct 2013 22:57:58 +0000 (15:57 -0700)]
am
e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
* commit '
e546d48b4acfbf2441b685b2c7d6a4e14241f34b':
Fix crash when trying to reopen the camera.
ztenghui [Mon, 28 Oct 2013 22:57:00 +0000 (22:57 +0000)]
Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
ztenghui [Mon, 28 Oct 2013 22:27:02 +0000 (15:27 -0700)]
Fix crash when trying to reopen the camera.
In this case, another app is using the Camera, such that the camera.open will
hit an exception. We should show an dialog here.
bug:
11258139
Change-Id: I0bd2d05fe4d4d9c5e4b87b39f3ef48910cfb7111
Doris Liu [Mon, 28 Oct 2013 21:44:24 +0000 (14:44 -0700)]
Fix the mapping between preview UI and camera sensor
Bug:
11409659
Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
Ruben Brunk [Mon, 28 Oct 2013 18:45:51 +0000 (11:45 -0700)]
am
0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad
* commit '
0a64e00e88514ae07c3514e19126c166dda0ca82':
gcam: Add placeholder image.
Ruben Brunk [Mon, 28 Oct 2013 18:44:08 +0000 (18:44 +0000)]
Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 17 Oct 2013 22:41:44 +0000 (15:41 -0700)]
gcam: Add placeholder image.
Bug:
11050749
Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
ztenghui [Mon, 28 Oct 2013 18:11:24 +0000 (11:11 -0700)]
am
5250fb28: Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad
* commit '
5250fb28143d45c41673a572b4c5b350e6563eb0':
Fix memory leak due to inner class for handler.
Doris Liu [Mon, 28 Oct 2013 18:11:23 +0000 (11:11 -0700)]
am
d053a5b2: Update aspect ratio when preview aspect ratio changes
* commit '
d053a5b2aa8cd9cb09bd40962b305ef34e7d404b':
Update aspect ratio when preview aspect ratio changes
ztenghui [Mon, 28 Oct 2013 18:09:51 +0000 (18:09 +0000)]
Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad
ztenghui [Fri, 25 Oct 2013 21:56:32 +0000 (14:56 -0700)]
Fix memory leak due to inner class for handler.
To keep the existing interface, we just overwrite the handler here.
bug:
11336965
Change-Id: I77b2f577279244439ee9f81344f47bf5773e527b
Doris Liu [Sat, 26 Oct 2013 03:20:43 +0000 (20:20 -0700)]
Update aspect ratio when preview aspect ratio changes
Bug:
11250125
Change-Id: If4047860f056cd81bf7d74045a68f5c0b85ad067
Doris Liu [Sat, 26 Oct 2013 01:11:06 +0000 (18:11 -0700)]
am
5737b932: Fix skipped hide review layout calls
* commit '
5737b93254f451859c7924792c46354d385da946':
Fix skipped hide review layout calls
Doris Liu [Fri, 25 Oct 2013 20:38:54 +0000 (13:38 -0700)]
Fix skipped hide review layout calls
Bug:
11338381
Change-Id: I39c9541638f3e8c2a2f96ae4b1be7692a6db0e1c
Baligh Uddin [Tue, 22 Oct 2013 19:55:17 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Sascha Haeberling [Mon, 21 Oct 2013 20:52:07 +0000 (13:52 -0700)]
am
156ea57c: Merge "Bump version number for MR1" into gb-ub-photos-carlsbad
* commit '
156ea57cd76cc96c507e3ded946cc9ce48647153':
Bump version number for MR1
Sascha Haeberling [Mon, 21 Oct 2013 20:50:13 +0000 (20:50 +0000)]
Merge "Bump version number for MR1" into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 21 Oct 2013 20:33:28 +0000 (13:33 -0700)]
Bump version number for MR1
Bug:
11240056
Change-Id: Ia3ad9f86516eed5ca60e8707d53139d54e3ee562
Erin Dahlgren [Mon, 21 Oct 2013 20:49:00 +0000 (13:49 -0700)]
am
65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
* commit '
65e2389b3de5992c49732d95902e6e742e44821b':
Update preview controls on deleting all items.
Erin Dahlgren [Mon, 21 Oct 2013 20:47:33 +0000 (20:47 +0000)]
Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
Erin Dahlgren [Mon, 21 Oct 2013 17:08:54 +0000 (10:08 -0700)]
Update preview controls on deleting all items.
Bug:
11219537
Change-Id: I897b65bd7c594b904aa29462e056a10d0e9c52a2
ztenghui [Mon, 21 Oct 2013 20:29:37 +0000 (13:29 -0700)]
am
68c1c1e0: The initial focus value should be true.
* commit '
68c1c1e02143e3d2c2dbc658645a3a981f58cdd5':
The initial focus value should be true.
ztenghui [Mon, 21 Oct 2013 20:29:37 +0000 (13:29 -0700)]
am
56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading.
* commit '
56e44af257d65d730f04d1e90c87f5674abd7f26':
Don't call onCurrentDataChanged for CameraPreview when reloading.
Baligh Uddin [Mon, 21 Oct 2013 18:29:15 +0000 (11:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6731c0dc80337184cc87329ca824164899563b5f
Auto-generated-cl: translation import
ztenghui [Mon, 21 Oct 2013 17:33:40 +0000 (10:33 -0700)]
The initial focus value should be true.
Every time when we enter the wide angel (SRI) module, the preview should be
in focus.
bug:
11234723
Change-Id: I218573946609f1e0e4415621a71b96a20775237d
ztenghui [Tue, 15 Oct 2013 22:31:00 +0000 (15:31 -0700)]
Don't call onCurrentDataChanged for CameraPreview when reloading.
In this case, camera preview didn't change, so there is no need to call
onCurrentDataChanged.
bug:
11237255
Change-Id: I788a2ee4e7337721d0bbd6aa75e7da6d382bf282
Doris Liu [Sat, 19 Oct 2013 00:42:29 +0000 (17:42 -0700)]
am
891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
* commit '
891a80756166a8621f063c727000c9a943cf5465':
Fix SRI orientation on manta
Doris Liu [Sat, 19 Oct 2013 00:39:54 +0000 (00:39 +0000)]
Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
Doris Liu [Sat, 19 Oct 2013 00:15:30 +0000 (17:15 -0700)]
Fix SRI orientation on manta
Bug:
11292213
Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
Sascha Haeberling [Fri, 18 Oct 2013 18:44:40 +0000 (11:44 -0700)]
am
464f2201: Don\'t crash when preview surface could not be set.
* commit '
464f22013750a416f9fc9a1e32007576d0b655d6':
Don't crash when preview surface could not be set.
Sascha Haeberling [Thu, 17 Oct 2013 22:29:38 +0000 (15:29 -0700)]
Don't crash when preview surface could not be set.
Bug:
11021188
Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
Sascha Haeberling [Thu, 17 Oct 2013 21:10:24 +0000 (14:10 -0700)]
am
f302a391: Update HDR/HDR+ arc menu hover messages.
* commit '
f302a391dfcb435660e18d3111c4e1a618c0cf6e':
Update HDR/HDR+ arc menu hover messages.
Sascha Haeberling [Thu, 17 Oct 2013 20:51:23 +0000 (13:51 -0700)]
Update HDR/HDR+ arc menu hover messages.
Bug :
11185194
Change-Id: Ie26e9a225dffa0a8ccd9e99fff3d7264b079ac62
Doris Liu [Thu, 17 Oct 2013 17:49:23 +0000 (10:49 -0700)]
am
8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
* commit '
8470cae9049959ee6bb28cde1c53185f2ffd10a1':
Show a preview cover until real preview is ready
Doris Liu [Thu, 17 Oct 2013 17:46:48 +0000 (17:46 +0000)]
Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
ztenghui [Thu, 17 Oct 2013 17:43:17 +0000 (10:43 -0700)]
am
f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
* commit '
f149ec53a0fa3330617ce01751964662d3273c88':
Don't allow swipe into the film strip view when swipe is disabled
ztenghui [Thu, 17 Oct 2013 17:40:20 +0000 (17:40 +0000)]
Merge "Don't allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 17 Oct 2013 17:19:04 +0000 (10:19 -0700)]
am
270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
270b64e950ce8bfd137398df83e8fcb2f9b0ce4d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:16:59 +0000 (17:16 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 17 Oct 2013 15:19:10 +0000 (15:19 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 17 Oct 2013 07:28:18 +0000 (00:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50a68a5ff367a08ae06bd84c83e1035b9fb0bdd5
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Oct 2013 07:27:38 +0000 (00:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie510117ceb7dacad642d2fb87c81aa3aa0ff3e89
Auto-generated-cl: translation import
Ed Heyl [Thu, 17 Oct 2013 00:45:03 +0000 (17:45 -0700)]
merge in klp-release (no-op)
ztenghui [Wed, 16 Oct 2013 23:32:59 +0000 (16:32 -0700)]
am
9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
* commit '
9db9282667d9e272702cd2ee32d7415204084530':
Send an message to decouple the gcam module change.
ztenghui [Wed, 16 Oct 2013 23:10:39 +0000 (23:10 +0000)]
Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
ztenghui [Wed, 16 Oct 2013 21:43:26 +0000 (14:43 -0700)]
Send an message to decouple the gcam module change.
In this particular case, we try to enter GCam module directly which cause the
mCameraDevice to become null for photo module.
Therefore we post a message to switch into GCam to make sure current mode
switch complete first.
bug:
11252237
Change-Id: Ibd33815e7bee74425faa758247e1dec85a2f17cb
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:13:53 +0000 (15:13 -0700)]
am
66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad
* commit '
66f3948315b6bf851dcd5d618d96d6fcda49f159':
update camera launcher icon
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:11:27 +0000 (22:11 +0000)]
Merge "update camera launcher icon" into gb-ub-photos-carlsbad
Doris Liu [Wed, 16 Oct 2013 21:59:36 +0000 (14:59 -0700)]
am
7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
* commit '
7bd95307ecdca5c7661bc3fb1765313ceb62e92a':
Fix shutter covering pie menu
Doris Liu [Wed, 16 Oct 2013 21:57:32 +0000 (21:57 +0000)]
Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
Doris Liu [Wed, 16 Oct 2013 19:51:02 +0000 (12:51 -0700)]
Fix shutter covering pie menu
Bug:
11247988
Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 17:34:29 +0000 (10:34 -0700)]
update camera launcher icon
fixed b/
11252230
Change-Id: I78ef2c748246d7c30849ece2b029150096bc1227
Doris Liu [Wed, 16 Oct 2013 02:10:28 +0000 (19:10 -0700)]
Show a preview cover until real preview is ready
Bug:
11211650
Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
The Android Automerger [Tue, 15 Oct 2013 22:55:46 +0000 (15:55 -0700)]
merge in klp-release history after reset to klp-dev
Igor Murashkin [Tue, 15 Oct 2013 21:54:09 +0000 (14:54 -0700)]
am
5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
* commit '
5e82f81a7c7daaf8ac86dbd688b344027f97ff64':
gcam: Fix AF spinner not to reset when changing position
Igor Murashkin [Tue, 15 Oct 2013 21:51:39 +0000 (21:51 +0000)]
Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
Alan Newberger [Tue, 15 Oct 2013 21:29:24 +0000 (14:29 -0700)]
adjust keyguard camera layout to make buttons match
by trial and error adjusted the bottom margins of the controls to make
transition to real camera layout seamless on the HH and N4.
Bug:
11236276
Change-Id: I707a5b0b94ac466c07b19c84473e444250cecf28
ztenghui [Tue, 15 Oct 2013 21:13:26 +0000 (14:13 -0700)]
Don't allow swipe into the film strip view when swipe is disabled
The swipe is supposed to be intercepted by FilmStripView, however, when the
children is not handling the scroll / fling gestures, FilmStripView will still
has to handle it.
In this case, we need to detect whether or not the swipe has been disabled.
bug:
11234333
bug:
11221594
Change-Id: I1d0fbac65050aef225fb880a41df735e98bf48db
Igor Murashkin [Tue, 15 Oct 2013 20:43:31 +0000 (13:43 -0700)]
gcam: Fix AF spinner not to reset when changing position
Bug:
10936156
Change-Id: If9b73415e95684e2acbcbc15457e865bd133f366
Doris Liu [Tue, 15 Oct 2013 20:01:11 +0000 (13:01 -0700)]
am
08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
* commit '
08749a4ed22c5001aa476a9a30df323b00a6df7d':
Dismiss switcher popup when shutter button is clicked
Doris Liu [Tue, 15 Oct 2013 19:58:43 +0000 (19:58 +0000)]
Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
Igor Murashkin [Tue, 15 Oct 2013 19:58:05 +0000 (12:58 -0700)]
am
d3e75bd7: Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad
* commit '
d3e75bd748ce2be8fdcb30575bbde9bd07536bd3':
CameraUtil: add float clamp function
Igor Murashkin [Tue, 15 Oct 2013 19:55:18 +0000 (19:55 +0000)]
Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad
Doris Liu [Tue, 15 Oct 2013 19:51:47 +0000 (12:51 -0700)]
Dismiss switcher popup when shutter button is clicked
Bug:
11224722
Change-Id: Id9813c83e22e951f06cb7a885fdb34820f62b545