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

Commit 7ccc5d9c authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Android (Google) Code Review
Browse files

Merge "[Notif Redaction] Inflate public single lines when type is not... 

Merge "[Notif Redaction] Inflate public single lines when type is not REDACTION_TYPE_NONE" into main
parents 21e19da4 cbac5767

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.statusbar.notification.collection.inflation;



import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_NONE;

import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_SENSITIVE_CONTENT;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_EXPANDED;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_PUBLIC;
@@ -276,7 +275,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { 


        if (LockscreenOtpRedaction.isSingleLineViewEnabled()) {

            if (inflaterParams.isChildInGroup()

                    && redactionType == REDACTION_TYPE_SENSITIVE_CONTENT) {

                    && redactionType != REDACTION_TYPE_NONE) {

                params.requireContentViews(FLAG_CONTENT_VIEW_PUBLIC_SINGLE_LINE);

            } else {

                params.markContentViewsFreeable(FLAG_CONTENT_VIEW_PUBLIC_SINGLE_LINE);