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

am e86f1752: Merge "Use custom theme for keyguard presentation" into mnc-dev

Browse Source 
* commit 'e86f175229f5cf7b6149ecc19cf8de60be722293':
  Use custom theme for keyguard presentation
This commit is contained in:
Jim Miller
2015-07-07 23:37:43 +00:00
committed by Android Git Automerger
parent 407630e765 e86f175229
commit 0fd6914489
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:colorControlNormal">#80ffffff</item>
<item name="android:colorControlActivated">#80ffffff</item> <item name="android:colorControlActivated">#80ffffff</item>
</style> </style>
<style name="keyguard_presentation_theme" parent="@android:style/Theme.Material.NoActionBar.Fullscreen">
</style>
</resources> </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 (mPresentation == null && presentationDisplay != null) {
if (DEBUG) Slog.i(TAG, "Keyguard enabled on display: " + presentationDisplay); 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); mPresentation.setOnDismissListener(mOnDismissListener);
try { try {
mPresentation.show(); mPresentation.show();
@@ -141,11 +142,12 @@ public class KeyguardDisplayManager {
} }
}; };
public KeyguardPresentation(Context context, Display display) { public KeyguardPresentation(Context context, Display display, int theme) {
super(context, display); super(context, display, theme);
getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
} }
@Override
public void onDetachedFromWindow() { public void onDetachedFromWindow() {
mClock.removeCallbacks(mMoveTextRunnable); mClock.removeCallbacks(mMoveTextRunnable);
} }