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

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

Not asking for the password when dragging down and bypass 

Instead we'll just keep them in there looking like locked
notifications.

Fixes: 138225058
Test: add notifications, enable dynamic privacy, drag down
Change-Id: Ica49035ba3fe655c145f81be962817ddd294c48d
parent 2738aa3f

core/java/android/app/Notification.java

+7 −2
Original line number 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.

         *

         * @param isLowPriority is this notification low priority

         * @hide

         */

        @UnsupportedAppUsage

        public RemoteViews makePublicContentView() {

        public RemoteViews makePublicContentView(boolean isLowPriority) {

            if (mN.publicVersion != null) {

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

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

            mN.extras = publicExtras;

            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);

            mN.extras = savedBundle;

            mN.mLargeIcon = largeIcon;

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

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



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

            result.newPublicView = builder.makePublicContentView();

            result.newPublicView = builder.makePublicContentView(isLowPriority);

        }



        result.packageContext = packageContext;

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

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

            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) {

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

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

                || !mLockscreenUserManager.shouldShowLockscreenNotifications()

                || mFalsingManager.shouldEnforceBouncer();

        if (mKeyguardBypassController.getBypassEnabled()) {

            fullShadeNeedsBouncer = false;

        }

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

            mStatusBarStateController.setLeaveOpenOnKeyguardHide(true);

            showBouncerIfKeyguard();