Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0a7a4107: am 53a1bd9f: am 3ed4564c: am 0fd69144: am e86f1752: Merge "Use custom theme for keyguard presentation" into mnc-dev

Browse Source 
* commit '0a7a4107acb5e4b62e4582b6ee8bf90cc636378d':
  Use custom theme for keyguard presentation
This commit is contained in:
Jim Miller
2015-07-08 02:05:04 +00:00
committed by Android Git Automerger
parent b6bd296f60 0a7a4107ac
commit acefca70f7
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Keyguard/res/values/styles.xml
View File

@@ -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>

8
packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java
View File

@@ -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);
}