OSDN Git Service
Sascha Haeberling [Thu, 21 Nov 2013 21:52:15 +0000 (13:52 -0800)]
Introduce common services and integrate Refocus end-to-end.
Bug:
11120164
Bug:
10073814
This adds a new common CameraServices interface and a method to every
module to get it. Through this we can expose common services and due to
the interface, we can easily mock them for tests.
Also makes the MediaSaveService not a service anymore.
Change-Id: Ifa093efd4ba53c2955ccc2a990b4f18610c29944
Erin Dahlgren [Thu, 21 Nov 2013 00:22:13 +0000 (00:22 +0000)]
Merge "Custom settings ui with dialogs." into gb-ub-photos-denali
Erin Dahlgren [Tue, 19 Nov 2013 18:53:49 +0000 (10:53 -0800)]
Custom settings ui with dialogs.
Change-Id: I117744135e5b08370c1feb63fe4abcccfe325659
Baligh Uddin [Wed, 20 Nov 2013 19:53:06 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7beb85c9a8f060eccccc5ca1302f6d5764d9cb79
Auto-generated-cl: translation import
Erin Dahlgren [Wed, 20 Nov 2013 00:40:14 +0000 (00:40 +0000)]
Merge "Initialize a global LocationManager." into gb-ub-photos-denali
Erin Dahlgren [Wed, 20 Nov 2013 00:37:38 +0000 (16:37 -0800)]
Initialize a global LocationManager.
Change-Id: I69f76e88f5e5b372bdcf6ba9fba8614e34595cc9
Angus Kong [Tue, 19 Nov 2013 00:17:43 +0000 (16:17 -0800)]
Centralize the module information.
Change-Id: I4d9fdbe480a518c7b6ca0268aa9beee49d22610c
Angus Kong [Tue, 19 Nov 2013 00:04:40 +0000 (00:04 +0000)]
Merge "Change capture request to pass a message." into gb-ub-photos-denali
Doris Liu [Mon, 18 Nov 2013 22:44:17 +0000 (14:44 -0800)]
Add more context to the mode options strings
Bug:
11740562
Bug:
11740561
Bug:
11733900
Bug:
11707516
Change-Id: I4a8451f2f6cce42b92a6dee0466ae146bbe03f9e
Angus Kong [Sun, 17 Nov 2013 11:04:04 +0000 (03:04 -0800)]
Change capture request to pass a message.
To be consistent with other camera operations, change the capture request to
send a message instead of posting a runnable.
Change-Id: I28538a4adbb8b892608d53d4ee59bca3a5064488
Angus Kong [Mon, 18 Nov 2013 21:21:07 +0000 (13:21 -0800)]
Fix a potential CameraManagerFactory memory leak
Change-Id: I5fca4cce0baaa9250eca1f74d5e3df950f618cc9
Baligh Uddin [Mon, 18 Nov 2013 20:39:33 +0000 (20:39 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Angus Kong [Mon, 18 Nov 2013 20:04:43 +0000 (20:04 +0000)]
Merge "Major refactor: Make resources access through app." into gb-ub-photos-denali
Angus Kong [Tue, 12 Nov 2013 02:23:46 +0000 (18:23 -0800)]
Major refactor: Make resources access through app.
1. Make the camera device avaiability a callback event so the process can be
event-driven.
2. Add ModuleManager interface and implementation.
3. Make AndroidCameraManagerImpl implementation package private.
This CL is the refactoring work on Gallery2 side. The other part is
http://ag/389297/
Known issue: only work for normal photo mode and video mode for now.
Change-Id: Ib0a89ca56c00f6a7294192e9737a70dec5143ee3
Baligh Uddin [Mon, 18 Nov 2013 19:29:21 +0000 (11:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6e7cd401db97661d4ba5dcb843f8191f496ee7ab
Auto-generated-cl: translation import
Seth Raphael [Tue, 12 Nov 2013 19:21:17 +0000 (11:21 -0800)]
Add parameters and deduplicate parameter changes
Bug:
11646117
Change-Id: If52182a856d7ee8143a351c7f79a76d13840c61e
(cherry picked from commit
77775f170a4596421fd566005522f56f82b1c276)
Doris Liu [Fri, 15 Nov 2013 04:30:33 +0000 (20:30 -0800)]
Dim the background of mode switcher as swiping in
Also updated comments, and hooked up shimmy.
Bug:
11514368
Change-Id: I4055195dc8309ed78be9a04bdfcffd714257cb10
Erin Dahlgren [Fri, 15 Nov 2013 01:25:37 +0000 (17:25 -0800)]
Fix a bad rebase.
Change-Id: I8447ba6bbe37e7bea7b1ac579560150830688704
Erin Dahlgren [Tue, 12 Nov 2013 17:39:08 +0000 (09:39 -0800)]
Revert parallel opening camera in photo mode.
Reverts:
* ag/386409
* ag/386206
* ag/385573
Bug:
11598948
Bug:
11625767
Bug:
11627454
Bug:
11255097
Change-Id: Iad28e32dbcbbce42d9ee261c961cdd5a7712ede5
Conflicts:
src/com/android/camera/PhotoModule.java
Sascha Haeberling [Thu, 14 Nov 2013 03:04:21 +0000 (19:04 -0800)]
Fix issue of focus indicator staying on without being hidden
Bug:
11505806
A mix up in the previous 100% CL caused this. This CL here also
makes it more robust by making the 100% extra time time-based instead
of frame-based.
Change-Id: I52c53d4b5816570c2c805e0e8ff193de684f2a64
Baligh Uddin [Thu, 14 Nov 2013 04:52:04 +0000 (04:52 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Thu, 14 Nov 2013 02:53:25 +0000 (18:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idf3791955861e93e6abbf0257adbeaf470f037fd
Auto-generated-cl: translation import
Sascha Haeberling [Tue, 12 Nov 2013 23:16:08 +0000 (15:16 -0800)]
Show the 100% state of the progress at least one frame.
Bug:
11505806
Change-Id: I5fe8456ff93cd50da53e022ac2cf2dd9ac633b2f
Angus Kong [Wed, 13 Nov 2013 16:55:04 +0000 (16:55 +0000)]
Merge "Update CL ag/387747" into gb-ub-photos-denali
Angus Kong [Wed, 13 Nov 2013 16:50:51 +0000 (08:50 -0800)]
Update CL http://ag/387747
Accidentally submitted the patch set 1 before uploading this one.
Change-Id: Iee3c751473b67140ea07c84bdde7811b06060bb4
Angus Kong [Wed, 13 Nov 2013 16:49:24 +0000 (16:49 +0000)]
Merge "Refine comments and small change of interfaces." into gb-ub-photos-denali
Doris Liu [Sun, 10 Nov 2013 03:13:44 +0000 (19:13 -0800)]
Introduce new mode switcher
TODO: Get assets from UX and activate shimmy
Bug:
11514368
Change-Id: Iebfd3c3c2dc1b08db25e166d5f90d3418a67ed22
Angus Kong [Tue, 12 Nov 2013 19:50:57 +0000 (11:50 -0800)]
Refine comments and small change of interfaces.
1. Use Context as possible as we can instead of the concrete implementaion
Activity.
2. Update/add some comments.
Change-Id: If80b2a8ab9ddeb297b8ec821568a74db4f52104f
Andy Huibers [Tue, 12 Nov 2013 19:14:28 +0000 (11:14 -0800)]
am
a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
* commit '
a7c84bacfd76e5e865655bd5a9b248d64f970af1':
Close mode menus if another control is touched
Andy Huibers [Tue, 12 Nov 2013 19:10:38 +0000 (19:10 +0000)]
Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
ztenghui [Tue, 12 Nov 2013 18:51:56 +0000 (10:51 -0800)]
resolved conflicts for merge of
aae09fb1 to gb-ub-photos-denali
Change-Id: Iac6011795fe5e5ac6cc5181188144cf68d617194
ztenghui [Tue, 12 Nov 2013 18:12:34 +0000 (18:12 +0000)]
Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad
Ruben Brunk [Tue, 12 Nov 2013 18:00:27 +0000 (10:00 -0800)]
am
baffb73c: Start gcam module directly when handling capture intent.
* commit '
baffb73ca83d9d81c379f9f3b9f46cdac7355a0d':
Start gcam module directly when handling capture intent.
ztenghui [Tue, 12 Nov 2013 17:57:14 +0000 (09:57 -0800)]
Differentiate the InProgressData from the normal PhotoData.
When we load from MediaStore, we should differentiate the data still in
progress, e.g. HDR+, which should show the progress bar and hide the action bar
items.
bug:
11634500
bug:
11598186
Change-Id: I8179d39747218c8768977d5b3ce71eadbdfb8b58
Andy Huibers [Tue, 12 Nov 2013 06:30:49 +0000 (22:30 -0800)]
Close mode menus if another control is touched
Bug:
11598901
Bug:
11635865
Change-Id: I9c6237bacef9a28de1fa238e1e7378a57abfc573
Ruben Brunk [Mon, 11 Nov 2013 22:13:59 +0000 (14:13 -0800)]
Start gcam module directly when handling capture intent.
Bug:
11609971
- Prior behavior for capture intents when in HDR+ mode was
to resume into the PhotoModule and switch to the GcamModule.
Following this change, we resume directly into the GcamModule.
- Fixes the bad lockscreen behavior caused by the sequence:
onResume->switch to GcamModule(queue GcamModule onPause and onResume)->
onPause->onResume, where handler queuing order could get in a
state where the GcamModule onResume is called twice in a row,
resulting in duplicate requests being queued for each capture.
Change-Id: Ibd632d74836224288270f5342e45e523e25ca429
Baligh Uddin [Mon, 11 Nov 2013 22:42:35 +0000 (22:42 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Mon, 11 Nov 2013 19:03:34 +0000 (11:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idc1a474f92e3d272a00d312499def4a9962a6461
Auto-generated-cl: translation import
Angus Kong [Sun, 10 Nov 2013 00:25:59 +0000 (16:25 -0800)]
Refactor OrientationManager.
We should use a single OrientationManager instead of one for each module.
Change-Id: I20adddf50e9e55e4af44bfbe4298bdb1e1e50df3
Angus Kong [Mon, 11 Nov 2013 17:46:26 +0000 (09:46 -0800)]
Fix build.
Change-Id: I46d88fb17f1d593a4b19cd6657adc28596e6db56
ztenghui [Mon, 11 Nov 2013 16:56:47 +0000 (08:56 -0800)]
am
6a42c3ae: Add a null check to fix NPE
* commit '
6a42c3ae157c4495db56541ef87f6ee56b5d10b3':
Add a null check to fix NPE
Angus Kong [Sat, 9 Nov 2013 01:25:29 +0000 (17:25 -0800)]
Further refactor
1. Create filmstrip package.
2. Move ImageTaskManager to under package app/.
3. Adde app UI abstract layer AppUi.
Change-Id: I9d640de65c59196c5d3e5c3a8901bb3220b29f62
ztenghui [Sat, 9 Nov 2013 01:17:52 +0000 (17:17 -0800)]
Add a null check to fix NPE
bug:
11594111
Change-Id: Ica2ffe315c4e4eaa818aa609d9600d5e67e54b3b
Angus Kong [Sat, 9 Nov 2013 01:04:28 +0000 (01:04 +0000)]
Merge "Add more interfaces for app and modules." into gb-ub-photos-denali
Angus Kong [Fri, 8 Nov 2013 22:36:45 +0000 (14:36 -0800)]
Add more interfaces for app and modules.
Change-Id: Ie67f90f227b5bc74bc7ac39fca72dfd1741140ca
Ruben Brunk [Sat, 9 Nov 2013 00:41:55 +0000 (16:41 -0800)]
Close cursor in CameraDataAdapter to prevent resource leaks.
Bug:
11352359
Change-Id: I4939d8ff52f8d14ae237ae8464a318daa059e2a2
Angus Kong [Fri, 8 Nov 2013 22:36:16 +0000 (22:36 +0000)]
Merge "Refactor MediaSaveService for future test needs." into gb-ub-photos-denali
Seth Raphael [Fri, 8 Nov 2013 17:59:20 +0000 (09:59 -0800)]
resolved conflicts for merge of
cbd8267e to gb-ub-photos-denali
Change-Id: I24dcc27aa7aef1575f03b6ceaf418cf49712a170
Seth Raphael [Tue, 5 Nov 2013 18:12:36 +0000 (10:12 -0800)]
Add logging to various actions
Bug:
11514148
Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
Ruben Brunk [Fri, 8 Nov 2013 02:34:11 +0000 (18:34 -0800)]
am
36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
* commit '
36d84c1d273faf24c6907e173cf95f233db71592':
Ensure mOpenCameraThread has been setup before dereferencing.
Ruben Brunk [Fri, 8 Nov 2013 02:31:54 +0000 (02:31 +0000)]
Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
Ruben Brunk [Fri, 8 Nov 2013 02:12:41 +0000 (18:12 -0800)]
Ensure mOpenCameraThread has been setup before dereferencing.
Bug:
11579062
Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b
Angus Kong [Thu, 7 Nov 2013 23:38:09 +0000 (15:38 -0800)]
Refactor MediaSaveService for future test needs.
Added interface MediaSaver as the abstract layer to make the implementation
independent of the clients.
Change-Id: I98db3f732e4ed1c87da005b9c18e888682a5e6a5
Sascha Haeberling [Thu, 7 Nov 2013 23:29:26 +0000 (15:29 -0800)]
am
2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
* commit '
2b78c0c048fe906beaeadeee3e267524c808c340':
Add GCam progress indicator.
Sascha Haeberling [Thu, 7 Nov 2013 23:26:15 +0000 (23:26 +0000)]
Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 7 Nov 2013 21:43:33 +0000 (13:43 -0800)]
Add GCam progress indicator.
Bug:
11505806
Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
Andy Huibers [Thu, 7 Nov 2013 22:44:56 +0000 (14:44 -0800)]
am
fccf83bd: hide preview cover on arrival of new preview data if hidden
* commit '
fccf83bd342a3a83dc284525488e69f25e4667c4':
hide preview cover on arrival of new preview data if hidden
Andy Huibers [Wed, 6 Nov 2013 22:37:26 +0000 (14:37 -0800)]
hide preview cover on arrival of new preview data if hidden
Bug:
11433257
Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181
Erin Dahlgren [Thu, 7 Nov 2013 21:29:41 +0000 (13:29 -0800)]
am
2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
* commit '
2f878d54ecbb62ef09aa2b0152dea983e598724f':
Fix photo mode is getting stuck in a single CameraState.
Erin Dahlgren [Thu, 7 Nov 2013 21:24:34 +0000 (21:24 +0000)]
Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
Erin Dahlgren [Thu, 7 Nov 2013 21:06:27 +0000 (13:06 -0800)]
am
05a04924: Show chooser on EDIT intents that have no activity for action.
* commit '
05a04924312fbcda2161da01e0749eb80c2663d1':
Show chooser on EDIT intents that have no activity for action.
Erin Dahlgren [Thu, 7 Nov 2013 19:55:49 +0000 (11:55 -0800)]
Fix photo mode is getting stuck in a single CameraState.
Bug:
11574716
Change-Id: Ieb3622103798077071bb9350773851b7acbff756
Erin Dahlgren [Thu, 7 Nov 2013 19:35:10 +0000 (11:35 -0800)]
Show chooser on EDIT intents that have no activity for action.
Bug:
11571947
Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b
Erin Dahlgren [Thu, 7 Nov 2013 18:12:19 +0000 (10:12 -0800)]
am
7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
* commit '
7e6e947f0e530c14b32785bdb3094ea473000a12':
Parallelize opening the camera with view handling in photo mode.
Erin Dahlgren [Thu, 7 Nov 2013 18:09:44 +0000 (18:09 +0000)]
Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
Erin Dahlgren [Wed, 6 Nov 2013 19:57:51 +0000 (11:57 -0800)]
Parallelize opening the camera with view handling in photo mode.
Bug:
11255097
Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f
ztenghui [Thu, 7 Nov 2013 17:56:12 +0000 (09:56 -0800)]
am
9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
* commit '
9070def99369ccdffb1cf5e006ed30646297f490':
Decouple the visibility check for system UI from action bar
ztenghui [Thu, 7 Nov 2013 17:53:54 +0000 (17:53 +0000)]
Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 7 Nov 2013 04:02:32 +0000 (04:02 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Angus Kong [Thu, 7 Nov 2013 01:49:33 +0000 (01:49 +0000)]
Merge "Introducing new architect." into gb-ub-photos-denali
Angus Kong [Thu, 7 Nov 2013 00:15:06 +0000 (16:15 -0800)]
Introducing new architect.
Change-Id: Iedcc7c264d66a933725fae73eb00c70cc544db8c
Baligh Uddin [Wed, 6 Nov 2013 23:01:17 +0000 (15:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2d3933ee8b37cd144abd266a73ce90c633c53ef8
Auto-generated-cl: translation import
ztenghui [Wed, 6 Nov 2013 22:20:31 +0000 (14:20 -0800)]
Decouple the visibility check for system UI from action bar
And make sure we toggle system UI when reload.
bug:
11539377
Change-Id: I4d251557c1d68a173cabb652e0beaa3ee89cb6f0
Sascha Haeberling [Wed, 6 Nov 2013 22:07:11 +0000 (14:07 -0800)]
am
eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip.
* commit '
eb605b4a27be212915db5bc23e9a82b857036a1c':
Don't crash Photo Sphere on back button press in filmstrip.
Sascha Haeberling [Wed, 6 Nov 2013 22:03:17 +0000 (14:03 -0800)]
Don't crash Photo Sphere on back button press in filmstrip.
Bug:
11554580
Change-Id: I983713eecbd6f13bd90f94b24a0fa1ecc26e1c56
ztenghui [Wed, 6 Nov 2013 18:34:34 +0000 (10:34 -0800)]
am
189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-photos-carlsbad
* commit '
189bfea2c8fd3374aac99f4c18cda357fcf2a371':
Fix the RTL layout in the app's manifest.
ztenghui [Wed, 6 Nov 2013 18:32:33 +0000 (18:32 +0000)]
Merge "Fix the RTL layout in the app's manifest." into gb-ub-photos-carlsbad
Erin Dahlgren [Wed, 6 Nov 2013 17:57:14 +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: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:25 +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:47 +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
ztenghui [Tue, 5 Nov 2013 23:23:12 +0000 (15:23 -0800)]
Fix the RTL layout in the app's manifest.
At the same time, make sure the bottom controls are following RTL rules.
bug:
11481090
Change-Id: I52262aece7c16c194b6419150c1d4c13abff4f2d
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:35 +0000 (23:15 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Tue, 5 Nov 2013 00:10:20 +0000 (16:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I946c69304a4b8cbf2c8260dd5491c0e5370bf191
Auto-generated-cl: translation import
Alan Newberger [Mon, 4 Nov 2013 22:58:59 +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:22 +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:15 +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:08 +0000 (13:59 -0800)]
am
ba1b30b7: Check for media service being present before capture.
* commit '
ba1b30b7793a8a881493a9fc48f27d503db2405b':
Check for media service being present before capture.
OSDN Git Service
