diff options
author | Danesh M <danesh@cyngn.com> | 2016-04-12 15:24:16 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-05 10:25:53 -0700 |
commit | 40e8e4c95c600f1d7e4967b00315509061cbe59c (patch) | |
tree | 48c467ddbba91ddaae3d230dbddd6338d1819434 /packages/SystemUI/src/com/android/systemui/keyguard | |
parent | a77b5bc9da5d2516c601fae49772801af6c51a33 (diff) | |
download | frameworks_base-40e8e4c95c600f1d7e4967b00315509061cbe59c.zip frameworks_base-40e8e4c95c600f1d7e4967b00315509061cbe59c.tar.gz frameworks_base-40e8e4c95c600f1d7e4967b00315509061cbe59c.tar.bz2 |
Lockscreen : Bunch-o-fixes
- Prevent edge gesture from conflicting with lockscreen shortcuts
- Fix lockscreen shortcuts crash where animations were being run
on detached view
- Fix statusbar flicker when swiping keyguard in from the left
- Fade scrim away when swiping lockscreen in and out
- Fix back button not working when showing bouncer in
external keyguard.
- Ensure we collapse bottom area after up/cancel when
in external keyguard
- Fix issue where clock/notifications can get off-center
when swiping to left.
- Fix bottom flicker when swiping lockscreen to left
- Only lock directional swiping when swipe helper acknowledges it.
This allows for all the standard swipe behavior to function.
- Ensure lockscreen shortcuts are not actionable when in SHADE
- Only dismiss bottom area after lockscreen shortcuts animations
have finished animating
- Prevent swipe when album art showing
CYNGNOS-2585
CYNGNOS-2488
CYNGNOS-2517
CYNGNOS-2390
CYNGNOS-2632
CYNGNOS-2634
Change-Id: I2fe767ed7e07b621075c755aae98121c8517b997
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
-rwxr-xr-x | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 4a899f7..2c4c269 100755 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -53,6 +53,7 @@ import android.util.EventLog; import android.util.Log; import android.util.Slog; import android.view.IWindowManager; +import android.view.View; import android.view.ViewGroup; import android.view.WindowManagerGlobal; import android.view.WindowManagerPolicy; @@ -1294,9 +1295,17 @@ public class KeyguardViewMediator extends SystemUI { } public void showKeyguard() { + // This is to prevent left edge from interfering + // with affordances. + if (mStatusBar.isAffordanceSwipeInProgress()) { + return; + } mHandler.post(new Runnable() { @Override public void run() { + // Hide status bar window to avoid flicker, + // slideNotificationPanelIn will make it visible later. + mStatusBar.getStatusBarWindow().setVisibility(View.INVISIBLE); // Get the keyguard into the correct state by calling mStatusBar.showKeyguard() mStatusBar.showKeyguard(); // Now have the notification panel slid back into view |