OSDN Git Service
Ruben Brunk [Thu, 31 Oct 2013 20:47:13 +0000 (13:47 -0700)]
am
74c47a95: am
f5230ffd: am
6ff701f5: Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad
* commit '
74c47a95b929d3713d42aee7c68a2daf2a770b00':
gcam: Add generic preview fps range selection.
Ruben Brunk [Thu, 31 Oct 2013 20:44:44 +0000 (13:44 -0700)]
am
f5230ffd: am
6ff701f5: Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad
* commit '
f5230ffdd2e2894b8c5912283de579778f8d3c05':
gcam: Add generic preview fps range selection.
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:42:01 +0000 (14:42 -0700)]
am
4f78acab: am
c0dd6624: am
761306fa: Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
* commit '
4f78acab15d2a1fb3b81fa73beee179955c1e2c4':
Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
Alan Newberger [Wed, 30 Oct 2013 21:38:43 +0000 (14:38 -0700)]
am
c0dd6624: am
761306fa: Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
* commit '
c0dd6624e7885567e89a8c42343b34376b748fda':
Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
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
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:45:04 +0000 (17:45 -0700)]
am
8b639c63: am
fabdb282: am
cec75e40: Fix rotation bug for animated thumbnail shown after capture.
* commit '
8b639c63e21d240a52b497fe13dcddc672af9ab7':
Fix rotation bug for animated thumbnail shown after capture.
Andy Huibers [Wed, 30 Oct 2013 00:43:00 +0000 (17:43 -0700)]
am
fabdb282: am
cec75e40: Fix rotation bug for animated thumbnail shown after capture.
* commit '
fabdb282b969118e1c3d094ed023fa57af03c66e':
Fix rotation bug for animated thumbnail shown after capture.
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:35:53 +0000 (17:35 -0700)]
am
70a6c065: am
2879b7eb: am
af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
* commit '
70a6c065ed7f5ec3a4400bae39f1f5e8f955712f':
Fix the mapping between preview UI and camera sensor
Doris Liu [Tue, 29 Oct 2013 00:33:43 +0000 (17:33 -0700)]
am
2879b7eb: am
af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
* commit '
2879b7ebc3ac510da1c68877c43f6361057c5dc3':
Fix the mapping between preview UI and camera sensor
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 23:36:17 +0000 (16:36 -0700)]
am
cbde8aa1: am
a16d166a: am
e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
* commit '
cbde8aa1b250c8f0335967e6862435f043abf783':
Fix crash when trying to reopen the camera.
ztenghui [Mon, 28 Oct 2013 23:31:26 +0000 (16:31 -0700)]
am
a16d166a: am
e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
* commit '
a16d166adaae1e01ea5efc009ffe7eb5c79f3585':
Fix crash when trying to reopen the camera.
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:48:38 +0000 (11:48 -0700)]
am
82339072: am
72e1e639: am
0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad
* commit '
823390721687e451b0caf4b0781c8ccb4269c287':
gcam: Add placeholder image.
Ruben Brunk [Mon, 28 Oct 2013 18:47:34 +0000 (11:47 -0700)]
am
72e1e639: am
0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad
* commit '
72e1e639206eccac20a9459f0029ec57640d7e0e':
gcam: Add placeholder image.
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
ztenghui [Mon, 28 Oct 2013 18:17:03 +0000 (11:17 -0700)]
am
7835245c: am
24e0f4d7: am
5250fb28: Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad
* commit '
7835245c19d1aa3b17f174f95102ee77c93f6d2c':
Fix memory leak due to inner class for handler.
Doris Liu [Mon, 28 Oct 2013 18:17:02 +0000 (11:17 -0700)]
am
318b4eab: am
f59776db: am
d053a5b2: Update aspect ratio when preview aspect ratio changes
* commit '
318b4eabff3ef0dc8266e98f486d534f59861344':
Update aspect ratio when preview aspect ratio changes
ztenghui [Mon, 28 Oct 2013 18:13:58 +0000 (11:13 -0700)]
am
24e0f4d7: am
5250fb28: Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad
* commit '
24e0f4d7801e114bf95b194839b6f7ffb9f76cd6':
Fix memory leak due to inner class for handler.
Doris Liu [Mon, 28 Oct 2013 18:13:57 +0000 (11:13 -0700)]
am
f59776db: am
d053a5b2: Update aspect ratio when preview aspect ratio changes
* commit '
f59776db86a91e3a2e9e1925f30fbec9f78c8777':
Update aspect ratio when preview aspect ratio changes
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:21:55 +0000 (18:21 -0700)]
am
4db1e03e: am
cf940d9e: am
5737b932: Fix skipped hide review layout calls
* commit '
4db1e03ea25c7be62953138ccd62902b085854ee':
Fix skipped hide review layout calls
Doris Liu [Sat, 26 Oct 2013 01:17:15 +0000 (18:17 -0700)]
am
cf940d9e: am
5737b932: Fix skipped hide review layout calls
* commit '
cf940d9e40cdc9a8876b9484153eedced654fc75':
Fix skipped hide review layout calls
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:59:54 +0000 (12:59 -0700)]
am
91fb860e: (-s ours) am
865c72a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
91fb860eea66bfe708d6fe4459b538621b3fc5a8':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Oct 2013 19:57:01 +0000 (12:57 -0700)]
am
865c72a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
865c72a4a44db92422beaa450b4c7ea652e9d36d':
Import translations. DO NOT MERGE
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:59:26 +0000 (13:59 -0700)]
am
fb99a782: am
080fb578: am
156ea57c: Merge "Bump version number for MR1" into gb-ub-photos-carlsbad
* commit '
fb99a782d2c20459dd2ca74aa5b072b4ff58d19d':
Bump version number for MR1
Sascha Haeberling [Mon, 21 Oct 2013 20:54:45 +0000 (13:54 -0700)]
am
080fb578: am
156ea57c: Merge "Bump version number for MR1" into gb-ub-photos-carlsbad
* commit '
080fb578bb826dc2e699aed357ece289433e0524':
Bump version number for MR1
Erin Dahlgren [Mon, 21 Oct 2013 20:52:27 +0000 (13:52 -0700)]
am
17a63bdb: am
4432abe0: am
65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
* commit '
17a63bdbfc9a7632232fc9af29caceb2d07fa2a3':
Update preview controls on deleting all items.
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
Erin Dahlgren [Mon, 21 Oct 2013 20:51:07 +0000 (13:51 -0700)]
am
4432abe0: am
65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
* commit '
4432abe0aeda12707267dbbb8882406819e125e8':
Update preview controls on deleting all items.
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:33:02 +0000 (13:33 -0700)]
am
3128bfa8: am
b67d1401: am
68c1c1e0: The initial focus value should be true.
* commit '
3128bfa840d00e86589aae71b002208b7cd766dd':
The initial focus value should be true.
ztenghui [Mon, 21 Oct 2013 20:33:02 +0000 (13:33 -0700)]
am
be1a8c82: am
f1d7d405: am
56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading.
* commit '
be1a8c820213369440d0ee752ce2fe2ddefc20f5':
Don't call onCurrentDataChanged for CameraPreview when reloading.
ztenghui [Mon, 21 Oct 2013 20:31:46 +0000 (13:31 -0700)]
am
b67d1401: am
68c1c1e0: The initial focus value should be true.
* commit '
b67d140189756a48f755130404235cb14b636850':
The initial focus value should be true.
ztenghui [Mon, 21 Oct 2013 20:31:46 +0000 (13:31 -0700)]
am
f1d7d405: am
56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading.
* commit '
f1d7d405a95e5901898f906e96f8d1731b745909':
Don't call onCurrentDataChanged for CameraPreview when reloading.
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:46:26 +0000 (17:46 -0700)]
am
c57947b7: am
8be9183c: am
891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
* commit '
c57947b720ac5b6eab7784bf1fab0e1d40101a22':
Fix SRI orientation on manta
Doris Liu [Sat, 19 Oct 2013 00:44:30 +0000 (17:44 -0700)]
am
8be9183c: am
891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
* commit '
8be9183ceb856a8933394238996f4d364e45c3e1':
Fix SRI orientation on manta
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:48:54 +0000 (11:48 -0700)]
am
12bbd6e8: am
734d2e67: am
464f2201: Don\'t crash when preview surface could not be set.
* commit '
12bbd6e87999ca1d0bd4f555df489cda5542c45a':
Don't crash when preview surface could not be set.
Sascha Haeberling [Fri, 18 Oct 2013 18:47:38 +0000 (11:47 -0700)]
am
734d2e67: am
464f2201: Don\'t crash when preview surface could not be set.
* commit '
734d2e6791891dda7ca2a23d38d828b9765569b9':
Don't crash when preview surface could not be set.
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:20:12 +0000 (14:20 -0700)]
am
914192b7: am
a6e7579c: am
f302a391: Update HDR/HDR+ arc menu hover messages.
* commit '
914192b7f2494b64fa0a204905f9513e85df313a':
Update HDR/HDR+ arc menu hover messages.
Sascha Haeberling [Thu, 17 Oct 2013 21:14:45 +0000 (14:14 -0700)]
am
a6e7579c: am
f302a391: Update HDR/HDR+ arc menu hover messages.
* commit '
a6e7579cf9b3daeb0b81a395b097b988d07614a1':
Update HDR/HDR+ arc menu hover messages.
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:54:08 +0000 (10:54 -0700)]
am
b8475d8c: am
9ff2635a: am
8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
* commit '
b8475d8c5278df0be616bbd8aafaea4a47032409':
Show a preview cover until real preview is ready
Doris Liu [Thu, 17 Oct 2013 17:51:59 +0000 (10:51 -0700)]
am
9ff2635a: am
8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
* commit '
9ff2635aaad021813484fd32491c5d41e9e21a20':
Show a preview cover until real preview is ready
ztenghui [Thu, 17 Oct 2013 17:49:44 +0000 (10:49 -0700)]
am
0e0fa5f8: am
b1c2d554: am
f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
* commit '
0e0fa5f8e084ccb75dde42350056728bd6081f23':
Don't allow swipe into the film strip view when swipe is disabled
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
ztenghui [Thu, 17 Oct 2013 17:47:39 +0000 (10:47 -0700)]
am
b1c2d554: am
f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
* commit '
b1c2d5544ae5c4ba2f3e3fe7e8baf357581cfbed':
Don't allow swipe into the film strip view when swipe is disabled
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:23:54 +0000 (10:23 -0700)]
am
c8e13e3f: (-s ours) am
a7d9bf6c: (-s ours) am
270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
c8e13e3f931a184071a2870f2f52a855ca177b42':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:21:50 +0000 (10:21 -0700)]
am
a7d9bf6c: (-s ours) am
270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
a7d9bf6cac9f8fa82aee368d2a3db8713b79cdea':
Import translations. DO NOT MERGE
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:26:27 +0000 (08:26 -0700)]
am
88b7b007: (-s ours) am
3cdc6f0a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
88b7b0075b96d35c2aa7ad2aa3ea53480246ebe4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 15:23:00 +0000 (08:23 -0700)]
am
3cdc6f0a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3cdc6f0aab59309eba73ada1319cf3fb75124ec9':
Import translations. DO NOT MERGE
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:56:29 +0000 (17:56 -0700)]
am
cfba2a22: am
071cfe6c: merge in klp-release (no-op)
* commit '
cfba2a223502c454871683e4e4304ecb260a788d':
Only delete the Uri coming from onMediaSaved
Avoid unnecessary bringChildToFront() calls.
Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file.
Add missing crop message.
Prevent NPE in gesture handling.
Restore HQ preference in GCam module.
Fix memory leak of context in LocalMediaObserver
Add HQ icon indicator support.
Remove PopupManager to remove a memory leak
Make ROI size 1/8 of longer edge of the image
Sort and select the preview fps range for still image.
Ed Heyl [Thu, 17 Oct 2013 00:51:54 +0000 (17:51 -0700)]
am
071cfe6c: merge in klp-release (no-op)
* commit '
071cfe6c640c014bb9503a049ec5b20e26684860':
Only delete the Uri coming from onMediaSaved
Avoid unnecessary bringChildToFront() calls.
Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file.
Add missing crop message.
Prevent NPE in gesture handling.
Restore HQ preference in GCam module.
Fix memory leak of context in LocalMediaObserver
Add HQ icon indicator support.
Remove PopupManager to remove a memory leak
Make ROI size 1/8 of longer edge of the image
Sort and select the preview fps range for still image.
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:40:23 +0000 (16:40 -0700)]
am
22673cc0: am
089c19ac: am
9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
* commit '
22673cc052b88937df8ae6cbc69f56e1dca034eb':
Send an message to decouple the gcam module change.
ztenghui [Wed, 16 Oct 2013 23:37:45 +0000 (16:37 -0700)]
am
089c19ac: am
9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
* commit '
089c19ac2c59941224b9263946881d5659145ed0':
Send an message to decouple the gcam module change.
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
OSDN Git Service
