summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2015-01-14 14:10:05 -0800
committerAlan Newberger <alann@google.com>2015-01-16 09:44:37 -0800
commit31f89504302fcecf25cad7b5f71de1978bdf877a (patch)
tree6b866a001fde55a23fefc2f1922866b0349c4d58 /AndroidManifest.xml
parent4660e6c1011c47ad7f604ad1b7f5f2227171a694 (diff)
downloadandroid_packages_apps_Camera2-31f89504302fcecf25cad7b5f71de1978bdf877a.tar.gz
android_packages_apps_Camera2-31f89504302fcecf25cad7b5f71de1978bdf877a.tar.bz2
android_packages_apps_Camera2-31f89504302fcecf25cad7b5f71de1978bdf877a.zip
Add Camera cover equivalent to windowBackground to smooth lockscreen startup
This CL adds a windowBackground drawable equivalent to the covers shown by lockscreen and app, to remove the black screen in between. With this CL I mostly see no artifacts when opening camera from lockscreen. Some issues: * to improve memory usage in system UI holding the lockscreen preview, a vector camera blanket was added in ag/587418 to ic_camera_blanket. That works transparently everywhere so far but not in resource drawables that can only handle bitmaps in layer-list items. Split the vector and bitmaps here, which means only the lockscreen uses the vector -- this also surfaced a color mismatch between the vector and our PNG bitmaps, corrected in the new ic_camera_blanket_vector resource. This is a bit fragile as we rely on pixel match of the two resources, would like a cleaner solution but the layer-list limitation is tough -- without this change the app crashes at runtime within BitmapDrawable when the windowBackground is loaded. * likewise both the lockscreen and app covers explicitly size the bitmap, there are no provisions to do so within layer-list. Will follow up with a refactor of in-app cover (ModeTransitionView) to remove explicit sizing and then all will rely on bitmap size (per above will still need vector file size coordinated with bitmap). * current implementation relies upon a black window background, we restore that in onCreate. * Both secure camera and v21 main camera currently use the windowBackground, will submit just for secure then introduce for main camera when we always start into Camera mode. * For L explicitly set android:windowDrawsSystemBarBackgrounds to false to ensure the system preview into the DecorView doesn't take the navigation bar into account when vertically centering the cover bitmap, to make the preview identical to the other covers. Bug: 18369862 Change-Id: Ia481e2d1d94bdc5a5d39b4d35b32c29a75bf99ec
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8d0c759bb..076863de2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -117,7 +117,7 @@
android:excludeFromRecents="true"
android:label="@string/app_name"
android:taskAffinity="com.android.camera.SecureCameraActivity"
- android:theme="@style/Theme.Camera"
+ android:theme="@style/Theme.SecureCamera"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
<intent-filter>
<action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />