OSDN Git Service
Erin Dahlgren [Fri, 8 Nov 2013 17:31:35 +0000 (09:31 -0800)]
am
dffe3cb6: am
f41109d8: am
98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad
* commit '
dffe3cb681048e2a29c9da331dc0180a730232f8':
Make image editor intent general.
Alan Newberger [Fri, 8 Nov 2013 17:31:34 +0000 (09:31 -0800)]
am
4fc8f6bd: am
6fddfed2: am
2bcb8d1f: add \'capturing\' string for in process indicators
* commit '
4fc8f6bd5877189a9e65859a6b742e4b496e3d7a':
add 'capturing' string for in process indicators
Erin Dahlgren [Wed, 6 Nov 2013 17:58:49 +0000 (09:58 -0800)]
am
f41109d8: am
98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad
* commit '
f41109d8d15e63399fb3331e577da218a3300d5d':
Make image editor intent general.
Erin Dahlgren [Wed, 6 Nov 2013 17:57:12 +0000 (09:57 -0800)]
am
98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad
* commit '
982542701ef5737456f5ee204684a36620db5475':
Make image editor intent general.
Erin Dahlgren [Wed, 6 Nov 2013 17:54:41 +0000 (17:54 +0000)]
Merge "Make image editor intent general." into gb-ub-photos-carlsbad
Alan Newberger [Wed, 6 Nov 2013 04:49:49 +0000 (20:49 -0800)]
am
6fddfed2: am
2bcb8d1f: add \'capturing\' string for in process indicators
* commit '
6fddfed299cc4b8227f534d3ca2679670e1737bb':
add 'capturing' string for in process indicators
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 03:15:13 +0000 (19:15 -0800)]
am
bb8a79f3: am
998f49eb: am
404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
* commit '
bb8a79f370b1f9ef7d1b5d66d23f8599b35c0ac8':
camera: Ensure camera release for lockscreen transition.
Ruben Brunk [Wed, 6 Nov 2013 02:47:15 +0000 (18:47 -0800)]
am
998f49eb: am
404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
* commit '
998f49ebaee778df6395ecdcc15bce1dcd0124fc':
camera: Ensure camera release for lockscreen transition.
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:38:47 +0000 (18:38 -0800)]
am
f71d895f: am
bb9e67ec: am
d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
* commit '
f71d895fb1b7ac9096b1c9bf9beab8d1cd07404b':
Make sure preview aspect ratio is updated
Doris Liu [Wed, 6 Nov 2013 02:09:21 +0000 (18:09 -0800)]
am
bb9e67ec: am
d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
* commit '
bb9e67ece44a97539440ab41ce6cac05b5dc7107':
Make sure preview aspect ratio is updated
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
Erin Dahlgren [Wed, 6 Nov 2013 00:07:10 +0000 (16:07 -0800)]
Make image editor intent general.
Bug:
11372979
Change-Id: I7649eb995fbd78f9b29c76da777aca83777c49fc
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
Baligh Uddin [Tue, 5 Nov 2013 23:49:47 +0000 (15:49 -0800)]
am
19107fdb: (-s ours) am
29b0a905: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
19107fdb1f1c831b6fba7bae08c69c30231db033':
Import translations. DO NOT MERGE
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:19:17 +0000 (15:19 -0800)]
am
29b0a905: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
29b0a9053263d87398e615ba779e3ac9db7f898e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 23:15:46 +0000 (23:15 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Alan Newberger [Tue, 5 Nov 2013 05:55:10 +0000 (21:55 -0800)]
am
32056926: am
ff41c047: am
bf4ce93c: Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad
* commit '
32056926d4973610e0f17bc27228c71b109c01c9':
adjust keyguard camera layout to make buttons match
Doris Liu [Tue, 5 Nov 2013 05:55:08 +0000 (21:55 -0800)]
am
b56d49b1: am
52086855: am
3493ba2a: Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad
* commit '
b56d49b196d4881ffe519eb06b401d62a7a9dbcd':
Preserve high resolution image on touch during zoom
Alan Newberger [Tue, 5 Nov 2013 05:55:08 +0000 (21:55 -0800)]
am
07acdd2f: am
ade5bb1d: am
7f044e2e: Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad
* commit '
07acdd2f2f9fa7053803e61918e433e7a8d6cd64':
Adjust HDR options menu details
Sascha Haeberling [Tue, 5 Nov 2013 05:55:05 +0000 (21:55 -0800)]
am
9ac245ed: am
fecd573a: am
ba1b30b7: Check for media service being present before capture.
* commit '
9ac245ed02a791d5eb24d93f175e3468ce7ac2a9':
Check for media service being present before capture.
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 23:01:02 +0000 (15:01 -0800)]
am
ff41c047: am
bf4ce93c: Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad
* commit '
ff41c047ccbb3f4069f2ce21f22cb452bf2d5aeb':
adjust keyguard camera layout to make buttons match
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:29:21 +0000 (14:29 -0800)]
am
52086855: am
3493ba2a: Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad
* commit '
5208685539ff1078c125637f76f8bcb708b3d2b2':
Preserve high resolution image on touch during zoom
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
Alan Newberger [Mon, 4 Nov 2013 22:24:30 +0000 (14:24 -0800)]
am
ade5bb1d: am
7f044e2e: Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad
* commit '
ade5bb1dbd60bb8b452641de664f0b08bc32b976':
Adjust HDR options menu details
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 22:02:23 +0000 (14:02 -0800)]
am
fecd573a: am
ba1b30b7: Check for media service being present before capture.
* commit '
fecd573afe7f2c7a098cbd532b866f6fe9ffcfc2':
Check for media service being present before capture.
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:45:14 +0000 (13:45 -0700)]
am
dd5fe0f1: am
1e8e8cec: am
ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad
* commit '
dd5fe0f145e348365e6ca454f67ed969adbaec9e':
Add Samsung front camera resolutions
Alan Newberger [Fri, 1 Nov 2013 20:41:51 +0000 (13:41 -0700)]
am
1e8e8cec: am
ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad
* commit '
1e8e8cecd02b98c261c7b2fd267f8846dbe90c03':
Add Samsung front camera resolutions
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 17:02:35 +0000 (10:02 -0700)]
am
1ff5923f: am
d07f6ac0: am
238d6ec7: Add new notification icon.
* commit '
1ff5923fbf4c4806d80c36109c9e7161f548a8a2':
Add new notification icon.
Sascha Haeberling [Fri, 1 Nov 2013 17:00:00 +0000 (10:00 -0700)]
am
d07f6ac0: am
238d6ec7: Add new notification icon.
* commit '
d07f6ac064ee13b8da9539884309d47af9a07f91':
Add new notification icon.
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:55:29 +0000 (07:55 -0700)]
am
035174b3: (-s ours) am
eb224748: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
035174b358a16a18eb985c285b2ca4a3fd8a3a77':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Nov 2013 14:52:22 +0000 (07:52 -0700)]
am
eb224748: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
eb224748d60ce2d0a7c7d8548eae870fa26c711f':
Import translations. DO NOT MERGE
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: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
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: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
OSDN Git Service
