diff options
| author | 2015-07-08 02:05:04 +0000 | |
|---|---|---|
| committer | 2015-07-08 02:05:04 +0000 | |
| commit | acefca70f732b004bd9056ccbbdb1600bfdf2a06 (patch) | |
| tree | 66472384fe4354e859d420307546453c4ba600e1 | |
| parent | b6bd296f606553636809ac183cd25416f7644d5a (diff) | |
| parent | 0a7a4107acb5e4b62e4582b6ee8bf90cc636378d (diff) | |
am 0a7a4107: am 53a1bd9f: am 3ed4564c: am 0fd69144: am e86f1752: Merge "Use custom theme for keyguard presentation" into mnc-dev
* commit '0a7a4107acb5e4b62e4582b6ee8bf90cc636378d':
Use custom theme for keyguard presentation
| -rw-r--r-- | packages/Keyguard/res/values/styles.xml | 4 | ||||
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/packages/Keyguard/res/values/styles.xml b/packages/Keyguard/res/values/styles.xml index 943c3eabb69c..dede5370d7a3 100644 --- a/packages/Keyguard/res/values/styles.xml +++ b/packages/Keyguard/res/values/styles.xml @@ -52,4 +52,8 @@ <item name="android:colorControlNormal">#80ffffff</item> <item name="android:colorControlActivated">#80ffffff</item> </style> + + <style name="keyguard_presentation_theme" parent="@android:style/Theme.Material.NoActionBar.Fullscreen"> + </style> + </resources> diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java b/packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java index 55f965c3511e..8de1d317c5ed 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java @@ -105,7 +105,8 @@ public class KeyguardDisplayManager { if (mPresentation == null && presentationDisplay != null) { if (DEBUG) Slog.i(TAG, "Keyguard enabled on display: " + presentationDisplay); - mPresentation = new KeyguardPresentation(mContext, presentationDisplay); + mPresentation = new KeyguardPresentation(mContext, presentationDisplay, + R.style.keyguard_presentation_theme); mPresentation.setOnDismissListener(mOnDismissListener); try { mPresentation.show(); @@ -141,11 +142,12 @@ public class KeyguardDisplayManager { } }; - public KeyguardPresentation(Context context, Display display) { - super(context, display); + public KeyguardPresentation(Context context, Display display, int theme) { + super(context, display, theme); getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); } + @Override public void onDetachedFromWindow() { mClock.removeCallbacks(mMoveTextRunnable); } |