Merge "Only inflate public view when notif is redacted." (beacda21) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+6 −9

Original line number	Diff line number	Diff line
		@@ -16,12 +16,9 @@
		package com.android.systemui.statusbar.notification;

		import static com.android.systemui.statusbar.NotificationRemoteInputManager.ENABLE_REMOTE_INPUT;
		import static com.android.systemui.statusbar.NotificationRemoteInputManager
		.FORCE_REMOTE_INPUT_HISTORY;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater
		.FLAG_CONTENT_VIEW_AMBIENT;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater
		.FLAG_CONTENT_VIEW_HEADS_UP;
		import static com.android.systemui.statusbar.NotificationRemoteInputManager.FORCE_REMOTE_INPUT_HISTORY;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_AMBIENT;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_HEADS_UP;

		import android.annotation.Nullable;
		import android.app.Notification;
		@@ -65,9 +62,9 @@ import com.android.systemui.ForegroundServiceController;
		import com.android.systemui.InitController;
		import com.android.systemui.R;
		import com.android.systemui.UiOffloadThread;
		import com.android.systemui.statusbar.NotificationLifetimeExtender;
		import com.android.systemui.statusbar.AlertingNotificationManager;
		import com.android.systemui.statusbar.AmbientPulseManager;
		import com.android.systemui.statusbar.NotificationLifetimeExtender;
		import com.android.systemui.statusbar.NotificationListener;
		import com.android.systemui.statusbar.NotificationLockscreenUserManager;
		import com.android.systemui.statusbar.NotificationMediaManager;
		@@ -676,8 +673,6 @@ public class NotificationEntryManager implements Dumpable, NotificationInflater.

		protected void updateNotification(NotificationData.Entry entry, PackageManager pmUser,
		StatusBarNotification sbn, ExpandableNotificationRow row) {
		row.setNeedsRedaction(
		Dependency.get(NotificationLockscreenUserManager.class).needsRedaction(entry));
		boolean isLowPriority = mNotificationData.isAmbient(sbn.getKey());
		boolean isUpdate = mNotificationData.get(entry.key) != null;
		boolean wasLowPriority = row.isLowPriority();
		@@ -712,6 +707,8 @@ public class NotificationEntryManager implements Dumpable, NotificationInflater.

		row.updateInflationFlag(FLAG_CONTENT_VIEW_HEADS_UP, shouldHeadsUp(entry));
		row.updateInflationFlag(FLAG_CONTENT_VIEW_AMBIENT, shouldPulse(entry));
		row.setNeedsRedaction(
		Dependency.get(NotificationLockscreenUserManager.class).needsRedaction(entry));
		row.inflateViews();
		}

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

+33 −15

