Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99415394 authored by Selim Cinek's avatar Selim Cinek
Browse files

Escalate HeadsUp when dreaming starts 

1. When dreaming starts before locking, notifications can remain
pinned. This is because the device is locked without
screen off, and HeadsUp are not escalated.
As a result is the pinned heads up shown behind the bouncer
when unlocking.
In this case touchable bound is limited to headsup bounds,
so the user can't unlock at all.

2. Escalate HeadsUp when bar state changes to KEYGUARD

3. This also fixed a bug where the bouncer isn't touchable
When device is occluded and locked, HeadsUp can appear.
If the user then clicks on the HeadsUp and try to send
pending intent, Bouncer can be shown without expanding
panel.

Bug:30820511
Change-Id: I8604c9d00d839d773b32d8b913dfdcd2ed72f1dd
parent 09b7dea5

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+23 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
    private static final int MSG_SERVICE_STATE_CHANGE = 330;

    private static final int MSG_SCREEN_TURNED_ON = 331;

    private static final int MSG_SCREEN_TURNED_OFF = 332;

    private static final int MSG_DREAMING_STATE_CHANGED = 333;



    /** Fingerprint state: Not listening to fingerprint. */

    private static final int FINGERPRINT_STATE_STOPPED = 0;
@@ -293,6 +294,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
                    handleScreenTurnedOff();

                    Trace.endSection();

                    break;

                case MSG_DREAMING_STATE_CHANGED:

                    handleDreamingStateChanged(msg.arg1);

                    break;

            }

        }

    };
@@ -990,6 +994,17 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
        }

    }



    private void handleDreamingStateChanged(int dreamStart) {

        final int count = mCallbacks.size();

        boolean showingDream = dreamStart == 1;

        for (int i = 0; i < count; i++) {

            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

            if (cb != null) {

                cb.onDreamingStateChanged(showingDream);

            }

        }

    }



    /**

     * IMPORTANT: Must be called from UI thread.

     */
@@ -1736,6 +1751,14 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
        mHandler.sendEmptyMessage(MSG_SCREEN_TURNED_OFF);

    }



    public void dispatchDreamingStarted() {

        mHandler.sendMessage(mHandler.obtainMessage(MSG_DREAMING_STATE_CHANGED, 1, 0));

    }



    public void dispatchDreamingStopped() {

        mHandler.sendMessage(mHandler.obtainMessage(MSG_DREAMING_STATE_CHANGED, 0, 0));

    }



    public boolean isDeviceInteractive() {

        return mDeviceInteractive;

    }

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java

+6 −0
Original line number Diff line number Diff line
@@ -245,4 +245,10 @@ public class KeyguardUpdateMonitorCallback { 
     * Called when the state whether we have a lockscreen wallpaper has changed.

     */

    public void onHasLockscreenWallpaperChanged(boolean hasLockscreenWallpaper) { }



    /**

     * Called when the dream's window state is changed.

     * @param dreaming true if the dream's window has been created and is visible

     */

    public void onDreamingStateChanged(boolean dreaming) { }

}

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+2 −0
Original line number Diff line number Diff line
@@ -964,6 +964,7 @@ public class KeyguardViewMediator extends SystemUI { 
     * if there is a secure lock pattern.

     */

    public void onDreamingStarted() {

        KeyguardUpdateMonitor.getInstance(mContext).dispatchDreamingStarted();

        synchronized (this) {

            if (mDeviceInteractive

                    && mLockPatternUtils.isSecure(KeyguardUpdateMonitor.getCurrentUser())) {
@@ -976,6 +977,7 @@ public class KeyguardViewMediator extends SystemUI { 
     * A dream stopped.

     */

    public void onDreamingStopped() {

        KeyguardUpdateMonitor.getInstance(mContext).dispatchDreamingStopped();

        synchronized (this) {

            if (mDeviceInteractive) {

                cancelDoKeyguardLaterLocked();

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+12 −2
Original line number Diff line number Diff line
@@ -664,6 +664,15 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    private boolean mNoAnimationOnNextBarModeChange;

    private FalsingManager mFalsingManager;



    private KeyguardUpdateMonitorCallback mUpdateCallback = new KeyguardUpdateMonitorCallback() {

        @Override

        public void onDreamingStateChanged(boolean dreaming) {

            if (dreaming) {

                maybeEscalateHeadsUp();

            }

        }

    };



    @Override

    public void start() {

        mDisplay = ((WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE))
@@ -701,8 +710,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mUnlockMethodCache.addListener(this);

        startKeyguard();



        KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateCallback);

        mDozeServiceHost = new DozeServiceHost();

        KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mDozeServiceHost);

        putComponent(DozeHost.class, mDozeServiceHost);

        putComponent(PhoneStatusBar.class, this);
@@ -4445,6 +4454,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        }

        if (state == StatusBarState.KEYGUARD) {

            removeRemoteInputEntriesKeptUntilCollapsed();

            maybeEscalateHeadsUp();

        }

        mState = state;

        mGroupManager.setStatusBarState(state);
@@ -4964,7 +4974,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        }

    }



    private final class DozeServiceHost extends KeyguardUpdateMonitorCallback implements DozeHost  {

    private final class DozeServiceHost implements DozeHost {

        // Amount of time to allow to update the time shown on the screen before releasing

        // the wakelock.  This timeout is design to compensate for the fact that we don't

        // currently have a way to know when time display contents have actually been

packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL 
    }



    public void onComputeInternalInsets(ViewTreeObserver.InternalInsetsInfo info) {

        if (mIsExpanded) {

        if (mIsExpanded || mBar.isBouncerShowing()) {

            // The touchable region is always the full area when expanded

            return;

        }