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

Commit 9f56b20e authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Not asking for the password when dragging down and bypass" into... 

Merge "Not asking for the password when dragging down and bypass" into qt-r1-dev am: 87592617 am: dad92fc9
am: a014f22d

Change-Id: Ie3463c3494bbeae3b104acfd00d41611b3c6f1e7
parents f2ac44cd a014f22d

core/java/android/app/Notification.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -5437,10 +5437,11 @@ public class Notification implements Parcelable 
        /**

        /**

         * Construct a RemoteViews for the display in public contexts like on the lockscreen.

         * Construct a RemoteViews for the display in public contexts like on the lockscreen.

         *

         *

         * @param isLowPriority is this notification low priority

         * @hide

         * @hide

         */

         */

        @UnsupportedAppUsage

        @UnsupportedAppUsage

        public RemoteViews makePublicContentView() {

        public RemoteViews makePublicContentView(boolean isLowPriority) {

            if (mN.publicVersion != null) {

            if (mN.publicVersion != null) {

                final Builder builder = recoverBuilder(mContext, mN.publicVersion);

                final Builder builder = recoverBuilder(mContext, mN.publicVersion);

                return builder.createContentView();

                return builder.createContentView();
@@ -5467,7 +5468,11 @@ public class Notification implements Parcelable 
            }

            }

            mN.extras = publicExtras;

            mN.extras = publicExtras;

            RemoteViews view;

            RemoteViews view;

            view = makeNotificationHeader();

            StandardTemplateParams params = mParams.reset().fillTextsFrom(this);

            if (isLowPriority) {

                params.forceDefaultColor();

            }

            view = makeNotificationHeader(params);

            view.setBoolean(R.id.notification_header, "setExpandOnlyOnButton", true);

            view.setBoolean(R.id.notification_header, "setExpandOnlyOnButton", true);

            mN.extras = savedBundle;

            mN.extras = savedBundle;

            mN.mLargeIcon = largeIcon;

            mN.mLargeIcon = largeIcon;

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -349,7 +349,7 @@ public class NotificationContentInflater { 
        }

        }





        if ((reInflateFlags & FLAG_CONTENT_VIEW_PUBLIC) != 0) {

        if ((reInflateFlags & FLAG_CONTENT_VIEW_PUBLIC) != 0) {

            result.newPublicView = builder.makePublicContentView();

            result.newPublicView = builder.makePublicContentView(isLowPriority);

        }

        }





        result.packageContext = packageContext;

        result.packageContext = packageContext;

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -5682,6 +5682,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
            // The bottom might change because we're using the final actual height of the view

            // The bottom might change because we're using the final actual height of the view

            mAnimateBottomOnLayout = true;

            mAnimateBottomOnLayout = true;

        }

        }

        // Let's update the footer once the notifications have been updated (in the next frame)

        post(this::updateFooter);

    }

    }





    public void setOnPulseHeightChangedListener(Runnable listener) {

    public void setOnPulseHeightChangedListener(Runnable listener) {

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -3568,6 +3568,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
                userAllowsPrivateNotificationsInPublic(mLockscreenUserManager.getCurrentUserId())

                userAllowsPrivateNotificationsInPublic(mLockscreenUserManager.getCurrentUserId())

                || !mLockscreenUserManager.shouldShowLockscreenNotifications()

                || !mLockscreenUserManager.shouldShowLockscreenNotifications()

                || mFalsingManager.shouldEnforceBouncer();

                || mFalsingManager.shouldEnforceBouncer();

        if (mKeyguardBypassController.getBypassEnabled()) {

            fullShadeNeedsBouncer = false;

        }

        if (mLockscreenUserManager.isLockscreenPublicMode(userId) && fullShadeNeedsBouncer) {

        if (mLockscreenUserManager.isLockscreenPublicMode(userId) && fullShadeNeedsBouncer) {

            mStatusBarStateController.setLeaveOpenOnKeyguardHide(true);

            mStatusBarStateController.setLeaveOpenOnKeyguardHide(true);

            showBouncerIfKeyguard();

            showBouncerIfKeyguard();