OSDN Git Service
Andy Huibers [Wed, 20 Aug 2014 20:56:48 +0000 (20:56 +0000)]
am
2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
* commit '
2440815caec484357250ddf0442e7cde2f4241ca':
Add zoom to CaptureModule and OneCamera.
Sascha Haeberling [Wed, 20 Aug 2014 19:32:04 +0000 (19:32 +0000)]
Sascha Haeberling [Wed, 20 Aug 2014 19:20:35 +0000 (12:20 -0700)]
Remove logspam
Bug:
17157295
Change-Id: I7b6b505a7d389b59ae440dde7b30da78aaefa0c0
Andy Huibers [Wed, 20 Aug 2014 20:49:21 +0000 (20:49 +0000)]
Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
Andy Huibers [Wed, 20 Aug 2014 07:02:19 +0000 (00:02 -0700)]
Add zoom to CaptureModule and OneCamera.
Change-Id: Ia679d79a42e20e9033409939d0ca137ffcfbc75a
Alan Newberger [Wed, 20 Aug 2014 02:15:37 +0000 (02:15 +0000)]
am
08c219b7: Merge "Update AOSP Camera product icon" into ub-camera-glacier
* commit '
08c219b7ae2e32985eda869add10afa894f7140b':
Update AOSP Camera product icon
Alan Newberger [Wed, 20 Aug 2014 02:09:24 +0000 (02:09 +0000)]
Merge "Update AOSP Camera product icon" into ub-camera-glacier
Alan Newberger [Wed, 20 Aug 2014 01:53:30 +0000 (18:53 -0700)]
Update AOSP Camera product icon
Final updates for the icon. Keeping naming consistent with generated
assets.
Bug:
16985499
Change-Id: I389c2479b208dec05a0b3a1f2617d13b15913dcb
Sascha Haeberling [Tue, 19 Aug 2014 22:40:34 +0000 (22:40 +0000)]
am
6d7ed701: Merge "roduce debug output for android.util.Pair" into ub-camera-glacier
* commit '
6d7ed7016f28c240ae4901d076fc7f9583785c76':
roduce debug output for android.util.Pair
Sascha Haeberling [Tue, 19 Aug 2014 22:33:31 +0000 (22:33 +0000)]
Merge "roduce debug output for android.util.Pair" into ub-camera-glacier
Sascha Haeberling [Tue, 19 Aug 2014 21:38:44 +0000 (14:38 -0700)]
roduce debug output for android.util.Pair
Bug:
16945820
Change-Id: Ia19c6fbfcaf2b1497a76e05600afc5a5b7364e50
Andy Huibers [Tue, 19 Aug 2014 20:37:34 +0000 (20:37 +0000)]
am
03e17a62: Start moving AF and 3A to separate class; improve logging.
* commit '
03e17a62b43e58c8da5cd6ee23fd0809a82ee448':
Start moving AF and 3A to separate class; improve logging.
Andy Huibers [Tue, 19 Aug 2014 20:22:44 +0000 (13:22 -0700)]
Start moving AF and 3A to separate class; improve logging.
Change-Id: Ib73415ffd5569fab8c2c3bf5ac0f35616d3ee697
Alan Newberger [Tue, 19 Aug 2014 01:54:31 +0000 (01:54 +0000)]
am
34264dab: Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier
* commit '
34264dab0b30bfcc3af38c3211d5a9cf9f9932e6':
Remove extra parent mode from array, and make PhotoModule scope string public
Spike Sprague [Tue, 19 Aug 2014 00:51:26 +0000 (00:51 +0000)]
am
5f8927b9: Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier
* commit '
5f8927b94ebed2a0710ed8c60acfbbe1d92bc437':
tweak filmstrip show/hide background for Material Design
Spike Sprague [Tue, 19 Aug 2014 00:44:58 +0000 (00:44 +0000)]
Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier
Spike Sprague [Tue, 19 Aug 2014 00:18:49 +0000 (17:18 -0700)]
tweak filmstrip show/hide background for Material Design
bug:
17113925
Change-Id: I5d478e3e72346e4a333aa2399d339130c5ca4187
Spike Sprague [Mon, 18 Aug 2014 21:37:06 +0000 (21:37 +0000)]
am
66d3d0d0: add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
* commit '
66d3d0d0633324893b89e1ddec14a4710d8034c3':
add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
Spike Sprague [Mon, 18 Aug 2014 21:11:33 +0000 (14:11 -0700)]
add functionality to enable/disable clicks on a MultiToggleImageButton
without affecting its visual state.
bug:
17014507
Change-Id: I824e07d518cce9768cf48f4c50afe079ebff4121
Alan Newberger [Mon, 18 Aug 2014 19:21:17 +0000 (19:21 +0000)]
am
251402b0: Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
* commit '
251402b0765e6ca2093ed674fa15ca295896273f':
Protect Camera2 functions from null CameraDeviceInfo
Spike Sprague [Mon, 18 Aug 2014 19:21:16 +0000 (19:21 +0000)]
am
a675af27: Merge "change settings to use dark theme." into ub-camera-glacier
* commit '
a675af27505aded7ba3ceeef7421a190232533bf':
change settings to use dark theme.
Alan Newberger [Tue, 19 Aug 2014 01:46:29 +0000 (01:46 +0000)]
Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier
Alan Newberger [Tue, 19 Aug 2014 01:40:47 +0000 (18:40 -0700)]
Remove extra parent mode from array, and make PhotoModule scope string public
When pruning modes, we neglected to remove one of the 'photo' parent modes.
This still worked because the last two entries were both 'photo'. Also,
making PhotoModule scope string public so it can be referred to by
other modules, to accomplish the same parent function as the array.
Bug:
17103121
Change-Id: I574e9a7c2db8bf2c86d810c930fbf510d5aa1a24
Baligh Uddin [Sun, 17 Aug 2014 13:49:34 +0000 (13:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sat, 16 Aug 2014 07:06:20 +0000 (00:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I113288c4b072dce479ec8aa25cad01fcbf47501f
Auto-generated-cl: translation import
Sascha Haeberling [Sat, 16 Aug 2014 05:56:09 +0000 (05:56 +0000)]
am
a2dd9ea5: Fix orientation and move it to the util class so we can use it elsewhere.
* commit '
a2dd9ea5ba031128b9f0aa3852ff59991dd3008c':
Fix orientation and move it to the util class so we can use it elsewhere.
Baligh Uddin [Sat, 16 Aug 2014 04:01:36 +0000 (04:01 +0000)]
am
45144e03: (-s ours) am
69853a4e: (-s ours) Import translations. DO NOT MERGE
* commit '
45144e03cd84ba7748a782fbd3f5193804d45a39':
Import translations. DO NOT MERGE
Spike Sprague [Mon, 18 Aug 2014 17:39:31 +0000 (17:39 +0000)]
Merge "change settings to use dark theme." into ub-camera-glacier
Alan Newberger [Mon, 18 Aug 2014 17:46:29 +0000 (17:46 +0000)]
Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
Sascha Haeberling [Sat, 16 Aug 2014 02:00:09 +0000 (02:00 +0000)]
am
096e5b73: (-s ours) DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
* commit '
096e5b734a18dae5bdca5cc312ad61ce09568f3f':
DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
Sascha Haeberling [Sat, 16 Aug 2014 01:45:15 +0000 (18:45 -0700)]
Fix orientation and move it to the util class so we can use it elsewhere.
Bug:
16948752
Change-Id: Ic7bf2f01176d8f6f1e1a70940c35531e1a5a1cbc
Sascha Haeberling [Sat, 16 Aug 2014 01:53:53 +0000 (18:53 -0700)]
DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
We only want it in Haleakala, but it go into glacier through another CL.
Change-Id: Ie08ec3e0d1ad7637650c45bf1908a04267464935
Alan Newberger [Sat, 16 Aug 2014 01:18:12 +0000 (18:18 -0700)]
Protect Camera2 functions from null CameraDeviceInfo
When the underlying camera fails, the camera1 agent
returns null for CameraDeviceInfo. Guard against this case
where it is used in app upgrading and settings.
Bug:
16982203
Change-Id: I7e4686e508993f0d0fc03eaa9e0b5dc312016eae
Sol Boucher [Sat, 16 Aug 2014 00:29:19 +0000 (00:29 +0000)]
am
8563d90f: Merge "Move preview transform matrix code into portability library" into ub-camera-glacier
* commit '
8563d90f706ac7505014d59fda2bcef92c221c6e':
Move preview transform matrix code into portability library
Sol Boucher [Sat, 16 Aug 2014 00:26:09 +0000 (00:26 +0000)]
am
f67f64f3: Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
* commit '
f67f64f3b5272d1da317b8eda8e1ea1e46539416':
Enable seamless switching to/from camera2-backed Photo module
Baligh Uddin [Fri, 15 Aug 2014 22:35:59 +0000 (22:35 +0000)]
am
69853a4e: (-s ours) Import translations. DO NOT MERGE
* commit '
69853a4e0e38fd3a193ea872beb496a090de8364':
Import translations. DO NOT MERGE
Andy Huibers [Fri, 15 Aug 2014 21:43:54 +0000 (21:43 +0000)]
am
a69d497f: Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier
* commit '
a69d497fd44faab8afe65b748dfede715ea7239f':
Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
Baligh Uddin [Fri, 15 Aug 2014 21:33:58 +0000 (14:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie72a2db813a20fb666e81f34c63733e34548387b
Auto-generated-cl: translation import
Sol Boucher [Sat, 16 Aug 2014 00:23:35 +0000 (00:23 +0000)]
Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
Sol Boucher [Tue, 5 Aug 2014 06:41:38 +0000 (23:41 -0700)]
Enable seamless switching to/from camera2-backed Photo module
This supports running individual modules against the camera2 API framework while
the rest of the modules use the legacy Camera class.
Bug:
16875535
Change-Id: Ic0ae313a3dd96ba22bacc36c7b1712b183b713ff
Sascha Haeberling [Fri, 15 Aug 2014 20:26:25 +0000 (20:26 +0000)]
am
fa7b92c1: Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier
* commit '
fa7b92c1ee99bc6734c06bb50445cffae94e8197':
Add ability to add a ready-state changed listener to the camera.
Andy Huibers [Fri, 15 Aug 2014 21:39:05 +0000 (21:39 +0000)]
Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier
Andy Huibers [Fri, 15 Aug 2014 19:56:42 +0000 (12:56 -0700)]
Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
Bug:
17028594
Change-Id: I8ce7dbd12f2b14a50068d8b034e7a80d8840f012
Sascha Haeberling [Fri, 15 Aug 2014 20:20:53 +0000 (20:20 +0000)]
Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier
Sascha Haeberling [Fri, 15 Aug 2014 17:52:37 +0000 (10:52 -0700)]
Add ability to add a ready-state changed listener to the camera.
Bug:
16945820
Bug:
16948752
This enables us to hook up memory intense cameras and make sure we don't
activate the shutter button if the camera is not ready.
Change-Id: I70a31c76e063d775c844404ee9e20e583fa233e3
Sol Boucher [Sat, 16 Aug 2014 00:23:47 +0000 (00:23 +0000)]
Merge "Move preview transform matrix code into portability library" into ub-camera-glacier
Sol Boucher [Tue, 12 Aug 2014 06:10:12 +0000 (23:10 -0700)]
Move preview transform matrix code into portability library
This allows it to be calculated differently depending on the backing camera API,
which means that camera2 preview streams can be (and are!) displayed upright.
Bug:
16875535
Change-Id: I58fa86098a8b8eddc8f864b93d1e92672c40a1de
Andy Huibers [Fri, 15 Aug 2014 17:41:11 +0000 (17:41 +0000)]
am
064f851a: Hold touch to focus target in 3A UI debug mode.
* commit '
064f851a063c80be4e6cc3f1716ff19b605e4865':
Hold touch to focus target in 3A UI debug mode.
Andy Huibers [Fri, 15 Aug 2014 17:21:56 +0000 (10:21 -0700)]
Hold touch to focus target in 3A UI debug mode.
Bug:
17028594
Change-Id: I6d60f2a891cc8ab33c2165438295950bf46095b3
Andy Huibers [Fri, 15 Aug 2014 16:59:43 +0000 (16:59 +0000)]
am
011c5cde: Merge "Consolidate properties for debugging." into ub-camera-glacier
* commit '
011c5cde82df9fee23f21891ae1c3da63ebe27ae':
Consolidate properties for debugging.
Alan Newberger [Fri, 15 Aug 2014 16:37:26 +0000 (16:37 +0000)]
am
c8c6efa0: Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier
* commit '
c8c6efa020f830b54df4f06eba883ae8386d96b4':
Move preference subscreens to new Activities from Dialogs
Alan Newberger [Thu, 14 Aug 2014 22:48:59 +0000 (15:48 -0700)]
Move preference subscreens to new Activities from Dialogs
Dialogs are hard to override for action bar settings. The documented
way to do navigation up is to receive menu events. So we no longer
use Dialogs, instead here we set up intents back to the same Activity,
and add an extra system to designate which subscreen to load. This uses
activity stack to do subscreen navigation, and then all screens hit the
same menu handler in the Activity which properly receives up navigation
signals via 'home'. This is not awesome but a better hack than the
Dialog one which depends on Action Bar internals; this approach only
uses public APIs.
Bug:
15756177
Change-Id: Iae2bd254e9cd5dde1d32d0997e5610f359662467
Andy Huibers [Fri, 15 Aug 2014 16:55:11 +0000 (16:55 +0000)]
Merge "Consolidate properties for debugging." into ub-camera-glacier
Andy Huibers [Fri, 15 Aug 2014 05:24:41 +0000 (22:24 -0700)]
Consolidate properties for debugging.
Change-Id: I052492375bf176622b38382579b2189d22a05349
Baligh Uddin [Fri, 15 Aug 2014 05:50:50 +0000 (05:50 +0000)]
am
31afb359: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
31afb359a2fb26a7491add2c4c76eeea89c93486':
Import translations. DO NOT MERGE
Alan Newberger [Fri, 15 Aug 2014 16:32:43 +0000 (16:32 +0000)]
Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier
Baligh Uddin [Fri, 15 Aug 2014 05:47:42 +0000 (05:47 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Fri, 15 Aug 2014 05:47:35 +0000 (05:47 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Sascha Haeberling [Fri, 15 Aug 2014 03:15:11 +0000 (03:15 +0000)]
am
51163540: Move code from GoogleCamera that dumps capture request metadata.
* commit '
51163540604bcb1deabfde4d83c54a86114cefd0':
Move code from GoogleCamera that dumps capture request metadata.
Sascha Haeberling [Fri, 15 Aug 2014 02:27:34 +0000 (19:27 -0700)]
Move code from GoogleCamera that dumps capture request metadata.
Bug:
16945820
Change-Id: Iff3f05b65687073a7272ed31644f34dc6187de21
Spike Sprague [Thu, 14 Aug 2014 00:02:45 +0000 (00:02 +0000)]
am
39384da0: add a range check in MultiToggleImageButton\'s bitmap combine function.
* commit '
39384da05ba9ced9086dba64932878ce447c6230':
add a range check in MultiToggleImageButton's bitmap combine function.
Spike Sprague [Wed, 13 Aug 2014 23:57:20 +0000 (16:57 -0700)]
add a range check in MultiToggleImageButton's bitmap combine function.
bug: overrideImageIds
Change-Id: I6e6b60ff8bb269fb25f7b788009103d9b9d02f19
Alan Newberger [Wed, 13 Aug 2014 23:34:31 +0000 (23:34 +0000)]
am
7951206e: Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier
* commit '
7951206e0157586d3c5676987343dc3ca81fc40e':
Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
Spike Sprague [Wed, 13 Aug 2014 23:31:15 +0000 (23:31 +0000)]
am
bbcf8774: Merge "Update option icon transitions" into ub-camera-glacier
* commit '
bbcf8774821a0e09a4cf6ab2472f89c83981326b':
Update option icon transitions
Spike Sprague [Wed, 13 Aug 2014 23:06:35 +0000 (23:06 +0000)]
am
955ae1f8: another tweak of the mode switch expanding circle, no more pre-white circle expansion.
* commit '
955ae1f8afc9c4fb0905e0baece959efac9326f6':
another tweak of the mode switch expanding circle, no more pre-white circle expansion.
Spike Sprague [Wed, 13 Aug 2014 22:55:28 +0000 (15:55 -0700)]
another tweak of the mode switch expanding circle, no more pre-white circle expansion.
bug:
16129873
Change-Id: I1f55dbd40be1801bf7bbf1f3646a8deeec5c353f
Spike Sprague [Wed, 13 Aug 2014 21:36:53 +0000 (14:36 -0700)]
change settings to use dark theme.
bug:
16979040
Change-Id: I2e02884d2971a92d4a408712a0e952891eafb62e
Spike Sprague [Wed, 13 Aug 2014 21:16:42 +0000 (21:16 +0000)]
am
eb944322: Merge "update mode switch transition anims" into ub-camera-glacier
* commit '
eb9443226ee117779e2396c2f7cee9789af80cf8':
update mode switch transition anims
Sascha Haeberling [Wed, 13 Aug 2014 19:46:54 +0000 (19:46 +0000)]
am
62c367f2: Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier
* commit '
62c367f2199d826646cd2c665ed358b339c4b313':
Fix potential multi-threading bug where size can change before deletion.
Sascha Haeberling [Wed, 13 Aug 2014 19:36:44 +0000 (19:36 +0000)]
am
4c96752b: Merge "Don\'t try to share null data" into ub-camera-glacier
* commit '
4c96752bbcda3fa356ea2a028ec6a7c2fbfa06a6':
Don't try to share null data
Alan Newberger [Wed, 13 Aug 2014 17:14:30 +0000 (17:14 +0000)]
am
a804e2d2: Merge "New Material icons for Camera2" into ub-camera-glacier
* commit '
a804e2d29800fd66f6db552c9cb55117888be44b':
New Material icons for Camera2
Alan Newberger [Wed, 13 Aug 2014 23:31:04 +0000 (23:31 +0000)]
Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier
Alan Newberger [Wed, 13 Aug 2014 23:28:26 +0000 (16:28 -0700)]
Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
We changed this while working on L prep, but FULLSCREEN suppresses the
action bar. Changing back to LAYOUT_FULLSCREEN addresses this.
Bug:
16986789
Change-Id: I561fe765ea5eb72b1d666a124c9810cf349ce56a
Spike Sprague [Wed, 13 Aug 2014 21:14:50 +0000 (21:14 +0000)]
Merge "update mode switch transition anims" into ub-camera-glacier
Sascha Haeberling [Wed, 13 Aug 2014 19:42:57 +0000 (19:42 +0000)]
Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier
Sascha Haeberling [Wed, 13 Aug 2014 19:02:33 +0000 (12:02 -0700)]
Fix potential multi-threading bug where size can change before deletion.
Bug:
16949503
Change-Id: I9b087cc257edfb2fe5368abaa7a73f910a6db3df
Sascha Haeberling [Wed, 13 Aug 2014 16:40:49 +0000 (16:40 +0000)]
am
59c784bf: [OC] Gcam OneCamera implementation.
* commit '
59c784bf588b9e0994e9769001f624200e9b1027':
[OC] Gcam OneCamera implementation.
Sascha Haeberling [Tue, 5 Aug 2014 17:53:08 +0000 (10:53 -0700)]
[OC] Gcam OneCamera implementation.
Bug:
16948752
Change-Id: I0160de117c4ff7024e0d546f594b5777847d1833
Senpo Hu [Wed, 13 Aug 2014 00:18:49 +0000 (00:18 +0000)]
am
11186318: Enable 4K video for Shamu.
* commit '
111863182bcc4b99bdaa727304d5800fc91dfd51':
Enable 4K video for Shamu.
Senpo Hu [Fri, 8 Aug 2014 20:42:13 +0000 (13:42 -0700)]
Enable 4K video for Shamu.
- Add a new resolution setting for back camera video: "UHD 4K"
Bug:
16206549
Change-Id: I0b72f8100bc26b556099ad08e093273ccda0f25d
Spike Sprague [Wed, 13 Aug 2014 23:28:19 +0000 (23:28 +0000)]
Merge "Update option icon transitions" into ub-camera-glacier
Spike Sprague [Sat, 9 Aug 2014 01:13:56 +0000 (18:13 -0700)]
Update option icon transitions
bug:
16458864
Change-Id: Idaf4b60d357fa08635b55c1356450d3a4b2b48c2
Sascha Haeberling [Wed, 13 Aug 2014 19:32:55 +0000 (19:32 +0000)]
Merge "Don't try to share null data" into ub-camera-glacier
Sascha Haeberling [Wed, 13 Aug 2014 18:43:57 +0000 (11:43 -0700)]
Don't try to share null data
Bug:
16875556
Also add warning logs for null check cases.
Change-Id: Ic1e7e81b416d24a748b9572d63c145612b38d822
Alan Newberger [Wed, 13 Aug 2014 17:09:24 +0000 (17:09 +0000)]
Merge "New Material icons for Camera2" into ub-camera-glacier
Alan Newberger [Wed, 13 Aug 2014 17:04:39 +0000 (10:04 -0700)]
New Material icons for Camera2
This CL adds new Material icons for Camera2.
Bug:
16985499
Change-Id: I91972418f7ee9592fc7685e2c4dfd9bb73c3bcc9
Spike Sprague [Fri, 25 Jul 2014 18:40:53 +0000 (11:40 -0700)]
update mode switch transition anims
bug:
16129873
Change-Id: Ibcb2e31162dc353de250db2a7d24726b05768ab1
Alan Newberger [Tue, 12 Aug 2014 17:20:48 +0000 (17:20 +0000)]
am
2307b60a: Refactor Upgrade/UpgradeAosp into SettingsUpgrader
* commit '
2307b60abdf0af8639d71ba53cf10fdaf8dfe7e7':
Refactor Upgrade/UpgradeAosp into SettingsUpgrader
Alan Newberger [Tue, 5 Aug 2014 16:56:17 +0000 (09:56 -0700)]
Refactor Upgrade/UpgradeAosp into SettingsUpgrader
This CL does three things:
- removes the Upgrade/UpgradeAosp classes which were bunches of statics,
in favor of a SettingsUpgrader abstract class that can be overridden
- moves 'upgrade to strings' hack logic into AppUpgrader so it only is
checked and run once, not for any of the former UpgradeSteps. logic used
to be in Upgrade and run regardless of key, when it was using detection
only meant for KEY.KEY_UPGRADE_VERSION
- adds existence checks for all hack in-place key string upgrades so they
are no-ops if the key was not persisted in the first place.
Bug:
16573087
Change-Id: Ife42f7aa4a7611ba2d143410a3450057b7464901
Baligh Uddin [Tue, 12 Aug 2014 04:55:12 +0000 (21:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I969568c49246ac278c8c68e025f1ce279a5323a5
Auto-generated-cl: translation import
Baligh Uddin [Tue, 12 Aug 2014 04:53:00 +0000 (21:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ed26c9802040fbd81197d0562975848ccecb0c5
Auto-generated-cl: translation import
Puneet Lall [Mon, 11 Aug 2014 21:54:00 +0000 (21:54 +0000)]
am
967b7828: Implemented NDK libjpeg wrapper for YUV420 encoding.
* commit '
967b782837a22974f565f5bbc71bef7bc05fc878':
Implemented NDK libjpeg wrapper for YUV420 encoding.
Puneet Lall [Fri, 8 Aug 2014 00:05:38 +0000 (17:05 -0700)]
Implemented NDK libjpeg wrapper for YUV420 encoding.
Bug:
16676082
Change-Id: I588b8023b401d5e713762563c9265ec3d774a678
Andy Huibers [Fri, 8 Aug 2014 22:07:14 +0000 (22:07 +0000)]
am
30ffce08: [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
* commit '
30ffce08f511fbed4cf18daa743778b541583351':
[OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
Andy Huibers [Thu, 31 Jul 2014 23:31:43 +0000 (16:31 -0700)]
[OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
Change-Id: Ic88359ad27b8e9ee0e74c8d1bd6ecb71fe3c24f0
Alan Newberger [Fri, 8 Aug 2014 02:03:56 +0000 (02:03 +0000)]
am
e9a226f6: Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier
* commit '
e9a226f6c9cf7e59a57bab7e99926647fd0fc23f':
Route zoom value through to zoomIndex in device API
Sol Boucher [Fri, 8 Aug 2014 00:23:37 +0000 (00:23 +0000)]
am
7f112487: Merge "Move display orientation calculations out of app code" into ub-camera-glacier
* commit '
7f112487e7c19983fe36164494486a0a289a4831':
Move display orientation calculations out of app code
Spike Sprague [Thu, 7 Aug 2014 22:37:36 +0000 (22:37 +0000)]
am
0be64680: rollback of b/
16632474 and ag/518674
* commit '
0be64680fb9b5a982b1b92730236ebb85e76624a':
rollback of b/
16632474 and ag/518674
Spike Sprague [Thu, 7 Aug 2014 21:56:27 +0000 (14:56 -0700)]
rollback of b/
16632474 and ag/518674
Change-Id: I77af6135ff339240bd52881550a0f42ec996f9c4
Sol Boucher [Fri, 8 Aug 2014 00:20:57 +0000 (00:20 +0000)]
Merge "Move display orientation calculations out of app code" into ub-camera-glacier