From abe0da0a79a2312c347e16095488e192bb615037 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Fri, 18 Sep 2009 01:55:39 -0700 Subject: [PATCH] Policy changes for lock screen on live wallpaper. Change-Id: Ib875ef839b7727194461b13684b77bf38ad3c52e --- .../internal/policy/impl/KeyguardViewManager.java | 5 +++-- .../internal/policy/impl/LockPatternKeyguardView.java | 8 +++++--- .../internal/policy/impl/PhoneWindowManager.java | 4 ++++ .../internal/policy/impl/RecentApplicationsDialog.java | 10 +++------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/policy/com/android/internal/policy/impl/KeyguardViewManager.java b/policy/com/android/internal/policy/impl/KeyguardViewManager.java index 297d62f4a4bf8..f05c2fbb8f3e4 100644 --- a/policy/com/android/internal/policy/impl/KeyguardViewManager.java +++ b/policy/com/android/internal/policy/impl/KeyguardViewManager.java @@ -101,6 +101,7 @@ public class KeyguardViewManager implements KeyguardWindowController { final int stretch = ViewGroup.LayoutParams.FILL_PARENT; int flags = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN + | WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER /*| WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR*/ ; if (!mNeedsInput) { @@ -108,9 +109,9 @@ public class KeyguardViewManager implements KeyguardWindowController { } WindowManager.LayoutParams lp = new WindowManager.LayoutParams( stretch, stretch, WindowManager.LayoutParams.TYPE_KEYGUARD, - flags, PixelFormat.OPAQUE); + flags, PixelFormat.TRANSLUCENT); lp.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN; - lp.windowAnimations = com.android.internal.R.style.Animation_LockScreen; + //lp.windowAnimations = com.android.internal.R.style.Animation_LockScreen; lp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; lp.setTitle("Keyguard"); mWindowLayoutParams = lp; diff --git a/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java index f961f47f9ce96..7a81c056b7328 100644 --- a/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -285,9 +285,11 @@ public class LockPatternKeyguardView extends KeyguardViewBase { setDescendantFocusability(FOCUS_AFTER_DESCENDANTS); // wall paper background - final BitmapDrawable drawable = (BitmapDrawable) context.getWallpaper(); - setBackgroundDrawable( - new FastBitmapDrawable(drawable.getBitmap())); + if (false) { + final BitmapDrawable drawable = (BitmapDrawable) context.getWallpaper(); + setBackgroundDrawable( + new FastBitmapDrawable(drawable.getBitmap())); + } // create both the lock and unlock screen so they are quickly available // when the screen turns on diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java index 3b948707950f7..523d3b47c34e0 100644 --- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java @@ -650,6 +650,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { return 0; } + public int getMaxWallpaperLayer() { + return STATUS_BAR_LAYER; + } + /** {@inheritDoc} */ public View addStartingWindow(IBinder appToken, String packageName, int theme, CharSequence nonLocalizedLabel, diff --git a/policy/com/android/internal/policy/impl/RecentApplicationsDialog.java b/policy/com/android/internal/policy/impl/RecentApplicationsDialog.java index a680cc83b3d67..4c46be5bdfc59 100644 --- a/policy/com/android/internal/policy/impl/RecentApplicationsDialog.java +++ b/policy/com/android/internal/policy/impl/RecentApplicationsDialog.java @@ -20,7 +20,6 @@ import android.app.ActivityManager; import android.app.Dialog; import android.app.StatusBarManager; import android.content.BroadcastReceiver; -import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -30,13 +29,10 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.os.Handler; -import android.os.Message; import android.view.View; import android.view.Window; import android.view.WindowManager; import android.view.View.OnClickListener; -import android.widget.ImageView; import android.widget.TextView; import java.util.List; @@ -59,7 +55,7 @@ public class RecentApplicationsDialog extends Dialog implements OnClickListener private int mIconSize; public RecentApplicationsDialog(Context context) { - super(context); + super(context, com.android.internal.R.style.Theme_Dialog_RecentApplications); final Resources resources = context.getResources(); mIconSize = (int) resources.getDimension(android.R.dimen.app_icon_size); @@ -84,8 +80,8 @@ public class RecentApplicationsDialog extends Dialog implements OnClickListener Window theWindow = getWindow(); theWindow.requestFeature(Window.FEATURE_NO_TITLE); theWindow.setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG); - theWindow.setFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND, - WindowManager.LayoutParams.FLAG_BLUR_BEHIND); + theWindow.setFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND, + WindowManager.LayoutParams.FLAG_DIM_BEHIND); theWindow.setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM); theWindow.setTitle("Recents");