summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/app
diff options
context:
space:
mode:
authormingwax <mingwax@codeaurora.org>2016-11-07 11:07:37 +0800
committermingwax <mingwax@codeaurora.org>2016-11-10 08:44:54 +0800
commitf5b99060843d791ece129463dcc5e377cd89c072 (patch)
tree6bd22d238260235b7a2c799dc30cd3474ba436b4 /src/com/android/camera/app
parentfa36a1cc7d1252854751c9340ccba6e9de806255 (diff)
downloadandroid_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/app')
-rw-r--r--src/com/android/camera/app/CameraApp.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/app/CameraApp.java b/src/com/android/camera/app/CameraApp.java
index b46d615b0..837e22cd1 100644
--- a/src/com/android/camera/app/CameraApp.java
+++ b/src/com/android/camera/app/CameraApp.java
@@ -22,6 +22,7 @@ import android.app.Application;
import com.android.camera.SDCard;
import com.android.camera.util.CameraUtil;
import com.android.camera.util.UsageStatistics;
+import com.android.camera.SettingsManager;
public class CameraApp extends Application {
private static long mMaxSystemMemory;
@@ -37,6 +38,7 @@ public class CameraApp extends Application {
if(mMaxSystemMemory <= LOW_MEMORY_DEVICE_THRESHOLD) {
mIsLowMemoryDevice = true;
}
+ SettingsManager.createInstance(this);
UsageStatistics.initialize(this);
CameraUtil.initialize(this);
SDCard.initialize(this);