diff options
| author | zafir <zafir@google.com> | 2015-07-15 01:14:10 -0700 |
|---|---|---|
| committer | Alan Newberger <alann@google.com> | 2015-07-17 11:09:18 -0700 |
| commit | dd334be92c5513a06c809ee3ea25e411dfad0589 (patch) | |
| tree | bb8427074363748c8fd998370898262aa4d9c4f6 /AndroidManifest.xml | |
| parent | 34663b0fd4a21a6c107c6df313bcbd1548235fd5 (diff) | |
| download | Camera2-dd334be92c5513a06c809ee3ea25e411dfad0589.tar.gz | |
Camera M permissions: lockscreen improvements
This CL now just provides some improvements for lockscreen independent
of any onCreate/onResume lifecycle adjustments. Fixes include:
* add a black content view to Permissions Activity -- noticed screen
junk opening from lockscreen due to unpainted regions, the whole
activity needs to paint the screen not just the dialog.
* use FLAG_SHOW_WHEN_LOCKED to show permissions screen over lockscreen,
per bug discussion in this case force failure, don't prompt for
permission grants.
* fun double onResumes induce flicker jank in the dialog UI. Inherit
QuickActivity to automatically pick up the workarounds for double
onResumes from lockscreens, no more flicker in the permission
dialog.
* also borrow from CameraActivity, broadcast receives to shut down
the permissions dialog when screen goes off or user hits home on
top of lockscreen. Actually apply this more broadly so that even
below lockscreen, we finish this activity on screen off, IMO it
is jarring to go in through lockscreen and see our permission
dialog again without context of having just opened camera.
* tweak permission dialog to not be cancelable, and to finish
activity on back button press.
* excludeFromRecents on the activity to prevent dual recents
for Camera to show up when opening both via SecureCameraActivity
and CameraActivity.
Bug: 22502696
Change-Id: Ib545d3baa2d83b52604eec5517047b0c6278cd92
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b8816a616..c5fdb6653 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -73,6 +73,7 @@ <activity android:name="com.android.camera.PermissionsActivity" android:label="@string/app_name" + android:excludeFromRecents="true" android:parentActivityName="com.android.camera.CameraActivity" > <meta-data android:name="android.support.PARENT_ACTIVITY" |