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

Commit 8c79ce9f authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 85be8992: am b0a8d2c4: Merge "Fixed a potential bug where the keyguard... 

am 85be8992: am b0a8d2c4: Merge "Fixed a potential bug where the keyguard could become empty" into mnc-dev

* commit '85be8992':
  Fixed a potential bug where the keyguard could become empty
parents 4089f144 85be8992

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

+1 −0
Original line number Diff line number Diff line
@@ -3460,6 +3460,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            mKeyguardIndicationController.setVisible(true);

            mNotificationPanel.resetViews();

            mKeyguardUserSwitcher.setKeyguard(true, fromShadeLocked);

            mStatusBarView.removePendingHideExpandedRunnables();

        } else {

            mKeyguardIndicationController.setVisible(false);

            mKeyguardUserSwitcher.setKeyguard(false,

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

+11 −6
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ public class PhoneStatusBarView extends PanelBar { 
    private ScrimController mScrimController;

    private float mMinFraction;

    private float mPanelFraction;

    private Runnable mHideExpandedRunnable = new Runnable() {

        @Override

        public void run() {

            mBar.makeExpandedInvisible();

        }

    };



    public PhoneStatusBarView(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -118,15 +124,14 @@ public class PhoneStatusBarView extends PanelBar { 
                    + Log.getStackTraceString(new Throwable()));

        }

        // Close the status bar in the next frame so we can show the end of the animation.

        postOnAnimation(new Runnable() {

            @Override

            public void run() {

                mBar.makeExpandedInvisible();

            }

        });

        postOnAnimation(mHideExpandedRunnable);

        mLastFullyOpenedPanel = null;

    }



    public void removePendingHideExpandedRunnables() {

        removeCallbacks(mHideExpandedRunnable);

    }



    @Override

    public void onPanelFullyOpened(PanelView openPanel) {

        super.onPanelFullyOpened(openPanel);