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

am ad1d8b68: am 1db8cf12: Merge "Toggle wallpaper window flag when setting custom keyguard background" into klp-dev

Browse Source 
* commit 'ad1d8b68b6286f88be510d23f7dcfa4cd6dc5b36':
  Toggle wallpaper window flag when setting custom keyguard background
This commit is contained in:
Adam Powell
2013-10-10 20:15:13 -07:00
committed by Android Git Automerger
parent 0cbca14412 ad1d8b68b6
commit 000fa14613
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
View File

@@ -85,6 +85,7 @@ public class KeyguardViewManager {
public void onSetBackground(Bitmap bmp) { public void onSetBackground(Bitmap bmp) {
mKeyguardHost.setCustomBackground(bmp != null ? mKeyguardHost.setCustomBackground(bmp != null ?
new BitmapDrawable(mContext.getResources(), bmp) : null); new BitmapDrawable(mContext.getResources(), bmp) : null);
updateShowWallpaper(bmp == null);
} }
}; };
@@ -379,6 +380,16 @@ public class KeyguardViewManager {
mViewManager.updateViewLayout(mKeyguardHost, mWindowLayoutParams); mViewManager.updateViewLayout(mKeyguardHost, mWindowLayoutParams);
} }
void updateShowWallpaper(boolean show) {
if (show) {
mWindowLayoutParams.flags |= WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
} else {
mWindowLayoutParams.flags &= ~WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
}
mViewManager.updateViewLayout(mKeyguardHost, mWindowLayoutParams);
}
public void setNeedsInput(boolean needsInput) { public void setNeedsInput(boolean needsInput) {
mNeedsInput = needsInput; mNeedsInput = needsInput;
if (mWindowLayoutParams != null) { if (mWindowLayoutParams != null) {
@@ -489,6 +500,7 @@ public class KeyguardViewManager {
lastView.cleanUp(); lastView.cleanUp();
// Let go of any large bitmaps. // Let go of any large bitmaps.
mKeyguardHost.setCustomBackground(null); mKeyguardHost.setCustomBackground(null);
updateShowWallpaper(true);
mKeyguardHost.removeView(lastView); mKeyguardHost.removeView(lastView);
} }
} }