Merge changes from topics "TransientRowLogs-udc-qpr-dev",... (fba46092) · Commits · e / os / android_frameworks_base

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

+121 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import android.view.MotionEvent;
		import android.view.NotificationHeaderView;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.ViewParent;
		import android.view.ViewStub;
		import android.view.accessibility.AccessibilityEvent;
		import android.view.accessibility.AccessibilityNodeInfo;
		@@ -103,6 +104,8 @@ 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.NotificationChildrenContainerLogger;
		import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;
		import com.android.systemui.statusbar.notification.stack.SwipeableView;
		import com.android.systemui.statusbar.phone.KeyguardBypassController;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		@@ -170,6 +173,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		private PeopleNotificationIdentifier mPeopleNotificationIdentifier;
		private Optional<BubblesManager> mBubblesManagerOptional;
		private MetricsLogger mMetricsLogger;
		private NotificationChildrenContainerLogger mChildrenContainerLogger;
		private NotificationDismissibilityProvider mDismissibilityProvider;
		private FeatureFlags mFeatureFlags;
		private int mIconTransformContentShift;
		@@ -1627,6 +1631,51 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		NotificationEntry child,
		NotificationEntry newParent
		);

		/**
		* Called when an ExpandableNotificationRow transient view is removed from the
		* NotificationChildrenContainer
		*/
		void logRemoveTransientFromContainer(
		NotificationEntry childEntry,
		NotificationEntry containerEntry
		);

		/**
		* Called when an ExpandableNotificationRow transient view is removed from the
		* NotificationStackScrollLayout
		*/
		void logRemoveTransientFromNssl(
		NotificationEntry childEntry
		);

		/**
		* Called when an ExpandableNotificationRow transient view is removed from a ViewGroup that
		* is not NotificationChildrenContainer or NotificationStackScrollLayout
		*/
		void logRemoveTransientFromViewGroup(
		NotificationEntry childEntry,
		ViewGroup containerView
		);

		/**
		* Called when an ExpandableNotificationRow transient view is added to this
		* ExpandableNotificationRow
		*/
		void logAddTransientRow(
		NotificationEntry childEntry,
		NotificationEntry containerEntry,
		int index
		);

		/**
		* Called when an ExpandableNotificationRow transient view is removed from this
		* ExpandableNotificationRow
		*/
		void logRemoveTransientRow(
		NotificationEntry childEntry,
		NotificationEntry containerEntry
		);
		}

		/**
		@@ -1668,6 +1717,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		NotificationGutsManager gutsManager,
		NotificationDismissibilityProvider dismissibilityProvider,
		MetricsLogger metricsLogger,
		NotificationChildrenContainerLogger childrenContainerLogger,
		SmartReplyConstants smartReplyConstants,
		SmartReplyController smartReplyController,
		FeatureFlags featureFlags,
		@@ -1706,6 +1756,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		mBubblesManagerOptional = bubblesManagerOptional;
		mNotificationGutsManager = gutsManager;
		mMetricsLogger = metricsLogger;
		mChildrenContainerLogger = childrenContainerLogger;
		mDismissibilityProvider = dismissibilityProvider;
		mFeatureFlags = featureFlags;
		}
		@@ -1874,6 +1925,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		mChildrenContainer.setIsLowPriority(mIsLowPriority);
		mChildrenContainer.setContainingNotification(ExpandableNotificationRow.this);
		mChildrenContainer.onNotificationUpdated();
		mChildrenContainer.setLogger(mChildrenContainerLogger);

		mTranslateableViews.add(mChildrenContainer);
		});
		@@ -3714,4 +3766,73 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		public boolean getShowSnooze() {
		return mShowSnooze;
		}

		@Override
		public void removeFromTransientContainer() {
		final ViewGroup transientContainer = getTransientContainer();
		final ViewParent parent = getParent();
		// Only log when there is real removal of transient views
		if (transientContainer == null \|\| transientContainer != parent) {
		super.removeFromTransientContainer();
		return;
		}
		logRemoveFromTransientContainer(transientContainer);
		super.removeFromTransientContainer();
		}

		/**
		* Log calls to removeFromTransientContainer when the container is NotificationChildrenContainer
		* or NotificationStackScrollLayout.
		*/
		public void logRemoveFromTransientContainer(ViewGroup transientContainer) {
		if (mLogger == null) {
		return;
		}
		if (transientContainer instanceof NotificationChildrenContainer) {
		mLogger.logRemoveTransientFromContainer(
		/* childEntry = */ getEntry(),
		/* containerEntry = */ ((NotificationChildrenContainer) transientContainer)
		.getContainingNotification().getEntry()
		);
		} else if (transientContainer instanceof NotificationStackScrollLayout) {
		mLogger.logRemoveTransientFromNssl(
		/* childEntry = */ getEntry()
		);
		} else {
		mLogger.logRemoveTransientFromViewGroup(
		/* childEntry = */ getEntry(),
		/* containerView = */ transientContainer
		);
		}
		}

		@Override
		public void addTransientView(View view, int index) {
		if (view instanceof ExpandableNotificationRow) {
		logAddTransientRow((ExpandableNotificationRow) view, index);
		}
		super.addTransientView(view, index);
		}

		private void logAddTransientRow(ExpandableNotificationRow row, int index) {
		if (mLogger == null) {
		return;
		}
		mLogger.logAddTransientRow(row.getEntry(), getEntry(), index);
		}

		@Override
		public void removeTransientView(View view) {
		if (view instanceof ExpandableNotificationRow) {
		logRemoveTransientRow((ExpandableNotificationRow) view);
		}
		super.removeTransientView(view);
		}

		private void logRemoveTransientRow(ExpandableNotificationRow row) {
		if (mLogger == null) {
		return;
		}
		mLogger.logRemoveTransientRow(row.getEntry(), getEntry());
		}
		}

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

