diff options
author | Gabriele M <moto.falcon.git@gmail.com> | 2017-04-08 17:14:31 +0200 |
---|---|---|
committer | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-13 13:37:21 +0000 |
commit | 267b43ce1a04b7d028b241362ba40ed79f9e44d1 (patch) | |
tree | f6aff37b0feaf30115f76273b75c1346d50c8cf9 | |
parent | af1582f353e18ef53ef24611d9593864917d2c42 (diff) | |
download | android_frameworks_base-cm-14.1_old.tar.gz android_frameworks_base-cm-14.1_old.tar.bz2 android_frameworks_base-cm-14.1_old.zip |
Show lockscreen wallpaper when blur effect is enabledcm-14.1_old
Showing the content of the screen allows to use the device
without unlocking it first. Don't alter the way windows are hidden
to prevent any interaction.
BUGBASH-268
Change-Id: Id1d7ba4c51b62ea6b514ece9ac03ab271e63df84
3 files changed, 3 insertions, 55 deletions
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index f2ee70fd90a..111c0fa0855 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -729,11 +729,6 @@ public interface WindowManagerPolicy { public WindowState getWinShowWhenLockedLw(); /** - * Returns the current keyguard panel, if such a thing exists. - */ - public WindowState getWinKeyguardPanelLw(); - - /** * Called when the system would like to show a UI to indicate that an * application is starting. You can use this to add a * APPLICATION_STARTING_TYPE window with the given appToken to the window diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index baf0d72a3d2..cf37d3781b7 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3038,11 +3038,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { return mWinShowWhenLocked; } - @Override - public WindowState getWinKeyguardPanelLw() { - return mKeyguardPanel; - } - /** {@inheritDoc} */ @Override public View addStartingWindow(IBinder appToken, String packageName, int theme, diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java index c0396402b20..a6f4e4b5506 100644 --- a/services/core/java/com/android/server/wm/WindowAnimator.java +++ b/services/core/java/com/android/server/wm/WindowAnimator.java @@ -46,8 +46,6 @@ import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_ACTION_PEN import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_MAY_CHANGE; import android.content.Context; -import android.database.ContentObserver; -import android.os.Handler; import android.os.Trace; import android.util.Slog; import android.util.SparseArray; @@ -60,8 +58,6 @@ import android.view.WindowManagerPolicy; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; -import cyanogenmod.providers.CMSettings; - import java.io.PrintWriter; import java.util.ArrayList; @@ -139,21 +135,12 @@ public class WindowAnimator { } } - private boolean mKeyguardBlurEnabled; - WindowAnimator(final WindowManagerService service) { mService = service; mContext = service.mContext; mPolicy = service.mPolicy; mWindowPlacerLocked = service.mWindowPlacerLocked; - final boolean isBlurSupported = mContext.getResources().getBoolean( - com.android.internal.R.bool.config_uiBlurEnabled); - if (isBlurSupported) { - final SettingsObserver observer = new SettingsObserver(new Handler()); - observer.observe(mContext); - } - mAnimationFrameCallback = new Choreographer.FrameCallback() { public void doFrame(long frameTimeNs) { synchronized (mService.mWindowMap) { @@ -291,14 +278,6 @@ public class WindowAnimator { // Only hide windows if the keyguard is active and not animating away. boolean keyguardOn = mPolicy.isKeyguardShowingOrOccluded() && mForceHiding != KEYGUARD_ANIMATING_OUT; - - final WindowState winKeyguardPanel = (WindowState) mPolicy.getWinKeyguardPanelLw(); - // If a keyguard panel is currently being shown, we should - // continue to hide the windows as if blur is disabled. - if (winKeyguardPanel == null) { - keyguardOn &= !mKeyguardBlurEnabled; - } - boolean hideDockDivider = win.mAttrs.type == TYPE_DOCK_DIVIDER && win.getDisplayContent().getDockedStackLocked() == null; return keyguardOn && !allowWhenLocked && (win.getDisplayId() == Display.DEFAULT_DISPLAY) @@ -317,7 +296,7 @@ public class WindowAnimator { final boolean keyguardGoingAwayWithWallpaper = (mKeyguardGoingAwayFlags & KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER) != 0; - if (mKeyguardGoingAway && !mKeyguardBlurEnabled) { + if (mKeyguardGoingAway) { for (int i = windows.size() - 1; i >= 0; i--) { WindowState win = windows.get(i); if (!mPolicy.isKeyguardHostWindow(win.mAttrs)) { @@ -331,8 +310,7 @@ public class WindowAnimator { // Create a new animation to delay until keyguard is gone on its own. winAnimator.mAnimation = new AlphaAnimation(1.0f, 1.0f); - winAnimator.mAnimation.setDuration(mKeyguardBlurEnabled - ? 0 : KEYGUARD_ANIM_TIMEOUT_MS); + winAnimator.mAnimation.setDuration(KEYGUARD_ANIM_TIMEOUT_MS); winAnimator.mAnimationIsEntrance = false; winAnimator.mAnimationStartTime = -1; winAnimator.mKeyguardGoingAwayAnimation = true; @@ -409,8 +387,7 @@ public class WindowAnimator { if (nowAnimating && win.mWinAnimator.mKeyguardGoingAwayAnimation) { mForceHiding = KEYGUARD_ANIMATING_OUT; } else { - mForceHiding = win.isDrawnLw() && !mKeyguardBlurEnabled - ? KEYGUARD_SHOWN : KEYGUARD_NOT_SHOWN; + mForceHiding = win.isDrawnLw() ? KEYGUARD_SHOWN : KEYGUARD_NOT_SHOWN; } } if (DEBUG_KEYGUARD || DEBUG_VISIBILITY) Slog.v(TAG, @@ -1033,23 +1010,4 @@ public class WindowAnimator { void orAnimating(boolean animating) { mAnimating |= animating; } - - private class SettingsObserver extends ContentObserver { - SettingsObserver(Handler handler) { - super(handler); - } - - void observe(Context context) { - context.getContentResolver().registerContentObserver( - CMSettings.Secure.getUriFor(CMSettings.Secure.LOCK_SCREEN_BLUR_ENABLED), - false, this); - onChange(true); - } - - @Override - public void onChange(boolean selfChange) { - mKeyguardBlurEnabled = CMSettings.Secure.getInt(mContext.getContentResolver(), - CMSettings.Secure.LOCK_SCREEN_BLUR_ENABLED, 0) == 1; - } - } } |