diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-11-13 19:32:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-13 19:32:27 +0000 |
| commit | 424984172bb2a89dd06cc49fd5a3665bc7c85e5c (patch) | |
| tree | 46f901dda60a1adc237cdea7d03edf8307e4ccf3 | |
| parent | f554042a9582c5b4ad1b0d41bc08a0caad470798 (diff) | |
| parent | 5c6a781eaf5eafd5f3bba46f1cfd7e53cd0428da (diff) | |
| download | frameworks_base-424984172bb2a89dd06cc49fd5a3665bc7c85e5c.zip frameworks_base-424984172bb2a89dd06cc49fd5a3665bc7c85e5c.tar.gz frameworks_base-424984172bb2a89dd06cc49fd5a3665bc7c85e5c.tar.bz2 | |
Merge "DessertCase fixes:" into klp-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/DessertCase.java | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/DessertCaseView.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/DessertCase.java b/packages/SystemUI/src/com/android/systemui/DessertCase.java index dd4c018..d797e38 100644 --- a/packages/SystemUI/src/com/android/systemui/DessertCase.java +++ b/packages/SystemUI/src/com/android/systemui/DessertCase.java @@ -36,7 +36,8 @@ public class DessertCase extends Activity { if (pm.getComponentEnabledSetting(cn) != PackageManager.COMPONENT_ENABLED_STATE_ENABLED) { Slog.v("DessertCase", "ACHIEVEMENT UNLOCKED"); pm.setComponentEnabledSetting(cn, - PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0); + PackageManager.COMPONENT_ENABLED_STATE_ENABLED, + PackageManager.DONT_KILL_APP); } mView = new DessertCaseView(this); diff --git a/packages/SystemUI/src/com/android/systemui/DessertCaseView.java b/packages/SystemUI/src/com/android/systemui/DessertCaseView.java index 6fce732..4147155 100644 --- a/packages/SystemUI/src/com/android/systemui/DessertCaseView.java +++ b/packages/SystemUI/src/com/android/systemui/DessertCaseView.java @@ -496,7 +496,6 @@ public class DessertCaseView extends FrameLayout { } public static class RescalingContainer extends FrameLayout { - private static final int SYSTEM_UI_MODE_800 = 0x00000800; private DessertCaseView mView; private float mDarkness; @@ -509,7 +508,7 @@ public class DessertCaseView extends FrameLayout { | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - | SYSTEM_UI_MODE_800 + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY ); } |