Merge "Ensured that the gut's bounds update properly" into rvc-dev am: 47716cba4b (bf077b21) · Commits · e / os / android_frameworks_base

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -117,6 +117,7 @@ public class NotificationConversationInfo extends LinearLayout implements

		@VisibleForTesting
		boolean mSkipPost = false;
		private int mActualHeight;

		@Retention(SOURCE)
		@IntDef({ACTION_DEFAULT, ACTION_HOME, ACTION_FAVORITE, ACTION_SNOOZE, ACTION_MUTE,
		@@ -582,7 +583,15 @@ public class NotificationConversationInfo extends LinearLayout implements

		@Override
		public int getActualHeight() {
		return getHeight();
		// Because we're animating the bounds, getHeight will return the small height at the
		// beginning of the animation. Instead we'd want it to already return the end value
		return mActualHeight;
		}

		@Override
		protected void onLayout(boolean changed, int l, int t, int r, int b) {
		super.onLayout(changed, l, t, r, b);
		mActualHeight = getHeight();
		}

		@VisibleForTesting

+10 −1

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ import java.util.Set;
		*/
		public class NotificationInfo extends LinearLayout implements NotificationGuts.GutsContent {
		private static final String TAG = "InfoGuts";
		private int mActualHeight;

		@IntDef(prefix = { "ACTION_" }, value = {
		ACTION_NONE,
		@@ -583,7 +584,15 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G

		@Override
		public int getActualHeight() {
		return getHeight();
		// Because we're animating the bounds, getHeight will return the small height at the
		// beginning of the animation. Instead we'd want it to already return the end value
		return mActualHeight;
		}

		@Override
		protected void onLayout(boolean changed, int l, int t, int r, int b) {
		super.onLayout(changed, l, t, r, b);
		mActualHeight = getHeight();
		}

		@VisibleForTesting