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/SettingsManager.java | |
| 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/SettingsManager.java')
| -rw-r--r-- | src/com/android/camera/SettingsManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index e076b3824..051f5db09 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -55,6 +55,7 @@ import com.android.camera.imageprocessor.filter.UbifocusFilter; import com.android.camera.ui.ListMenu; import com.android.camera.ui.PanoCaptureProcessView; import com.android.camera.util.SettingTranslation; +import com.android.camera.app.CameraApp; import org.codeaurora.snapcam.R; import org.json.JSONException; @@ -193,7 +194,7 @@ public class SettingsManager implements ListMenu.SettingsListener { public static SettingsManager createInstance(Context context) { if (sInstance == null) { - sInstance = new SettingsManager(context); + sInstance = new SettingsManager(context.getApplicationContext()); } return sInstance; } |