OSDN Git Service
Senpo Hu [Wed, 15 Oct 2014 00:51:49 +0000 (00:51 +0000)]
am
4a1fd997: Merge "Fix the build break due to ag/567355." into ub-camera-glacier
* commit '
4a1fd9976fc47a732058e764c00a36f538ca430c':
Fix the build break due to ag/567355.
Senpo Hu [Wed, 15 Oct 2014 00:50:09 +0000 (00:50 +0000)]
Merge "Fix the build break due to ag/567355." into ub-camera-glacier
Senpo Hu [Wed, 15 Oct 2014 00:47:12 +0000 (17:47 -0700)]
Fix the build break due to ag/567355.
Change-Id: I3f8b657bea9fdd22287115230709dda0a26b8ae4
Senpo Hu [Tue, 14 Oct 2014 22:14:03 +0000 (22:14 +0000)]
am
828081f5: Merge "Log camera exception via UsageStatistics." into ub-camera-glacier
* commit '
828081f5f947abb8930f084386492efde8c5b83b':
Log camera exception via UsageStatistics.
Senpo Hu [Tue, 14 Oct 2014 22:00:51 +0000 (22:00 +0000)]
Merge "Log camera exception via UsageStatistics." into ub-camera-glacier
Spike Sprague [Tue, 14 Oct 2014 21:58:51 +0000 (21:58 +0000)]
am
c6a48876: Merge "disable shutter button as soon as possible to avoid double shutter presses" into ub-camera-glacier
* commit '
c6a488761b2b9deb11bdcac051dfeacd212ee90f':
disable shutter button as soon as possible to avoid double shutter presses
Alan Newberger [Tue, 14 Oct 2014 21:58:50 +0000 (21:58 +0000)]
am
54985c97: Merge "Revert "Make CameraDataAdapter background new data loading and post to listener"" into ub-camera-glacier
* commit '
54985c973140b896db75f086ac0f904d0228f8aa':
Revert "Make CameraDataAdapter background new data loading and post to listener"
Alan Newberger [Tue, 14 Oct 2014 21:58:49 +0000 (21:58 +0000)]
am
3972da65: Merge "Migrate Settings Fragment to use arguments" into ub-camera-glacier
* commit '
3972da65f958edcfed26f1c32e0cf4e8361306e7':
Migrate Settings Fragment to use arguments
Senpo Hu [Tue, 14 Oct 2014 21:22:31 +0000 (14:22 -0700)]
Log camera exception via UsageStatistics.
Change-Id: I2b80338dd489ece87d94e20a303c5e43e972c3b0
Spike Sprague [Tue, 14 Oct 2014 20:53:30 +0000 (20:53 +0000)]
Merge "disable shutter button as soon as possible to avoid double shutter presses" into ub-camera-glacier
Alan Newberger [Tue, 14 Oct 2014 20:42:26 +0000 (20:42 +0000)]
Merge "Revert "Make CameraDataAdapter background new data loading and post to listener"" into ub-camera-glacier
Alan Newberger [Tue, 14 Oct 2014 20:42:16 +0000 (20:42 +0000)]
Revert "Make CameraDataAdapter background new data loading and post to listener"
Reverting out of concerns on thread safety, need to more carefully assess the change. Synchronizing may just reintroduce deadlock for affected user.
This reverts commit
cc93255f596b47d1a860461dd0d4be697422964f.
Change-Id: I8b003f978d680942d380cc3563bccd055ab28fe9
Alan Newberger [Tue, 14 Oct 2014 20:28:49 +0000 (20:28 +0000)]
Merge "Migrate Settings Fragment to use arguments" into ub-camera-glacier
Alan Newberger [Tue, 14 Oct 2014 19:54:05 +0000 (12:54 -0700)]
Migrate Settings Fragment to use arguments
Fix error in settings fragment using a constructor vs argument bundle.
Bug:
17626333
Change-Id: I5842706a3b5060dac1f997ca4035b4cc31ce0287
Senpo Hu [Tue, 14 Oct 2014 19:12:32 +0000 (19:12 +0000)]
am
7a3ce60c: Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." into ub-camera-glacier
* commit '
7a3ce60cfe7f5a554ab8edeb08c203196b17b164':
Prevent NullPointerException of PhotoModule in quick resume-pause.
Senpo Hu [Tue, 14 Oct 2014 19:07:05 +0000 (19:07 +0000)]
Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." into ub-camera-glacier
Senpo Hu [Tue, 14 Oct 2014 18:51:56 +0000 (11:51 -0700)]
Prevent NullPointerException of PhotoModule in quick resume-pause.
Bug:
17984743
Change-Id: Ie597dbddb383004deace8933f51f091029c0a9b4
I-Jong Lin [Tue, 14 Oct 2014 18:15:44 +0000 (18:15 +0000)]
am
4ed861a7: Preview vs Video Camera Resolution Mismatch
* commit '
4ed861a70de7db31a7d4b9227b523bef684d7eed':
Preview vs Video Camera Resolution Mismatch
I-Jong Lin [Fri, 10 Oct 2014 23:34:34 +0000 (16:34 -0700)]
Preview vs Video Camera Resolution Mismatch
Bug:
17458889
This bug is programmatic and reproduces on all devices. Basically,
the current app defaults to the highest resolution preview that
matches the aspect ratio of the recording, even if the recording
video resolution is lower. Since it is more important to be WYSIWYG,
in the cases where the preview show at the same resolution of
the recording video resolution, we should preview at same resolution
for truest (but not necessarily best) quality that most faithfully
represents the content that is to be recorded under the constraint
of the UI resolution.
Change-Id: I0ec5a76834cbffa59f0e144f1fe271de25e92523
Spike Sprague [Mon, 13 Oct 2014 21:49:06 +0000 (14:49 -0700)]
disable shutter button as soon as possible
to avoid double shutter presses
bug:
17939465
Change-Id: Iac19b8fa78774b525fbaf0d4742d97764d401b78
Puneet Lall [Tue, 14 Oct 2014 01:56:42 +0000 (01:56 +0000)]
am
e9dedb39: Merge "Don\'t re-open the camera if already open" into ub-camera-glacier
* commit '
e9dedb39b240e87e854918d544de66820b41700c':
Don't re-open the camera if already open
Puneet Lall [Tue, 14 Oct 2014 01:53:57 +0000 (01:53 +0000)]
Merge "Don't re-open the camera if already open" into ub-camera-glacier
Alan Newberger [Tue, 14 Oct 2014 01:35:34 +0000 (01:35 +0000)]
am
b7378210: Merge "Make CameraDataAdapter background new data loading and post to listener" into ub-camera-glacier
* commit '
b7378210663a1ac9c6692b9a0d8ae5e414da9370':
Make CameraDataAdapter background new data loading and post to listener
Alan Newberger [Tue, 14 Oct 2014 01:29:06 +0000 (01:29 +0000)]
Merge "Make CameraDataAdapter background new data loading and post to listener" into ub-camera-glacier
Alan Newberger [Tue, 14 Oct 2014 00:12:08 +0000 (17:12 -0700)]
Make CameraDataAdapter background new data loading and post to listener
To avoid potentially expensive operations in main thread, only call
back to filmstrip on the main thread. Do all processing in background.
Consistently enforce that all listener callbacks are main thread by
posting to a main thread handler.
Bug:
17437217
Change-Id: I6a96690218043cc42644d12a4162322cc2ee7e8f
Puneet Lall [Tue, 14 Oct 2014 01:06:21 +0000 (18:06 -0700)]
Don't re-open the camera if already open
Bug:
17870967
Change-Id: Ibafc8c563b6188c4c743a60a3b42b93e107523bc
Senpo Hu [Mon, 13 Oct 2014 23:32:50 +0000 (23:32 +0000)]
am
a5db8beb: Merge "Refine camera fatal error handling in CameraActivity." into ub-camera-glacier
* commit '
a5db8bebb51ff666b4fa4bbadc3d0457f36041f2':
Refine camera fatal error handling in CameraActivity.
Senpo Hu [Mon, 13 Oct 2014 23:29:36 +0000 (23:29 +0000)]
Merge "Refine camera fatal error handling in CameraActivity." into ub-camera-glacier
Alan Newberger [Mon, 13 Oct 2014 20:40:30 +0000 (20:40 +0000)]
am
890ab9be: Merge "Refine in-place conversion semantics for Settings" into ub-camera-glacier
* commit '
890ab9beb8642bc9278f9914013be2fd65d740f8':
Refine in-place conversion semantics for Settings
Alan Newberger [Mon, 13 Oct 2014 20:36:52 +0000 (20:36 +0000)]
Merge "Refine in-place conversion semantics for Settings" into ub-camera-glacier
Alan Newberger [Mon, 13 Oct 2014 19:17:04 +0000 (12:17 -0700)]
Refine in-place conversion semantics for Settings
Since settings are now stored as strings, avoid app crashes
for settings which are still around as other types, and just
treat it as if those settings are absent (return default). This
requires re-working the version number tracker itself, which
is done by making it a new key and migrating just the old
key in the getLastVersion override. This is somewhat cleaner
and overall the change should increase stability given the
change to use in place values of different types.
Bug:
17949433
Change-Id: Icaf0d9653eabb9e144f3946a51b4038d3ed48ea9
Alan Newberger [Mon, 13 Oct 2014 19:24:43 +0000 (19:24 +0000)]
am
7839867c: Merge "Update to use real L codename." into ub-camera-glacier
* commit '
7839867c4c6eb837d5e7c1c5851741d4933f5fb1':
Update to use real L codename.
Alan Newberger [Mon, 13 Oct 2014 19:21:02 +0000 (19:21 +0000)]
Merge "Update to use real L codename." into ub-camera-glacier
Senpo Hu [Mon, 13 Oct 2014 18:54:16 +0000 (11:54 -0700)]
Refine camera fatal error handling in CameraActivity.
Use Log.e() to clearly indicate what action has been taken to handle
the error.
Bug:
17964147
Change-Id: I073e06d99a89e6e1e697766736791ef419339944
Spike Sprague [Mon, 13 Oct 2014 19:12:35 +0000 (19:12 +0000)]
am
89ac2e10: Merge "change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime" into ub-camera-glacier
* commit '
89ac2e10477b03fbd5addb7da46933626748ed3a':
change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime
Spike Sprague [Mon, 13 Oct 2014 19:08:35 +0000 (19:08 +0000)]
Merge "change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime" into ub-camera-glacier
Spike Sprague [Mon, 13 Oct 2014 18:43:15 +0000 (18:43 +0000)]
am
eb81de1d: Merge "Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack." into ub-camera-glacier
* commit '
eb81de1d250a5c61f378428f590238ce5c7e16a4':
Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack.
Puneet Lall [Mon, 13 Oct 2014 18:43:14 +0000 (18:43 +0000)]
am
6a07363b: Always close the camera
* commit '
6a07363be15d11735b0b47059bf8d0e9998693ef':
Always close the camera
Spike Sprague [Mon, 13 Oct 2014 17:56:43 +0000 (17:56 +0000)]
Merge "Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack." into ub-camera-glacier
Spike Sprague [Thu, 9 Oct 2014 01:49:26 +0000 (18:49 -0700)]
Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack.
companion CL: ag/562183
bug:
17669070
Change-Id: I4d5402df3848423c236108716f7065a87ce95f6d
Puneet Lall [Sat, 11 Oct 2014 01:33:34 +0000 (18:33 -0700)]
Always close the camera
Previous logic had a race condition in which the camera may not be
closed if it was in the process of being opened.
Bug:
17939709
Change-Id: Ife9d96b73dac17625b3344fcf8553d181a74024e
Spike Sprague [Fri, 10 Oct 2014 16:52:57 +0000 (09:52 -0700)]
change cahching Drawables to caching ConstantStates,
also apply CircelDrawable as necessary at runtime
bug:
17907551
Change-Id: I9bddfc599f15c3e0b09b98f14a9804296d51015b
Sascha Haeberling [Sat, 11 Oct 2014 00:17:00 +0000 (00:17 +0000)]
Merge "Make temp session directory creation more robust and efficient." into ub-camera-haleakala
Sascha Haeberling [Thu, 9 Oct 2014 18:55:23 +0000 (11:55 -0700)]
Make temp session directory creation more robust and efficient.
Also rename some methods for clarity.
Change-Id: Ic6d3e7902ae5396f33231f1471df9eae89234132
Sascha Haeberling [Fri, 10 Oct 2014 22:55:08 +0000 (22:55 +0000)]
am
4d4585da: Merge "Pass NamedEntity to saveFinalPhoto since it can be nulled in pause()." into ub-camera-glacier
* commit '
4d4585da32d9b5a47bffad1deeb08fc5cd128311':
Pass NamedEntity to saveFinalPhoto since it can be nulled in pause().
Senpo Hu [Fri, 10 Oct 2014 22:55:08 +0000 (22:55 +0000)]
am
ac9070ee: Migrate old CameraErrorCallback class to agent\'s CameraExceptionHandler.
* commit '
ac9070ee24d2db6e7804cdd26df578e7ab76895e':
Migrate old CameraErrorCallback class to agent's CameraExceptionHandler.
Sascha Haeberling [Fri, 10 Oct 2014 22:53:02 +0000 (22:53 +0000)]
Merge "Pass NamedEntity to saveFinalPhoto since it can be nulled in pause()." into ub-camera-glacier
Senpo Hu [Fri, 10 Oct 2014 22:18:58 +0000 (15:18 -0700)]
Migrate old CameraErrorCallback class to agent's CameraExceptionHandler.
Per ag/565603, clean up the old CameraErrorCallback.
Bug:
17931297
Change-Id: Id750581850680ed6cf85738daf5ebdebf67f4800
Sascha Haeberling [Fri, 10 Oct 2014 22:20:35 +0000 (15:20 -0700)]
Pass NamedEntity to saveFinalPhoto since it can be nulled in pause().
Bug:
15289634
Change-Id: I551f73f5f0ceecf2d8a1e3b379dd34fd06b044d8
Alan Newberger [Fri, 10 Oct 2014 20:25:50 +0000 (20:25 +0000)]
am
4fe4680c: Merge "Add verbose logging for os/apk debug builds" into ub-camera-glacier
* commit '
4fe4680cca29994e0c070b9b5ea5ef9bcf087a65':
Add verbose logging for os/apk debug builds
Alan Newberger [Fri, 10 Oct 2014 20:23:33 +0000 (20:23 +0000)]
Merge "Add verbose logging for os/apk debug builds" into ub-camera-glacier
Alan Newberger [Fri, 10 Oct 2014 20:15:25 +0000 (13:15 -0700)]
Add verbose logging for os/apk debug builds
Relax VERBOSE screening so that by default, we log more when not
in a release configuration.
Bug:
17950234
Change-Id: I30250974456607b4fb64c15d6ecfa288ceb2f133
Spike Sprague [Thu, 9 Oct 2014 22:20:42 +0000 (22:20 +0000)]
am
a9731952: Merge "change text color to white for tutorial and onboarding screens." into ub-camera-glacier
* commit '
a9731952fb824f78d033ae360ff8324ae6cf2d6a':
change text color to white for tutorial and onboarding screens.
Spike Sprague [Thu, 9 Oct 2014 22:18:23 +0000 (22:18 +0000)]
Merge "change text color to white for tutorial and onboarding screens." into ub-camera-glacier
Spike Sprague [Thu, 9 Oct 2014 21:56:52 +0000 (14:56 -0700)]
change text color to white for tutorial and onboarding screens.
Change-Id: If431ce0b321991e15f33f850acc3cc6c4474ffb4
Alan Newberger [Thu, 9 Oct 2014 01:55:59 +0000 (01:55 +0000)]
Merge "resolved conflicts for merge of
d0927687 to lmp-mr1-dev-plus-aosp" into ub-camera-haleakala
Puneet Lall [Thu, 9 Oct 2014 00:48:56 +0000 (00:48 +0000)]
am
59d337b4: Use a separate activity for capture intents
* commit '
59d337b422cc373666609fb0ef7fcc422884b683':
Use a separate activity for capture intents
Puneet Lall [Wed, 8 Oct 2014 23:36:20 +0000 (16:36 -0700)]
Use a separate activity for capture intents
Bug:
17911061
Change-Id: Id5d3e5347c1830dc43b8962c1494bb4bf5195136
Dianne Hackborn [Wed, 8 Oct 2014 16:37:44 +0000 (09:37 -0700)]
Update to use real L codename.
Change-Id: If6e5f02f693848f6cb0014084dccf910be4c958d
Sascha Haeberling [Wed, 8 Oct 2014 01:36:16 +0000 (01:36 +0000)]
am
e11ad6d6: Make sure a null mimetype is not crashing the app.
* commit '
e11ad6d67ad95a9ecab8a594bcb55a05708abc0f':
Make sure a null mimetype is not crashing the app.
Sascha Haeberling [Wed, 8 Oct 2014 01:27:47 +0000 (18:27 -0700)]
Make sure a null mimetype is not crashing the app.
Bug:
17398971
Though at this point something else is already horribly wrong with
mediaserver, otherwise this cannot happen.
Change-Id: I837dfd5992611ded0c34ea7cc1e677ac1456c0c0
Puneet Lall [Wed, 8 Oct 2014 00:58:42 +0000 (00:58 +0000)]
am
0d4cdba2: Revert "More lockscreen tuning"
* commit '
0d4cdba26b5fe4b7ca03796c5a2644a09e2c7144':
Revert "More lockscreen tuning"
Puneet Lall [Wed, 8 Oct 2014 00:47:36 +0000 (00:47 +0000)]
Revert "More lockscreen tuning"
This reverts commit
7ac13f5f3644c8de53ebd625f195d757166bf9c9.
Change-Id: I3c59f4d71efe80290731e55421011c16e5dd4a41
Spike Sprague [Wed, 8 Oct 2014 00:43:31 +0000 (00:43 +0000)]
am
fe7eb164: reverting b/559979
* commit '
fe7eb1640b1aca8500b2cab152648a699833d6fd':
reverting b/559979
Spike Sprague [Wed, 8 Oct 2014 00:38:33 +0000 (17:38 -0700)]
reverting b/559979
Change-Id: If4e58c67d4424ade68198a16c1d2d21595504efd
Jiawen Chen [Tue, 7 Oct 2014 22:45:03 +0000 (22:45 +0000)]
am
fd8c804c: Merge "Tweaked constants for Gcam." into ub-camera-glacier
* commit '
fd8c804c9429f150f6028c6f371d34352934f964':
Tweaked constants for Gcam.
Jiawen Chen [Tue, 7 Oct 2014 22:41:03 +0000 (22:41 +0000)]
Merge "Tweaked constants for Gcam." into ub-camera-glacier
Senpo Hu [Tue, 7 Oct 2014 22:02:17 +0000 (22:02 +0000)]
am
2a0e18e2: Adopt the new error handling mechanism in portability.
* commit '
2a0e18e280dfe541d4740345511ad299099cda79':
Adopt the new error handling mechanism in portability.
Senpo Hu [Tue, 7 Oct 2014 01:35:44 +0000 (18:35 -0700)]
Adopt the new error handling mechanism in portability.
Show camera fatal dialog to guide users exiting the app when
1) camera framework throws RTE or
2) DispatchThread job is timeout.
If users hit home button while error dialog is shown, just exit
the app.
Bug:
16189216
Change-Id: Ia0f1c64d452735ec62549f50ab62646d8d873c65
Sascha Haeberling [Tue, 7 Oct 2014 20:47:33 +0000 (20:47 +0000)]
am
1b19bc80: Merge "Catch error where framework is broken and returns no cameras." into ub-camera-glacier
* commit '
1b19bc806b42ad405a3ea60e5e6c4e278e0aaee2':
Catch error where framework is broken and returns no cameras.
Sascha Haeberling [Tue, 7 Oct 2014 20:45:34 +0000 (20:45 +0000)]
Merge "Catch error where framework is broken and returns no cameras." into ub-camera-glacier
Sascha Haeberling [Tue, 7 Oct 2014 17:53:18 +0000 (10:53 -0700)]
Catch error where framework is broken and returns no cameras.
Bug:
17868174
Exit the app with the "Cannot connect to camera" error.
Change-Id: Ic5a6e0af222a3740b8bd3f6e66ee575f9443008e
Puneet Lall [Tue, 7 Oct 2014 19:14:49 +0000 (19:14 +0000)]
am
b2f15652: Merge "More lockscreen tuning" into ub-camera-glacier
* commit '
b2f156527da437c1c4901c03bd004eb49eae23f6':
More lockscreen tuning
Puneet Lall [Tue, 7 Oct 2014 19:11:51 +0000 (19:11 +0000)]
Merge "More lockscreen tuning" into ub-camera-glacier
Puneet Lall [Tue, 7 Oct 2014 18:59:53 +0000 (11:59 -0700)]
More lockscreen tuning
Delay all onResume calls since we cannot always determine if we
will be immediately paused due to a lockscreen start.
Bug:
16035858
Change-Id: I96928814708eb8026bea8d0087341fda4b04bcbc
Spike Sprague [Tue, 7 Oct 2014 19:03:40 +0000 (19:03 +0000)]
am
c9a33037: Merge "adjust margin on TextViews and ImageViews in onboarding and tutorial screens" into ub-camera-glacier
* commit '
c9a3303761d72edd579406bdf6b6a1f29a16a8bc':
adjust margin on TextViews and ImageViews in onboarding and tutorial screens
Spike Sprague [Tue, 7 Oct 2014 19:01:23 +0000 (19:01 +0000)]
Merge "adjust margin on TextViews and ImageViews in onboarding and tutorial screens" into ub-camera-glacier
Spike Sprague [Sat, 4 Oct 2014 01:58:07 +0000 (18:58 -0700)]
adjust margin on TextViews and ImageViews in onboarding and tutorial screens
bug:
17654418
Change-Id: I10633495ae04fd00ac97c055094a6097f5f7c0a0
Puneet Lall [Tue, 7 Oct 2014 17:40:53 +0000 (17:40 +0000)]
am
3e236cc8: Lockscreen workaround tuning
* commit '
3e236cc8e33be40e434e73f7777bd81446277512':
Lockscreen workaround tuning
Puneet Lall [Tue, 7 Oct 2014 01:05:07 +0000 (18:05 -0700)]
Lockscreen workaround tuning
* Remove delay of onStartTasks. This fixes b/
17868175, and appears to
result in ~50ms improvements to cold starts from the lockscreen and
warm starts from the secure lockscreen.
* Disabled double-onResume() workaround for non-secure lockscreen launches
since this no longer happens when singleTask is enabled.
* Reduced the delay for the double-onResume() workaround by eliminating
the delay on the second call to onResume()
Bug:
17868175
Bug:
16035858
Change-Id: I7f7611901133e429def9a03d4009e1a99caaabd0
Spike Sprague [Tue, 7 Oct 2014 17:21:42 +0000 (17:21 +0000)]
am
0dd0d5ef: Merge "disable all user interactions (including mode switching) on SD Card errors" into ub-camera-glacier
* commit '
0dd0d5ef549b489d7711d60ea1988834313851a5':
disable all user interactions (including mode switching) on SD Card errors
Spike Sprague [Tue, 7 Oct 2014 17:17:55 +0000 (17:17 +0000)]
Merge "disable all user interactions (including mode switching) on SD Card errors" into ub-camera-glacier
Spike Sprague [Thu, 2 Oct 2014 17:14:55 +0000 (10:14 -0700)]
disable all user interactions (including mode switching) on SD Card errors
bug:
15841887
Change-Id: I8e7e92a884dda54d9b8385b29d9ef4b7bb7fbd14
Spike Sprague [Tue, 7 Oct 2014 17:09:26 +0000 (17:09 +0000)]
am
97563a79: color changes for modes, onboarding screens, and tutorial screens
* commit '
97563a7926f87ac350bff7f644d43209fe874185':
color changes for modes, onboarding screens, and tutorial screens
Spike Sprague [Fri, 3 Oct 2014 21:03:52 +0000 (14:03 -0700)]
color changes for modes, onboarding screens, and tutorial screens
bug:
17785834
Change-Id: Idaf26517399a07471f2b6a98fdb9629baf41afcf
Spike Sprague [Tue, 7 Oct 2014 00:59:51 +0000 (00:59 +0000)]
am
39fe5d96: Merge "implement proper mode color for cancel button" into ub-camera-glacier
* commit '
39fe5d96cc0787f0ea3f8eb0b18108ef2abd3be6':
implement proper mode color for cancel button
Spike Sprague [Tue, 7 Oct 2014 00:58:20 +0000 (00:58 +0000)]
Merge "implement proper mode color for cancel button" into ub-camera-glacier
Sascha Haeberling [Mon, 6 Oct 2014 23:31:11 +0000 (23:31 +0000)]
am
2dcf912d: Merge "Make Camera V2 creation more robust agains failures." into ub-camera-glacier
* commit '
2dcf912d17f2ed7197c783d1273ff6200709e6d3':
Make Camera V2 creation more robust agains failures.
Sascha Haeberling [Mon, 6 Oct 2014 23:27:28 +0000 (23:27 +0000)]
Merge "Make Camera V2 creation more robust agains failures." into ub-camera-glacier
Andy Huibers [Mon, 6 Oct 2014 22:44:50 +0000 (22:44 +0000)]
am
877c2b65: Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy.
* commit '
877c2b65415ad43eb424f8a4a27bbeee7771d5bf':
Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy.
Andy Huibers [Fri, 3 Oct 2014 22:22:47 +0000 (15:22 -0700)]
Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy.
Bug:
17740679
Change-Id: Ia15749971f45f6579a19c379ee95c83c9ce20ccc
Jiawen Chen [Thu, 25 Sep 2014 00:26:59 +0000 (17:26 -0700)]
Tweaked constants for Gcam.
Bug:
17629128
Bug:
17550818
- In HDR+ mode only, change tap-to-expose/focus rectangle to 12% of the
viewfinder - works much better and matches final output.
- Changed post-shot return-to-continuous-AF constant to 1 second (3 seconds was
too long).
Submit together with ag/554414.
Change-Id: I56afb19e4378dbfa25f38376b05293fdb3908d47
Alan Newberger [Mon, 6 Oct 2014 18:38:32 +0000 (18:38 +0000)]
am
5381549f: Re-run settings files migrations
* commit '
5381549fe58cd3c5a28dc18e2416c37d3c2d300b':
Re-run settings files migrations
Alan Newberger [Mon, 6 Oct 2014 18:10:18 +0000 (11:10 -0700)]
Re-run settings files migrations
Increment version number for upgrade and re-run copying. This will
be a no-op for a first time glacier upgrader, copying runs in the
same sequence for this case. For alpha users who hit crashes, this
will re-run the copy, potentially overwriting some values but
ensuring all values are valid. Tested both N4 and N5 upgrade
scenarios that had previously seen issues, this addresses issues
without the need to clear data.
Bug:
17875895
Change-Id: I37c469c1b03151d03ee0d32ce0ba62983af32a36
Sascha Haeberling [Mon, 6 Oct 2014 17:39:21 +0000 (10:39 -0700)]
Make Camera V2 creation more robust agains failures.
Bug:
17878708
Change-Id: I9e64f89a1b3eb56e7f3afc774d8823a7666d8208
Alan Newberger [Mon, 6 Oct 2014 17:16:46 +0000 (17:16 +0000)]
am
90672aa0: Fix preference copy migration and incorrect HDR+ sticky bit
* commit '
90672aa08379e598426c12b529a86afd4b61011e':
Fix preference copy migration and incorrect HDR+ sticky bit
Alan Newberger [Mon, 6 Oct 2014 15:54:09 +0000 (08:54 -0700)]
Fix preference copy migration and incorrect HDR+ sticky bit
A sticky bit upgrader particularly for HDR+ was looking in
globals but was actually a module setting. The copy migrator
was not properly handling booleans! Modified the copy migrator
to properly handle supported types and removed the custom
incorrect upgrader.
Bug:
17875895
Change-Id: Id36abc429d12a77c5462e5c49ef7786e3d092f2c
Alan Newberger [Sat, 4 Oct 2014 20:56:25 +0000 (20:56 +0000)]
am
19597371: Only set preview size before starting preview
* commit '
19597371a18921bb03337e4fa24c28dd2d8f06ed':
Only set preview size before starting preview
Alan Newberger [Sat, 4 Oct 2014 01:27:50 +0000 (18:27 -0700)]
Only set preview size before starting preview
Remove recursive call to startPreview when updating preview size.
Avoid invoking preview size parameter updates for all calls to
updateCameraParametersPreference, and only adjust preview size
immediately before starting preview. Also added info logging
for all call paths into startPreview() to better diagnose
sequence of events in logs if we still see any races or
ordering issues.
Bug:
17809876
Change-Id: I626c913bb154c54aaffb451c24a63c6750553a52
Alan Newberger [Sat, 4 Oct 2014 00:55:58 +0000 (00:55 +0000)]
am
4032a773: Fix incorrect key translation in Settings refactor
* commit '
4032a773c4605894a2b6137590c7124ea16b7ab2':
Fix incorrect key translation in Settings refactor