Original line number	Diff line number	Diff line
		@@ -18,11 +18,11 @@ package com.android.systemui.statusbar.notification.row;

		import static com.android.systemui.statusbar.notification.ActivityLaunchAnimator.ExpandAnimationParameters;
		import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_AMBIENT;
		import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_CONTRACTED;
		import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_HEADSUP;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater
		.FLAG_CONTENT_VIEW_AMBIENT;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater
		.FLAG_CONTENT_VIEW_HEADS_UP;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_AMBIENT;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_HEADS_UP;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_PUBLIC;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater.InflationCallback;

		import android.animation.Animator;
		@@ -45,8 +45,8 @@ import android.graphics.drawable.ColorDrawable;
		import android.graphics.drawable.Drawable;
		import android.os.AsyncTask;
		import android.os.Build;
		import android.os.SystemClock;
		import android.os.Bundle;
		import android.os.SystemClock;
		import android.service.notification.StatusBarNotification;
		import android.util.ArraySet;
		import android.util.AttributeSet;
		@@ -79,32 +79,31 @@ import com.android.systemui.Interpolators;
		import com.android.systemui.R;
		import com.android.systemui.classifier.FalsingManager;
		import com.android.systemui.plugins.PluginListener;
		import com.android.systemui.shared.plugins.PluginManager;
		import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
		import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin.MenuItem;
		import com.android.systemui.statusbar.notification.NotificationData;
		import com.android.systemui.shared.plugins.PluginManager;
		import com.android.systemui.statusbar.NotificationShelf;
		import com.android.systemui.statusbar.RemoteInputController;
		import com.android.systemui.statusbar.StatusBarIconView;
		import com.android.systemui.statusbar.notification.AboveShelfChangedListener;
		import com.android.systemui.statusbar.notification.ActivityLaunchAnimator;
		import com.android.systemui.statusbar.notification.logging.NotificationCounters;
		import com.android.systemui.statusbar.notification.NotificationData;
		import com.android.systemui.statusbar.notification.NotificationUtils;
		import com.android.systemui.statusbar.notification.VisualStabilityManager;
		import com.android.systemui.statusbar.notification.logging.NotificationCounters;
		import com.android.systemui.statusbar.notification.row.NotificationInflater.InflationFlag;
		import com.android.systemui.statusbar.notification.row.wrapper.NotificationViewWrapper;
		import com.android.systemui.statusbar.notification.VisualStabilityManager;
		import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		import com.android.systemui.statusbar.notification.stack.AmbientState;
		import com.android.systemui.statusbar.notification.stack.AnimationProperties;
		import com.android.systemui.statusbar.notification.stack.ExpandableViewState;
		import com.android.systemui.statusbar.notification.stack.NotificationChildrenContainer;
		import com.android.systemui.statusbar.notification.stack.StackScrollState;
		import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.policy.HeadsUpManager;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.lang.reflect.Field;
		import java.util.ArrayList;
		import java.util.List;
		import java.util.function.BooleanSupplier;
		@@ -214,6 +213,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		*/
		private boolean mIsAmbientPulsing;

		/**
		* Whether or not the notification should be redacted on the lock screen, i.e has sensitive
		* content which should be redacted on the lock screen.
		*/
		private boolean mNeedsRedaction;
		private boolean mLastChronometerRunning = true;
		private ViewStub mChildrenContainerStub;
		private NotificationGroupManager mGroupManager;
		@@ -480,6 +484,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		getPublicLayout().performWhenContentInactive(VISIBLE_TYPE_AMBIENT,
		freeViewRunnable);
		break;
		case FLAG_CONTENT_VIEW_PUBLIC:
		getPublicLayout().performWhenContentInactive(VISIBLE_TYPE_CONTRACTED,
		freeViewRunnable);
		default:
		break;
		}
		@@ -557,6 +564,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		if (mIconAnimationRunning) {
		setIconAnimationRunning(true);
		}
		if (mLastChronometerRunning) {
		setChronometerRunning(true);
		}
		if (mNotificationParent != null) {
		mNotificationParent.updateChildrenHeaderAppearance();
		}
		@@ -615,7 +625,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		}

		private void updateLimitsForView(NotificationContentView layout) {
		boolean customView = layout.getContractedChild().getId()
		boolean customView = layout.getContractedChild() != null
		&& layout.getContractedChild().getId()
		!= com.android.internal.R.id.status_bar_latest_event_content;
		boolean beforeN = mEntry.targetSdk < Build.VERSION_CODES.N;
		boolean beforeP = mEntry.targetSdk < Build.VERSION_CODES.P;
		@@ -1569,7 +1580,14 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		}

		public void setNeedsRedaction(boolean needsRedaction) {
		mNotificationInflater.setRedactAmbient(needsRedaction);
		if (mNeedsRedaction != needsRedaction) {
		mNeedsRedaction = needsRedaction;
		updateInflationFlag(FLAG_CONTENT_VIEW_PUBLIC, needsRedaction /* shouldInflate */);
		mNotificationInflater.updateNeedsRedaction(needsRedaction);
		if (!needsRedaction) {
		freeContentViewWhenSafe(FLAG_CONTENT_VIEW_PUBLIC);
		}
		}
		}

		@VisibleForTesting

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