+45 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ import com.android.systemui.statusbar.notification.people.PeopleNotificationIden
		import com.android.systemui.statusbar.notification.row.dagger.AppName;
		import com.android.systemui.statusbar.notification.row.dagger.NotificationKey;
		import com.android.systemui.statusbar.notification.row.dagger.NotificationRowScope;
		import com.android.systemui.statusbar.notification.stack.NotificationChildrenContainerLogger;
		import com.android.systemui.statusbar.notification.stack.NotificationListContainer;
		import com.android.systemui.statusbar.phone.KeyguardBypassController;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		@@ -88,6 +89,7 @@ public class ExpandableNotificationRowController implements NotifViewController
		private final ExpandableNotificationRow.OnExpandClickListener mOnExpandClickListener;
		private final StatusBarStateController mStatusBarStateController;
		private final MetricsLogger mMetricsLogger;
		private final NotificationChildrenContainerLogger mChildrenContainerLogger;
		private final ExpandableNotificationRow.CoordinateOnClickListener mOnFeedbackClickListener;
		private final NotificationGutsManager mNotificationGutsManager;
		private final OnUserInteractionCallback mOnUserInteractionCallback;
		@@ -125,6 +127,46 @@ public class ExpandableNotificationRowController implements NotifViewController
		) {
		mLogBufferLogger.logSkipAttachingKeepInParentChild(child, newParent);
		}

		@Override
		public void logRemoveTransientFromContainer(
		NotificationEntry childEntry,
		NotificationEntry containerEntry
		) {
		mLogBufferLogger.logRemoveTransientFromContainer(childEntry, containerEntry);
		}

		@Override
		public void logRemoveTransientFromNssl(
		NotificationEntry childEntry
		) {
		mLogBufferLogger.logRemoveTransientFromNssl(childEntry);
		}

		@Override
		public void logRemoveTransientFromViewGroup(
		NotificationEntry childEntry,
		ViewGroup containerView
		) {
		mLogBufferLogger.logRemoveTransientFromViewGroup(childEntry, containerView);
		}

		@Override
		public void logAddTransientRow(
		NotificationEntry childEntry,
		NotificationEntry containerEntry,
		int index
		) {
		mLogBufferLogger.logAddTransientRow(childEntry, containerEntry, index);
		}

		@Override
		public void logRemoveTransientRow(
		NotificationEntry childEntry,
		NotificationEntry containerEntry
		) {
		mLogBufferLogger.logRemoveTransientRow(childEntry, containerEntry);
		}
		};


		@@ -135,6 +177,7 @@ public class ExpandableNotificationRowController implements NotifViewController
		RemoteInputViewSubcomponent.Factory rivSubcomponentFactory,
		MetricsLogger metricsLogger,
		NotificationRowLogger logBufferLogger,
		NotificationChildrenContainerLogger childrenContainerLogger,
		NotificationListContainer listContainer,
		SmartReplyConstants smartReplyConstants,
		SmartReplyController smartReplyController,
		@@ -188,6 +231,7 @@ public class ExpandableNotificationRowController implements NotifViewController
		mBubblesManagerOptional = bubblesManagerOptional;
		mDragController = dragController;
		mMetricsLogger = metricsLogger;
		mChildrenContainerLogger = childrenContainerLogger;
		mLogBufferLogger = logBufferLogger;
		mSmartReplyConstants = smartReplyConstants;
		mSmartReplyController = smartReplyController;
		@@ -222,6 +266,7 @@ public class ExpandableNotificationRowController implements NotifViewController
		mNotificationGutsManager,
		mDismissibilityProvider,
		mMetricsLogger,
		mChildrenContainerLogger,
		mSmartReplyConstants,
		mSmartReplyController,
		mFeatureFlags,

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowLogger.kt

+81 −1

