OSDN Git Service
Alan Newberger [Mon, 27 Oct 2014 18:29:34 +0000 (11:29 -0700)]
Align id selection from QueryTask to sort order from Media query
In QueryTask we pick the id from the first result and consider it
the max id, yet we query ordered by date taken. On most phones
they're the same but by correcting the query to satisfy the
assumption in QueryTask, we remove costly scenarios where most
photos are reprocessed in LoadNewPhotosTask. One line fix in
LocalMediaData with more verbose logging added in CameraDataAdapter.
Bug:
17437217
Change-Id: Ia643f38d1bfb77ff0beaba989f0effe9a4dec31c
Spike Sprague [Fri, 24 Oct 2014 00:59:45 +0000 (00:59 +0000)]
Merge "When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons." into ub-camera-glacier
Sascha Haeberling [Fri, 24 Oct 2014 00:28:37 +0000 (17:28 -0700)]
Introduce ActionCallback for LocalData items.
Bug:
18105354
Fixes the bug where we try to cast a context to an activity.
Change-Id: I3e82a2cda5fe004768276a4d48c07d75738b2a5e
Spike Sprague [Thu, 23 Oct 2014 23:35:09 +0000 (16:35 -0700)]
When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons.
bug:
18104680
Change-Id: Ifd56369ca8177d40317f6af76bbc55a2110d6f5c
Alan Newberger [Thu, 23 Oct 2014 00:47:04 +0000 (00:47 +0000)]
Merge "Clean up orientation logging" into ub-camera-glacier
Alan Newberger [Thu, 23 Oct 2014 00:42:47 +0000 (17:42 -0700)]
Clean up orientation logging
Making it a bit easier to compare rotation vs capture metrics.
Bug:
18055323
Change-Id: I15904a00fcb463739b5d7e4c2ca7627be2ecb2b7
Spike Sprague [Thu, 23 Oct 2014 00:00:12 +0000 (00:00 +0000)]
Merge "new colors for GAR contrast compliance" into ub-camera-glacier
Spike Sprague [Wed, 22 Oct 2014 22:39:06 +0000 (15:39 -0700)]
new colors for GAR contrast compliance
Change-Id: I2e1a05b9670c01c9729ed9e7b8b146add95ab88f
Sascha Haeberling [Wed, 22 Oct 2014 21:25:59 +0000 (21:25 +0000)]
Merge "Stop activity leaks" into ub-camera-glacier
Sascha Haeberling [Sat, 18 Oct 2014 02:05:12 +0000 (19:05 -0700)]
Stop activity leaks
Bug:
12805279
This CL fixes all known activity leaks that occur from our
app. One leak remains that is caused by Camera Framework and
is tracked under b/
18077200.
For details on how to find and chase these leaks down, see
http://go/camera-activity-leaks
Change-Id: I9608e2fcf77fe97528b883ed40e0c08bbbf45bdf
Alan Newberger [Wed, 22 Oct 2014 18:53:21 +0000 (18:53 +0000)]
Merge "Null check for buildItemFromData" into ub-camera-glacier
Alan Newberger [Wed, 22 Oct 2014 18:46:02 +0000 (11:46 -0700)]
Null check for buildItemFromData
This can return null in some scenarios and other invocations do
null checks, one was missing here.
Bug:
18005946
Change-Id: I14c4b31569ace7e84886228a638757ab1cd4710f
Alan Newberger [Wed, 22 Oct 2014 18:30:06 +0000 (11:30 -0700)]
Check for null when deleting preference groups
No glacier incidents but with hundreds of Fishlake incidents
implying that sometimes we fail to find the preference to
remove, protect against nulls here to avoid crashing in
Settings.
Bug:
14625519
Change-Id: Iebc1a103abae7524e6ab0aca96d5c2479e62d9ee
Alan Newberger [Tue, 21 Oct 2014 00:31:33 +0000 (17:31 -0700)]
Increase VERBOSE logging for PhotoModule orientation use
Log all orientation values to diagnose capture orientation behavior.
Bug:
18055323
Change-Id: If63455104f7b96f5797f2651d1aadcadee67e1af
I-Jong Lin [Mon, 20 Oct 2014 23:12:21 +0000 (23:12 +0000)]
Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier
Alan Newberger [Mon, 20 Oct 2014 21:37:48 +0000 (21:37 +0000)]
Merge "Catch exceptions in settings remove helpers" into ub-camera-glacier
Alan Newberger [Mon, 20 Oct 2014 20:52:53 +0000 (13:52 -0700)]
Catch exceptions in settings remove helpers
Saw just one case of this and my hypothesis is that it was due to
another now-fixed exception resulting in a partial upgrade. But
in no case should these remove issues fail, so fixing to remove and
return the default if the underlying value is not readable. There
is some possibility for behavior error in this case since perhaps e.g.
a String-based 'true' was written and we upgrade instead to a default
'false', but allowing users to enter camera is better and I've audited
all uses of these, behavior should be fine/recoverable vs and
preferable to startup crash.
Bug:
18042161
Change-Id: If2453a819311bfd9233fdf65d7a97d8a243b393a
I-Jong Lin [Mon, 20 Oct 2014 20:47:50 +0000 (20:47 +0000)]
Merge "Button fix for torch when no flash available in hw" into ub-camera-glacier
I-Jong Lin [Thu, 16 Oct 2014 23:13:24 +0000 (16:13 -0700)]
Secure Camera App survives phone unlock screen
Bug:
17883828
There is UI path to start the secure camera app from the lock
screen, and then unlock the phone and find the secure camera
app on the task manager.
This live instance of secure camera app is confusing to the
user who is expecting to interact with a full camera app.
This fix kills the secure camera app when the phone is unlocked
and ensures that the user cannot easily restart the secure
camera app from the currently running tasks in task manager.
Change-Id: Ia6a6d077c460e66807d4be9836fe192184aa8eaf
I-Jong Lin [Fri, 17 Oct 2014 21:53:30 +0000 (14:53 -0700)]
Button fix for torch when no flash available in hw
Bug:
17952997
The logic to show and disable the flash button was NOT paired
with the torch button and sometimes allowed the enabled
torch button to be shown, even the flash button was disabled.
A bit confusing, since the torch and flash button look exactly
the same.
Torch button logic to show/hide and enable/disable now follows the flash
logic.
Change-Id: Ie14b07815b6d5e1f8d7ce792ef9ee36dfdf8e3ad
Sascha Haeberling [Fri, 17 Oct 2014 18:32:38 +0000 (11:32 -0700)]
Don't release resources until camera is closed.
Bug:
17788328
Change-Id: Id7112b698c8d49f9816e5e1bf6a133272fa2f65a
Spike Sprague [Thu, 16 Oct 2014 16:36:09 +0000 (16:36 +0000)]
Merge "disable startup shimmy on sd card error" into ub-camera-glacier
Spike Sprague [Wed, 15 Oct 2014 22:11:06 +0000 (15:11 -0700)]
disable startup shimmy on sd card error
bug:
15841887
Change-Id: If1cbb463a9de916b9fdd2926d8b47db04934535c
Alan Newberger [Wed, 15 Oct 2014 22:28:01 +0000 (15:28 -0700)]
Show capturing UI before review UI in intent countdown timer
Going prematurely to the review UI means you can hit the checkbox
before we have JPEG data. With this change, after countdown you
see a grayed out capture button like normal capture animation,
then the checkbox review UI when the picture is ready.
Bug:
18002016
Change-Id: Ieddd71636f962c127aa470ec0f150987d3d287ab
I-Jong Lin [Wed, 15 Oct 2014 19:31:41 +0000 (19:31 +0000)]
Merge "Fix for crash when PhotoApp deletes last Cam pic" into ub-camera-glacier
Sascha Haeberling [Wed, 15 Oct 2014 18:16:14 +0000 (18:16 +0000)]
Merge "Make string comparison robust against null values." into ub-camera-glacier
Sascha Haeberling [Wed, 15 Oct 2014 17:46:01 +0000 (10:46 -0700)]
Make string comparison robust against null values.
Bug:
17999505
Change-Id: Ic255603a5664e7d9be80d9e18435924e18d4ba66
I-Jong Lin [Wed, 15 Oct 2014 16:45:42 +0000 (09:45 -0700)]
Fix for crash when PhotoApp deletes last Cam pic
Bug:
17496363
This crash occurs when there is only one picture in the Camera
filmstrip. When you switch out of the Camera App into the
Photo App and delete it, and then switch back, the Filmstrip
attempts to draw a removal animation with invalid data, and
crashes via trying to call functions on null object. This fix
is simple and catches the null object and does NOT attempt to
draw the invalid object.
The larger issue may be that the Camera App is buffering/caching
invalid or stale data that it is illegally trying to act on.
I've left a warning message in the code to warn on any bad
behavior, but we should catch the invariant that's being violated
and fix the deeper problem.
Change-Id: I2487f753b5c7bb57e34c65d687a2236fa3a23f9f
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:00:51 +0000 (22:00 +0000)]
Merge "Log camera exception via UsageStatistics." into ub-camera-glacier
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: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 [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: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: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: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: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: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: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 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 [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: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: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
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: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:47:36 +0000 (00:47 +0000)]
Revert "More lockscreen tuning"
This reverts commit
7ac13f5f3644c8de53ebd625f195d757166bf9c9.
Change-Id: I3c59f4d71efe80290731e55421011c16e5dd4a41
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:41:03 +0000 (22:41 +0000)]
Merge "Tweaked constants for Gcam." into ub-camera-glacier
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: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: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: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 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: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 [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: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:27:28 +0000 (23:27 +0000)]
Merge "Make Camera V2 creation more robust agains failures." into ub-camera-glacier
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: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 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 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:48:43 +0000 (17:48 -0700)]
Fix incorrect key translation in Settings refactor
Bug:
17832052
Change-Id: Ie3ac25a1b9b813295b2bbd6ce723669d30cdb652
Alan Newberger [Sat, 4 Oct 2014 00:39:45 +0000 (00:39 +0000)]
Merge "Avoid porting null keys when copying preferences into new system" into ub-camera-glacier
Alan Newberger [Sat, 4 Oct 2014 00:34:09 +0000 (17:34 -0700)]
Avoid porting null keys when copying preferences into new system
Testing on Fishlake shows certain preferences are of 'null' type
in shared preferences. Avoid an NPE on porting a null. From testing,
this can happen with focus mode, best to just skip porting the key
and let the app use a default.
Bug:
17829562
Change-Id: I483cb5beb160d3fb7fc8a42aa5085531e3fccb63
Puneet Lall [Fri, 3 Oct 2014 23:32:56 +0000 (23:32 +0000)]
Merge "Use singleTask to improve unsecure lockscreen startup" into ub-camera-glacier
Puneet Lall [Thu, 25 Sep 2014 22:05:47 +0000 (15:05 -0700)]
Use singleTask to improve unsecure lockscreen startup
This enables warm-starts from the lockscreen by reusing the same
activity if possible.
Bug:
16035858
Change-Id: I4b1ce0c290e209a5098e3f3e71509e0ca86e1845
Alan Newberger [Fri, 3 Oct 2014 19:31:54 +0000 (12:31 -0700)]
Suppress 'help feedback' message pre-L in secure camera
Becase we see issues when starting activities above lockscreen
from filmstrip menu in K, disable unless we are on L.
Bug:
17767821
Change-Id: Ic59defd3fef5e283b356e94a952a2b75f4e9f1d6
Andy Huibers [Thu, 2 Oct 2014 22:51:49 +0000 (22:51 +0000)]
Merge "Add zoom value and timer duration to capture parameters, for logging." into ub-camera-glacier
Puneet Lall [Thu, 2 Oct 2014 22:35:10 +0000 (22:35 +0000)]
Merge "Close dangling camera proxy" into ub-camera-glacier
Puneet Lall [Thu, 2 Oct 2014 22:28:51 +0000 (15:28 -0700)]
Close dangling camera proxy
Bug:
17677971
Change-Id: I2cf2df7a12a44b3f9f33d0d9eac479c5281da356
Andy Huibers [Thu, 2 Oct 2014 21:56:34 +0000 (14:56 -0700)]
Add zoom value and timer duration to capture parameters, for logging.
Bug:
17204955
Change-Id: I13e087a8e87c9722b83b83d90af491966ff30c9e
Spike Sprague [Thu, 2 Oct 2014 20:39:24 +0000 (13:39 -0700)]
implement proper mode color for cancel button
bug:
17780517
Change-Id: I522fb223b4aa78d1acd8f18ebf20dbfe20ea8c99
Alan Newberger [Thu, 2 Oct 2014 17:50:07 +0000 (10:50 -0700)]
Trap CameraAgentFactory RTEs during recycle
Bug:
17759456
Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e
Alan Newberger [Wed, 1 Oct 2014 23:52:56 +0000 (16:52 -0700)]
Trap camera close exceptions on pause
Bug:
17759456
Change-Id: I5e5fd39829bd0ebf3f37b354ca380cf6396bef55