+58 −14

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.statusbar.notification.row;

		import android.annotation.Nullable;
		import android.app.Notification;
		import android.app.PendingIntent;
		import android.app.RemoteInput;
		@@ -423,11 +424,24 @@ public class NotificationContentView extends FrameLayout {
		return mAmbientSingleLineChild;
		}

		public void setContractedChild(View child) {
		/**
		* Sets the contracted view. Child may be null to remove the content view.
		*
		* @param child contracted content view to set
		*/
		public void setContractedChild(@Nullable View child) {
		if (mContractedChild != null) {
		mContractedChild.animate().cancel();
		removeView(mContractedChild);
		}
		if (child == null) {
		mContractedChild = null;
		mContractedWrapper = null;
		if (mTransformationStartVisibleType == VISIBLE_TYPE_CONTRACTED) {
		mTransformationStartVisibleType = UNDEFINED;
		}
		return;
		}
		addView(child);
		mContractedChild = child;
		mContractedWrapper = NotificationViewWrapper.wrap(getContext(), child,
		@@ -450,7 +464,12 @@ public class NotificationContentView extends FrameLayout {
		return null;
		}

		public void setExpandedChild(View child) {
		/**
		* Sets the expanded view. Child may be null to remove the content view.
		*
		* @param child expanded content view to set
		*/
		public void setExpandedChild(@Nullable View child) {
		if (mExpandedChild != null) {
		mPreviousExpandedRemoteInputIntent = null;
		if (mExpandedRemoteInput != null) {
		@@ -483,7 +502,12 @@ public class NotificationContentView extends FrameLayout {
		mContainingNotification);
		}

		public void setHeadsUpChild(View child) {
		/**
		* Sets the heads up view. Child may be null to remove the content view.
		*
		* @param child heads up content view to set
		*/
		public void setHeadsUpChild(@Nullable View child) {
		if (mHeadsUpChild != null) {
		mPreviousHeadsUpRemoteInputIntent = null;
		if (mHeadsUpRemoteInput != null) {
		@@ -516,7 +540,12 @@ public class NotificationContentView extends FrameLayout {
		mContainingNotification);
		}

		public void setAmbientChild(View child) {
		/**
		* Sets the ambient view. Child may be null to remove the content view.
		*
		* @param child ambient content view to set
		*/
		public void setAmbientChild(@Nullable View child) {
		if (mAmbientChild != null) {
		mAmbientChild.animate().cancel();
		removeView(mAmbientChild);
		@@ -542,6 +571,13 @@ public class NotificationContentView extends FrameLayout {
		protected void onVisibilityChanged(View changedView, int visibility) {
		super.onVisibilityChanged(changedView, visibility);
		updateVisibility();
		if (visibility != VISIBLE) {
		// View is no longer visible so all content views are inactive.
		for (Runnable r : mOnContentViewInactiveListeners.values()) {
		r.run();
		}
		mOnContentViewInactiveListeners.clear();
		}
		}

		private void updateVisibility() {
		@@ -589,6 +625,12 @@ public class NotificationContentView extends FrameLayout {
		mContentHeight = Math.min(mUnrestrictedContentHeight, maxContentHeight);
		selectLayout(mAnimate /* animate /, false / force */);

		if (mContractedChild == null) {
		// Contracted child may be null if this is the public content view and we don't need to
		// show it.
		return;
		}

		int minHeightHint = getMinContentHeightHint();

		NotificationViewWrapper wrapper = getVisibleWrapper(mVisibleType);
		@@ -739,7 +781,7 @@ public class NotificationContentView extends FrameLayout {
		}

		public int getMaxHeight() {
		if (mContainingNotification.isOnAmbient()) {
		if (mContainingNotification.isOnAmbient() && getShowingAmbientView() != null) {
		return getShowingAmbientView().getHeight();
		} else if (mExpandedChild != null) {
		return getViewHeight(VISIBLE_TYPE_EXPANDED)
		@@ -747,9 +789,11 @@ public class NotificationContentView extends FrameLayout {
		} else if (mIsHeadsUp && mHeadsUpChild != null && !mContainingNotification.isOnKeyguard()) {
		return getViewHeight(VISIBLE_TYPE_HEADSUP)
		+ getExtraRemoteInputHeight(mHeadsUpRemoteInput);
		}
		} else if (mContractedChild != null) {
		return getViewHeight(VISIBLE_TYPE_CONTRACTED);
		}
		return mNotificationMaxHeight;
		}

		private int getViewHeight(int visibleType) {
		View view = getViewForVisibleType(visibleType);
		@@ -766,10 +810,11 @@ public class NotificationContentView extends FrameLayout {
		}

		public int getMinHeight(boolean likeGroupExpanded) {
		if (mContainingNotification.isOnAmbient()) {
		if (mContainingNotification.isOnAmbient() && getShowingAmbientView() != null) {
		return getShowingAmbientView().getHeight();
		} else if (likeGroupExpanded \|\| !mIsChildInGroup \|\| isGroupExpanded()) {
		return getViewHeight(VISIBLE_TYPE_CONTRACTED);
		return mContractedChild != null
		? getViewHeight(VISIBLE_TYPE_CONTRACTED) : mMinContractedHeight;
		} else {
		return mSingleLineView.getHeight();
		}
		@@ -1104,7 +1149,8 @@ public class NotificationContentView extends FrameLayout {
		return VISIBLE_TYPE_EXPANDED;
		}
		} else {
		if (noExpandedChild \|\| (viewHeight <= getViewHeight(VISIBLE_TYPE_CONTRACTED)
		if (noExpandedChild \|\| (mContractedChild != null
		&& viewHeight <= getViewHeight(VISIBLE_TYPE_CONTRACTED)
		&& (!mIsChildInGroup \|\| isGroupExpanded()
		\|\| !mContainingNotification.isExpanded(true /* allowOnKeyguard */)))) {
		return VISIBLE_TYPE_CONTRACTED;
		@@ -1672,7 +1718,8 @@ public class NotificationContentView extends FrameLayout {
		if (view == null) {
		return true;
		}
		return view.getVisibility() != VISIBLE && getViewForVisibleType(mVisibleType) != view;
		return !isShown()
		\|\| (view.getVisibility() != VISIBLE && getViewForVisibleType(mVisibleType) != view);
		}

		@Override
		@@ -1691,10 +1738,7 @@ public class NotificationContentView extends FrameLayout {
		}

		public boolean isDimmable() {
		if (!mContractedWrapper.isDimmable()) {
		return false;
		}
		return true;
		return mContractedWrapper != null && mContractedWrapper.isDimmable();
		}

		/**

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

+36 −11

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.systemui.statusbar.notification.row;

		import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_AMBIENT;
		import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_CONTRACTED;
		import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_HEADSUP;

		import android.annotation.IntDef;
		@@ -35,8 +36,8 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.systemui.statusbar.InflationTask;
		import com.android.systemui.statusbar.notification.InflationException;
		import com.android.systemui.statusbar.notification.MediaNotificationProcessor;
		import com.android.systemui.statusbar.notification.row.wrapper.NotificationViewWrapper;
		import com.android.systemui.statusbar.notification.NotificationData;
		import com.android.systemui.statusbar.notification.row.wrapper.NotificationViewWrapper;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.util.Assert;

		@@ -111,7 +112,6 @@ public class NotificationInflater {
		private static final int REQUIRED_INFLATION_FLAGS =
		FLAG_CONTENT_VIEW_CONTRACTED
		\| FLAG_CONTENT_VIEW_EXPANDED
		\| FLAG_CONTENT_VIEW_PUBLIC
		\| FLAG_CONTENT_VIEW_HEADS_UP
		\| FLAG_CONTENT_VIEW_AMBIENT;

		@@ -173,14 +173,23 @@ public class NotificationInflater {
		mRemoteViewClickHandler = remoteViewClickHandler;
		}

		public void setRedactAmbient(boolean redactAmbient) {
		if (mRedactAmbient != redactAmbient) {
		mRedactAmbient = redactAmbient;
		/**
		* Update whether or not the notification is redacted on the lock screen. If the notification
		* is now redacted, we should inflate the public contracted view and public ambient view to
		* now show on the lock screen.
		*
		* @param needsRedaction true if the notification should now be redacted on the lock screen
		*/
		public void updateNeedsRedaction(boolean needsRedaction) {
		mRedactAmbient = needsRedaction;
		if (mRow.getEntry() == null) {
		return;
		}
		inflateNotificationViews(FLAG_CONTENT_VIEW_AMBIENT);
		int flags = FLAG_CONTENT_VIEW_AMBIENT;
		if (needsRedaction) {
		flags \|= FLAG_CONTENT_VIEW_PUBLIC;
		}
		inflateNotificationViews(flags);
		}

		/**
		@@ -209,6 +218,17 @@ public class NotificationInflater {
		mInflationFlags \|= flags;
		}

		/**
		* Whether or not the view corresponding to the flag is set to be inflated currently.
		*
		* @param flag the {@link InflationFlag} corresponding to the view
		* @return true if the flag is set and view will be inflated, false o/w
		*/
		@VisibleForTesting
		public boolean isInflationFlagSet(@InflationFlag int flag) {
		return ((mInflationFlags & flag) != 0);
		}

		/**
		* Inflate all views of this notification on a background thread. This is asynchronous and will
		* notify the callback once it's finished.
		@@ -234,7 +254,7 @@ public class NotificationInflater {
		return;
		}
		// Only inflate the ones that are set.
		reInflateFlags \|= mInflationFlags;
		reInflateFlags &= mInflationFlags;
		StatusBarNotification sbn = mRow.getEntry().notification;
		AsyncInflationTask task = new AsyncInflationTask(sbn, reInflateFlags, mCachedContentViews,
		mRow, mIsLowPriority, mIsChildInGroup, mUsesIncreasedHeight,
		@@ -291,9 +311,14 @@ public class NotificationInflater {
		mCachedContentViews.remove(FLAG_CONTENT_VIEW_AMBIENT);
		}
		break;
		case FLAG_CONTENT_VIEW_PUBLIC:
		if (mRow.getPublicLayout().isContentViewInactive(VISIBLE_TYPE_CONTRACTED)) {
		mRow.getPublicLayout().setContractedChild(null);
		mCachedContentViews.remove(FLAG_CONTENT_VIEW_PUBLIC);
		}
		break;
		case FLAG_CONTENT_VIEW_CONTRACTED:
		case FLAG_CONTENT_VIEW_EXPANDED:
		case FLAG_CONTENT_VIEW_PUBLIC:
		default:
		break;
		}

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

+23 −3

Original line number	Diff line number	Diff line
		@@ -20,10 +20,10 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT;

		import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_ALL;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_HEADS_UP;
		import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_PUBLIC;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertNotNull;
		import static org.junit.Assert.assertNull;
		import static org.junit.Assert.assertTrue;
		import static org.mockito.ArgumentMatchers.any;
		@@ -40,7 +40,6 @@ import android.app.AppOpsManager;
		import android.app.NotificationChannel;
		import android.support.test.filters.SmallTest;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;
		import android.testing.TestableLooper.RunWithLooper;
		import android.util.ArraySet;
		import android.view.NotificationHeaderView;
		@@ -127,7 +126,8 @@ public class ExpandableNotificationRowTest extends SysuiTestCase {

		@Test
		public void testIconColorShouldBeUpdatedWhenSensitive() throws Exception {
		ExpandableNotificationRow row = spy(mNotificationTestHelper.createRow());
		ExpandableNotificationRow row = spy(mNotificationTestHelper.createRow(
		FLAG_CONTENT_VIEW_ALL));
		row.setSensitive(true, true);
		row.setHideSensitive(true, false, 0, 0);
		verify(row).updateShelfIconColor();
		@@ -152,6 +152,26 @@ public class ExpandableNotificationRowTest extends SysuiTestCase {
		assertNull(row.getPrivateLayout().getHeadsUpChild());
		}

		@Test
		public void setNeedsRedactionSetsInflationFlag() throws Exception {
		ExpandableNotificationRow row = mNotificationTestHelper.createRow();

		row.setNeedsRedaction(true);

		assertTrue(row.getNotificationInflater().isInflationFlagSet(FLAG_CONTENT_VIEW_PUBLIC));
		}

		@Test
		public void setNeedsRedactionFreesViewWhenFalse() throws Exception {
		ExpandableNotificationRow row = mNotificationTestHelper.createRow(FLAG_CONTENT_VIEW_ALL);
		row.setNeedsRedaction(true);
		row.getPublicLayout().setVisibility(View.GONE);

		row.setNeedsRedaction(false);

		assertNull(row.getPublicLayout().getContractedChild());
		}

		@Test
		public void testAboveShelfChangedListenerCalled() throws Exception {
		ExpandableNotificationRow row = mNotificationTestHelper.createRow();