| commit | 7ec4b80575509dda26a6d7a61b9a8899c32cfde5 | [log] [tgz] |
|---|---|---|
| author | Ibrahim Yilmaz <iyz@google.com> | Wed Jul 10 11:40:09 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 10 11:40:09 2024 +0000 |
| tree | dec99a7c16a39af7cf264e212bb361c11bf82ca1 | |
| parent | 5760c01814cd541a12a70dc608431ab8ca1c7b21 [diff] | |
| parent | 424df66031d9e2bb6a41388e9ca447327bbf3c19 [diff] |
Merge "[Inline Reply] Not mark hasUserExpanded true for pinned notifs" into main
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index 9e943ee..582d847 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -371,12 +371,6 @@ setUserExpanded(nowExpanded); } - if (ExpandHeadsUpOnInlineReply.isEnabled() && mExpandable) { - // it is triggered by the user. - // So, mHasUserChangedExpansion should be marked true. - mHasUserChangedExpansion = true; - } - notifyHeightChanged(/* needsAnimation= */ true); mOnExpandClickListener.onExpandClicked(mEntry, v, nowExpanded); if (shouldLogExpandClickMetric) {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java index e8349b0..ed7383c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java
@@ -1003,21 +1003,6 @@ // THEN assertThat(row.isExpanded()).isFalse(); } - - @Test - @EnableFlags(ExpandHeadsUpOnInlineReply.FLAG_NAME) - public void hasUserChangedExpansion_expandPinned_returnTrue() throws Exception { - // GIVEN - final ExpandableNotificationRow row = mNotificationTestHelper.createRow(); - row.setPinned(true); - - // WHEN - row.expandNotification(); - - // THEN - assertThat(row.hasUserChangedExpansion()).isTrue(); - } - @Test public void onDisappearAnimationFinished_shouldSetFalse_headsUpAnimatingAway() throws Exception {