diff options
| author | mingwax <mingwax@codeaurora.org> | 2016-11-07 11:07:37 +0800 |
|---|---|---|
| committer | mingwax <mingwax@codeaurora.org> | 2016-11-10 08:44:54 +0800 |
| commit | f5b99060843d791ece129463dcc5e377cd89c072 (patch) | |
| tree | 6bd22d238260235b7a2c799dc30cd3474ba436b4 /src/com/android/camera/util | |
| parent | fa36a1cc7d1252854751c9340ccba6e9de806255 (diff) | |
| download | android_packages_apps_Snap-f5b99060843d791ece129463dcc5e377cd89c072.tar.gz android_packages_apps_Snap-f5b99060843d791ece129463dcc5e377cd89c072.tar.bz2 android_packages_apps_Snap-f5b99060843d791ece129463dcc5e377cd89c072.zip | |
SnapdragonCamera: Fix camera can`t enter setting in pattern lock
RootCause:
Missing flag of WindowManager.LayoutParames in
SettingsActivity.java and SceneModeActivity.java.
Solution:
(1) Add windowManager.LayoutParams.FLAG_SHOW_WHEN
_LOCKED in SettingsActivity.java and SceneModeActivity.java.
(2) Change SettingsManager`s single instance, and guarantee
SettingsManager only one instance.
(3) When SettingsActivity.java and SceneModeActivity.java is
invisible status, finish them and ensure data is updated
in a timely manner.
Change-Id: I3ac24b9b181055382849550e585d3be726e71595
CRs-Fixed: 1084871
Diffstat (limited to 'src/com/android/camera/util')
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 1cdfd285a..28cb8e3b2 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -124,6 +124,8 @@ public class CameraUtil { /** Has to be in sync with the receiving MovieActivity. */ public static final String KEY_TREAT_UP_AS_BACK = "treat-up-as-back"; + /** Judge the value whether is from lockscreen come in or not */ + public static final String KEY_IS_SECURE_CAMERA = "is_secure_camera"; public static final int RATIO_UNKNOWN = 0; public static final int RATIO_16_9 = 1; |