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

Commit 587488e0 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev 

* commit '81eeef58':
  Update time when turning on screen, in addition to waking up
parents e41c18d6 81eeef58

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

+1 −0
Original line number Diff line number Diff line
@@ -1571,6 +1571,7 @@ public class KeyguardViewMediator extends SystemUI { 
    private void handleNotifyScreenTurningOn(IKeyguardDrawnCallback callback) {

        synchronized (KeyguardViewMediator.this) {

            if (DEBUG) Log.d(TAG, "handleNotifyScreenTurningOn");

            mStatusBarKeyguardViewManager.onScreenTurningOn();

            if (callback != null) {

                if (mWakeAndUnlocking) {

                    mDrawnCallback = callback;

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

+1 −1
Original line number Diff line number Diff line
@@ -2226,7 +2226,7 @@ public class NotificationPanelView extends PanelView implements 
        }

    };



    public void onScreenTurnedOn() {

    public void onScreenTurningOn() {

        mKeyguardStatusView.refreshTime();

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -3837,11 +3837,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    public void onScreenTurnedOn() {

        mScreenOnFromKeyguard = true;

        mStackScroller.setAnimationsEnabled(true);

        mNotificationPanel.onScreenTurnedOn();

        mNotificationPanel.setTouchDisabled(false);

        updateVisibleToUser();

    }



    public void onScreenTurningOn() {

        mNotificationPanel.onScreenTurningOn();

    }



    /**

     * This handles long-press of both back and recents.  They are

     * handled together to capture them both being long-pressed

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

+4 −0
Original line number Diff line number Diff line
@@ -172,6 +172,10 @@ public class StatusBarKeyguardViewManager { 
        mPhoneStatusBar.onScreenTurnedOn();

    }



    public void onScreenTurningOn() {

        mPhoneStatusBar.onScreenTurningOn();

    }



    public void onScreenTurnedOn() {

        mScreenTurnedOn = true;

        mWakeAndUnlocking = false;