OSDN Git Service
Dan Sandler [Fri, 14 Nov 2014 20:16:28 +0000 (20:16 +0000)]
am
005533a9: Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev
* commit '
005533a92a3b56ef8bceb456063ed0ac12c767cf':
Trim transparent pixels off camera preview bitmaps.
Dan Sandler [Fri, 14 Nov 2014 20:08:57 +0000 (20:08 +0000)]
Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev
Dan Sandler [Fri, 14 Nov 2014 15:02:13 +0000 (10:02 -0500)]
Trim transparent pixels off camera preview bitmaps.
Since SysUI holds these bitmaps in memory for jank-free
drawing, these pixels are just wasted RAM. Since the
transition code assumes uniform square bitmaps, these are
all 64x64dp, which is still a teensy bit wasteful but much
better than before (144x144dp).
Bug:
18369196
Change-Id: Idf10b2048190ac44eff3e5da467149c460067347
Qiwen Zhao [Wed, 12 Nov 2014 22:29:19 +0000 (14:29 -0800)]
Merge branch 'lmp-mr1-ub-dev' of persistent-https://googleplex-android.git.corp.google.com/platform/packages/apps/Camera2 into lmp-mr1-ub-dev
Shaohan Zou [Wed, 5 Nov 2014 23:28:10 +0000 (15:28 -0800)]
Fix camera latency test
b/
18239042
Change-Id: Ia59b4c10551038bf2cbe9b9770f21c63f49731f3
Qiwen Zhao [Wed, 12 Nov 2014 21:45:06 +0000 (13:45 -0800)]
reset to
8dd164a with history.
Shaohan Zou [Thu, 6 Nov 2014 01:39:43 +0000 (01:39 +0000)]
am
6e1f4125: Fix camera latency test b/
18239042
* commit '
6e1f41253728e6870de800f88b5aa2cfde60ee8b':
Fix camera latency test b/
18239042
Shaohan Zou [Wed, 5 Nov 2014 23:28:10 +0000 (15:28 -0800)]
Fix camera latency test
b/
18239042
Change-Id: Ia59b4c10551038bf2cbe9b9770f21c63f49731f3
Alan Newberger [Tue, 4 Nov 2014 22:30:39 +0000 (22:30 +0000)]
Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" into ub-camera-glacier
Alan Newberger [Tue, 4 Nov 2014 22:21:33 +0000 (14:21 -0800)]
Relax aspect ratio matching tolerance for devices with 1.347 ratios
Our .01 tolerance omits valid 4:3 previews when the image capture is
more than 0.01 over true 4:3. Relax matching in Glacier just for
affected builds.
Bug:
18241645
Change-Id: I5868bc9535e4c9bb886f0de0daf0e83cd2f4dc78
Alan Newberger [Tue, 4 Nov 2014 06:44:14 +0000 (22:44 -0800)]
move size parameter setting before other settings
Update picture size before applying parameters prior to starting preview.
This is required to avoid a 640x480 default picture stream on the Nexus 4
which is causing lowered preview frame rates (for unknown reasons).
Bug:
18227551
Change-Id: I2b7648146ff57d5a7d78a22f884643c6d62497e6
Sascha Haeberling [Wed, 29 Oct 2014 19:14:07 +0000 (12:14 -0700)]
Forcefully drop 4k recording from pre-L releases.
Bug:
18172081
Change-Id: I26b09f19757e059d3567b3cb707592696531d0b3
Sascha Haeberling [Tue, 28 Oct 2014 17:18:31 +0000 (10:18 -0700)]
Remove additional dependencies on FloatMath
See frameworks/base commit
33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I70a3ad8a9264c320b5e2d6a9097a05d473e4fcfa
Sascha Haeberling [Tue, 28 Oct 2014 00:53:12 +0000 (17:53 -0700)]
Fix wear interaction of CaptureModule
Bug:
18121865
- Make sure we announce that the module is exiting.
- Send postview image to wear device.
- Make sure we can take a picture when timer is on.
Change-Id: I1cbc2e9a1725fdd6d8724ce93f547c87eab8b4aa
I-Jong Lin [Mon, 27 Oct 2014 23:17:19 +0000 (23:17 +0000)]
Merge "Volantis Device Identifier Helper" into ub-camera-glacier
I-Jong Lin [Mon, 27 Oct 2014 22:38:32 +0000 (15:38 -0700)]
Volantis Device Identifier Helper
Bug:
17868158
Part of a multi-project commit, along with ag/575889
Adds a helper function to identify when the Android device
is a Nexus 9.
Change-Id: I36c3b6e4472d08d1be7b1197fd62f4766fcc81ed
Spike Sprague [Mon, 27 Oct 2014 21:21:30 +0000 (21:21 +0000)]
Merge "consistent style for titles on user education screens" into ub-camera-glacier
Spike Sprague [Mon, 27 Oct 2014 21:07:14 +0000 (21:07 +0000)]
Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier
Spike Sprague [Mon, 27 Oct 2014 18:58:42 +0000 (11:58 -0700)]
Prevent unnecessary setVisibility calls in Filmstrip while zooming
bug:
18122644
Change-Id: I2681e5f104527553c4f6d71d96c0b659685813fa
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 18:32:06 +0000 (11:32 -0700)]
consistent style for titles on user education screens
bug:
18115448
Change-Id: I9d1caaa0903d6f3c2c47ca3e8457a4f85aad910c
Senpo Hu [Fri, 24 Oct 2014 20:12:49 +0000 (20:12 +0000)]
am
8fb9e06b: Adopt the new error handling mechanism in portability.
* commit '
8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25':
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
Conflicts:
src/com/android/camera/CameraActivity.java
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
Baligh Uddin [Sun, 19 Oct 2014 22:28:29 +0000 (22:28 +0000)]
am
0d283729: (-s ours) am
9d87600a: (-s ours) am
91bceebd: (-s ours) Import translations. DO NOT MERGE
* commit '
0d283729f3cb0bdc3f5afd992e5f49e56d1e5728':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 22:23:46 +0000 (22:23 +0000)]
am
9d87600a: (-s ours) am
91bceebd: (-s ours) Import translations. DO NOT MERGE
* commit '
9d87600a24c9b9b1c7a1d85b46971dba51d48e2c':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 22:17:06 +0000 (22:17 +0000)]
am
91bceebd: (-s ours) Import translations. DO NOT MERGE
* commit '
91bceebd0bb15a5d20d43f8eca808114b96eb5ce':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 20:43:09 +0000 (13:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9aa9830e9e60b0a774c9001f6cd5bb48f7c7d0cd
Auto-generated-cl: translation import
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
Dianne Hackborn [Fri, 10 Oct 2014 00:41:37 +0000 (00:41 +0000)]
am
55157d27: am
cc933608: am
2d440350: Update to use real L codename.
* commit '
55157d27305d06569f0bd7d3c47ec51855f87da4':
Update to use real L codename.
Dianne Hackborn [Fri, 10 Oct 2014 00:30:45 +0000 (00:30 +0000)]
am
cc933608: am
2d440350: Update to use real L codename.
* commit '
cc93360812c822eb4cac8056a0848c74338b3776':
Update to use real L codename.
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
Dianne Hackborn [Thu, 9 Oct 2014 19:29:30 +0000 (19:29 +0000)]
am
2d440350: Update to use real L codename.
* commit '
2d4403500d0bb55794aecbe9a33a03dd09f8ea0a':
Update to use real L codename.
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
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