Original line number	Diff line number	Diff line
		@@ -17,14 +17,21 @@

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

		import android.view.ViewGroup
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.LogLevel
		import com.android.systemui.log.dagger.NotificationLog
		import com.android.systemui.log.dagger.NotificationRenderLog
		import com.android.systemui.statusbar.notification.collection.NotificationEntry
		import com.android.systemui.statusbar.notification.logKey
		import javax.inject.Inject

		class NotificationRowLogger @Inject constructor(@NotificationLog private val buffer: LogBuffer) {
		class NotificationRowLogger
		@Inject
		constructor(
		@NotificationLog private val buffer: LogBuffer,
		@NotificationRenderLog private val notificationRenderBuffer: LogBuffer
		) {
		fun logKeepInParentChildDetached(child: NotificationEntry, oldParent: NotificationEntry?) {
		buffer.log(
		TAG,
		@@ -48,6 +55,79 @@ class NotificationRowLogger @Inject constructor(@NotificationLog private val buf
		{ "Skipping to attach $str1 to $str2, because it still flagged to keep in parent" }
		)
		}

		fun logRemoveTransientFromContainer(
		childEntry: NotificationEntry,
		containerEntry: NotificationEntry
		) {
		notificationRenderBuffer.log(
		TAG,
		LogLevel.INFO,
		{
		str1 = childEntry.logKey
		str2 = containerEntry.logKey
		},
		{ "RemoveTransientRow from ChildrenContainer: childKey: $str1 -- containerKey: $str2" }
		)
		}

		fun logRemoveTransientFromNssl(
		childEntry: NotificationEntry,
		) {
		notificationRenderBuffer.log(
		TAG,
		LogLevel.INFO,
		{ str1 = childEntry.logKey },
		{ "RemoveTransientRow from Nssl: childKey: $str1" }
		)
		}

		fun logRemoveTransientFromViewGroup(
		childEntry: NotificationEntry,
		containerView: ViewGroup,
		) {
		notificationRenderBuffer.log(
		TAG,
		LogLevel.WARNING,
		{
		str1 = childEntry.logKey
		str2 = containerView.toString()
		},
		{ "RemoveTransientRow from other ViewGroup: childKey: $str1 -- ViewGroup: $str2" }
		)
		}

		fun logAddTransientRow(
		childEntry: NotificationEntry,
		containerEntry: NotificationEntry,
		index: Int
		) {
		notificationRenderBuffer.log(
		TAG,
		LogLevel.ERROR,
		{
		str1 = childEntry.logKey
		str2 = containerEntry.logKey
		int1 = index
		},
		{ "addTransientRow to row: childKey: $str1 -- containerKey: $str2 -- index: $int1" }
		)
		}

		fun logRemoveTransientRow(
		childEntry: NotificationEntry,
		containerEntry: NotificationEntry,
		) {
		notificationRenderBuffer.log(
		TAG,
		LogLevel.ERROR,
		{
		str1 = childEntry.logKey
		str2 = containerEntry.logKey
		},
		{ "removeTransientRow from row: childKey: $str1 -- containerKey: $str2" }
		)
		}
		}

		private const val TAG = "NotifRow"

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

+29 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,8 @@ public class NotificationChildrenContainer extends ViewGroup
		private boolean mContainingNotificationIsFaded = false;
		private RoundableState mRoundableState;

		private NotificationChildrenContainerLogger mLogger;

		public NotificationChildrenContainer(Context context) {
		this(context, null);
		}
		@@ -1507,6 +1509,33 @@ public class NotificationChildrenContainer extends ViewGroup
		return mNotificationHeaderWrapper;
		}

		public void setLogger(NotificationChildrenContainerLogger logger) {
		mLogger = logger;
		}

		@Override
		public void addTransientView(View view, int index) {
		if (mLogger != null && view instanceof ExpandableNotificationRow) {
		mLogger.addTransientRow(
		((ExpandableNotificationRow) view).getEntry(),
		getContainingNotification().getEntry(),
		index
		);
		}
		super.addTransientView(view, index);
		}

		@Override
		public void removeTransientView(View view) {
		if (mLogger != null && view instanceof ExpandableNotificationRow) {
		mLogger.removeTransientRow(
		((ExpandableNotificationRow) view).getEntry(),
		getContainingNotification().getEntry()
		);
		}
		super.removeTransientView(view);
		}

		public String debugString() {
		return TAG + " { "
		+ "visibility: " + getVisibility()

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainerLogger.kt

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.statusbar.notification.stack

		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.LogLevel
		import com.android.systemui.log.dagger.NotificationRenderLog
		import com.android.systemui.statusbar.notification.collection.NotificationEntry
		import com.android.systemui.statusbar.notification.logKey
		import javax.inject.Inject

		class NotificationChildrenContainerLogger
		@Inject
		constructor(@NotificationRenderLog private val notificationRenderBuffer: LogBuffer) {
		fun addTransientRow(
		childEntry: NotificationEntry,
		containerEntry: NotificationEntry,
		index: Int
		) {
		notificationRenderBuffer.log(
		TAG,
		LogLevel.INFO,
		{
		str1 = childEntry.logKey
		str2 = containerEntry.logKey
		int1 = index
		},
		{ "addTransientRow: childKey: $str1 -- containerKey: $str2 -- index: $int1" }
		)
		}

		fun removeTransientRow(
		childEntry: NotificationEntry,
		containerEntry: NotificationEntry,
		) {
		notificationRenderBuffer.log(
		TAG,
		LogLevel.INFO,
		{
		str1 = childEntry.logKey
		str2 = containerEntry.logKey
		},
		{ "removeTransientRow: childKey: $str1 -- containerKey: $str2" }
		)
		}

		companion object {
		private const val TAG = "NotifChildrenContainer"
		}
		}