diff options
| author | Jim Miller <jaggies@google.com> | 2015-07-07 23:33:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 23:33:22 +0000 |
| commit | e86f175229f5cf7b6149ecc19cf8de60be722293 (patch) | |
| tree | 0cfa40349146715ac76d6317e486733d5441d1d8 /packages/Keyguard/src/com | |
| parent | f12c91f5e67171bae0d36e89a507c96ff81d04a2 (diff) | |
| parent | c90d64583c741a99bc8a747866352b5c212b5ee1 (diff) | |
| download | frameworks_base-e86f175229f5cf7b6149ecc19cf8de60be722293.zip frameworks_base-e86f175229f5cf7b6149ecc19cf8de60be722293.tar.gz frameworks_base-e86f175229f5cf7b6149ecc19cf8de60be722293.tar.bz2 | |
Merge "Use custom theme for keyguard presentation" into mnc-dev
Diffstat (limited to 'packages/Keyguard/src/com')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java b/packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java index 55f965c..8de1d31 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); } |