Merge "Not asking for the password when dragging down and bypass" into qt-r1-dev (87592617) · Commits · e / os / android_frameworks_base

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;

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -5683,6 +5683,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) {

+3 −0

Original line number	Diff line number	Diff line
		@@ -3569,6 +3569,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();