diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-02-29 19:50:11 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2012-02-29 21:41:54 +0800 |
| commit | 75e1ce63353efe93a56dba3fff8d9f9134475163 (patch) | |
| tree | 7e01c90e788df21d0e63ac208250bec61e98a8be /policy | |
| parent | 9f77932422c3e819ea4c2ed16ff1f700337aa779 (diff) | |
| download | frameworks_base-75e1ce63353efe93a56dba3fff8d9f9134475163.zip frameworks_base-75e1ce63353efe93a56dba3fff8d9f9134475163.tar.gz frameworks_base-75e1ce63353efe93a56dba3fff8d9f9134475163.tar.bz2 | |
Use SINGLE_TOP and CLEAR_TOP when starting camera from lock scren.
Add these flags so there is no need to press back key twice to
exit the camera if users slide to camera twice.
bug:6070281
Change-Id: Iadf6ab2798cf9381bc9dc761920f46b022fb6bb8
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/LockScreen.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/LockScreen.java b/policy/src/com/android/internal/policy/impl/LockScreen.java index 3384661..edf5199 100644 --- a/policy/src/com/android/internal/policy/impl/LockScreen.java +++ b/policy/src/com/android/internal/policy/impl/LockScreen.java @@ -231,7 +231,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen { if (!mCameraDisabled) { // Start the Camera Intent intent = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK + | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); try { ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity(); } catch (RemoteException e) { |