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

Commit 7811330b authored by Steve Elliott's avatar Steve Elliott Committed by Automerger Merge Worker
Browse files

Merge "Deprecate Expandablenotificationrow#setNeedsRedaction" into tm-dev am: 665f010a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715233



Change-Id: Iaed826b1b7a3f4ee3e8957d2027464aa91a035b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6df05e79 665f010a

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

+7 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.systemui.statusbar.notification.collection.inflation;



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



import static java.util.Objects.requireNonNull;



import android.annotation.Nullable;
@@ -250,9 +252,11 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { 
        params.setUseIncreasedCollapsedHeight(useIncreasedCollapsedHeight);

        params.setUseLowPriority(isLowPriority);



        // TODO: Replace this API with RowContentBindParams directly. Also move to a separate

        // redaction controller.

        row.setNeedsRedaction(mNotificationLockscreenUserManager.needsRedaction(entry));

        if (mNotificationLockscreenUserManager.needsRedaction(entry)) {

            params.requireContentViews(FLAG_CONTENT_VIEW_PUBLIC);

        } else {

            params.markContentViewsFreeable(FLAG_CONTENT_VIEW_PUBLIC);

        }



        params.rebindAllContentViews();

        mRowContentBindStage.requestRebind(entry, en -> {

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

+3 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.graphics.drawable.AnimatedVectorDrawable; 
import android.graphics.drawable.AnimationDrawable;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.os.AsyncTask;

import android.os.Build;

import android.os.Bundle;

import android.os.RemoteException;
@@ -56,7 +55,6 @@ import android.util.IndentingPrintWriter; 
import android.util.Log;

import android.util.MathUtils;

import android.util.Property;

import android.util.Slog;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.MotionEvent;
@@ -90,8 +88,8 @@ import com.android.systemui.statusbar.RemoteInputController; 
import com.android.systemui.statusbar.SmartReplyController;

import com.android.systemui.statusbar.StatusBarIconView;

import com.android.systemui.statusbar.notification.AboveShelfChangedListener;

import com.android.systemui.statusbar.notification.LaunchAnimationParameters;

import com.android.systemui.statusbar.notification.FeedbackIcon;

import com.android.systemui.statusbar.notification.LaunchAnimationParameters;

import com.android.systemui.statusbar.notification.NotificationFadeAware;

import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorController;

import com.android.systemui.statusbar.notification.NotificationUtils;
@@ -1505,8 +1503,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        mUseIncreasedHeadsUpHeight = use;

    }



    /** @deprecated TODO: Remove this when the old pipeline code is removed. */

    @Deprecated

    public void setNeedsRedaction(boolean needsRedaction) {

        // TODO: Move inflation logic out of this call and remove this method

        if (mNeedsRedaction != needsRedaction) {

            mNeedsRedaction = needsRedaction;

            if (!isRemoved()) {

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

+2 −1
Original line number Diff line number Diff line
@@ -102,8 +102,9 @@ public final class RowContentBindParams { 
     * @see InflationFlag

     */

    public void markContentViewsFreeable(@InflationFlag int contentViews) {

        @InflationFlag int existingContentViews = contentViews &= mContentViews;

        mContentViews &= ~contentViews;

        mDirtyContentViews &= ~contentViews;

        mDirtyContentViews |= existingContentViews;

    }



    public @InflationFlag int getContentViews() {