Merge "Add CUJ_NOTIFICATION_SHADE_ROW_EXPAND CUJ" (3e6e8030) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/ExpandHelper.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@

		package com.android.systemui;

		import static com.android.internal.jank.InteractionJankMonitor.CUJ_NOTIFICATION_SHADE_ROW_EXPAND;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ObjectAnimator;
		@@ -32,6 +34,7 @@ import android.view.View;
		import android.view.ViewConfiguration;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.jank.InteractionJankMonitor;
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
		import com.android.systemui.statusbar.notification.row.ExpandableView;
		import com.android.systemui.statusbar.policy.ScrollAdapter;
		@@ -544,6 +547,7 @@ public class ExpandHelper implements Gefingerpoken {
		}
		if (DEBUG) Log.d(TAG, "got mOldHeight: " + mOldHeight +
		" mNaturalHeight: " + mNaturalHeight);
		InteractionJankMonitor.getInstance().begin(v, CUJ_NOTIFICATION_SHADE_ROW_EXPAND);
		return true;
		}

		@@ -608,6 +612,9 @@ public class ExpandHelper implements Gefingerpoken {
		}
		mCallback.setUserLockedChild(scaledView, false);
		mScaleAnimation.removeListener(this);
		if (wasClosed) {
		InteractionJankMonitor.getInstance().end(CUJ_NOTIFICATION_SHADE_ROW_EXPAND);
		}
		}

		@Override
		@@ -625,6 +632,9 @@ public class ExpandHelper implements Gefingerpoken {
		mCallback.setUserExpandedChild(mResizedView, nowExpanded);
		mCallback.setUserLockedChild(mResizedView, false);
		mScaler.setView(null);
		if (wasClosed) {
		InteractionJankMonitor.getInstance().end(CUJ_NOTIFICATION_SHADE_ROW_EXPAND);
		}
		}

		mExpanding = false;