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

Commit aee70462 authored by Adrian Roos's avatar Adrian Roos
Browse files

Prevent full shade guesture from doing the wrong thing 

Also prevents us from getting into a state where it would
do the wrong thing previously.

Bug: 15934899
Change-Id: Ibb63814e80c50e4ccf65ef48d2b07cbe3a200e78
parent 57cf5702

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+2 −0
Original line number Diff line number Diff line
@@ -539,6 +539,8 @@ public abstract class BaseStatusBar extends SystemUI implements 
            // disable lockscreen notifications until user acts on the banner.

            Settings.Secure.putInt(mContext.getContentResolver(),

                    Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0);

            Settings.Secure.putInt(mContext.getContentResolver(),

                    Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0);



            final String packageName = mContext.getPackageName();

            PendingIntent cancelIntent = PendingIntent.getBroadcast(mContext, 0,

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

+3 −1
Original line number Diff line number Diff line
@@ -3753,7 +3753,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            row = (ExpandableNotificationRow) expandView;

            row.setUserExpanded(true);

        }

        if (isLockscreenPublicMode() && !userAllowsPrivateNotificationsInPublic(mCurrentUserId)) {

        boolean fullShadeNeedsBouncer = !userAllowsPrivateNotificationsInPublic(mCurrentUserId)

                || !mShowLockscreenNotifications;

        if (isLockscreenPublicMode() && fullShadeNeedsBouncer) {

            mLeaveOpenOnKeyguardHide = true;

            showBouncer();

            mDraggedDownRow = row;