Merge "ResolverDrawerLayout: unify mCollapsibleHeight calculation." into tm-qpr-dev am: c317e6a26b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/20582588

Change-Id: Ib3133b98fd1e8fa23b30ddcea19537dcbafe6532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 16 insertions, 18 deletions

diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java
index 5a65ec1e..f1febed2 100644
--- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java
+++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java
@@ -27,6 +27,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.isSelected;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
+import static com.android.intentresolver.ChooserWrapperActivity.sOverrides;
 import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.ExpectedBlocker.NO_BLOCKER;
 import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.ExpectedBlocker.PERSONAL_PROFILE_ACCESS_BLOCKER;
 import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.ExpectedBlocker.PERSONAL_PROFILE_SHARE_BLOCKER;
@@ -34,7 +35,6 @@ import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest
 import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.ExpectedBlocker.WORK_PROFILE_SHARE_BLOCKER;
 import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.Tab.PERSONAL;
 import static com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.Tab.WORK;
-import static com.android.intentresolver.ChooserWrapperActivity.sOverrides;
 
 import static org.hamcrest.CoreMatchers.not;
 import static org.mockito.ArgumentMatchers.eq;
@@ -48,9 +48,9 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.rule.ActivityTestRule;
 
-import com.android.internal.R;
 import com.android.intentresolver.ResolverActivity.ResolvedComponentInfo;
 import com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.Tab;
+import com.android.internal.R;
 
 import junit.framework.AssertionFailedError;
 
@@ -134,14 +134,13 @@ public class UnbundledChooserActivityWorkProfileTest {
                         /* tab= */ WORK,
                         /* expectedBlocker= */ NO_BLOCKER
                 ),
-//                TODO(b/256869196) ChooserActivity goes into requestLayout loop
-//                new TestCase(
-//                        /* isSendAction= */ true,
-//                        /* hasCrossProfileIntents= */ false,
-//                        /* myUserHandle= */ WORK_USER_HANDLE,
-//                        /* tab= */ WORK,
-//                        /* expectedBlocker= */ NO_BLOCKER
-//                ),
+                new TestCase(
+                        /* isSendAction= */ true,
+                        /* hasCrossProfileIntents= */ false,
+                        /* myUserHandle= */ WORK_USER_HANDLE,
+                        /* tab= */ WORK,
+                        /* expectedBlocker= */ NO_BLOCKER
+                ),
                 new TestCase(
                         /* isSendAction= */ true,
                         /* hasCrossProfileIntents= */ true,
@@ -163,14 +162,13 @@ public class UnbundledChooserActivityWorkProfileTest {
                         /* tab= */ PERSONAL,
                         /* expectedBlocker= */ NO_BLOCKER
                 ),
-//                TODO(b/256869196) ChooserActivity goes into requestLayout loop
-//                new TestCase(
-//                        /* isSendAction= */ true,
-//                        /* hasCrossProfileIntents= */ false,
-//                        /* myUserHandle= */ WORK_USER_HANDLE,
-//                        /* tab= */ PERSONAL,
-//                        /* expectedBlocker= */ PERSONAL_PROFILE_SHARE_BLOCKER
-//                ),
+                new TestCase(
+                        /* isSendAction= */ true,
+                        /* hasCrossProfileIntents= */ false,
+                        /* myUserHandle= */ WORK_USER_HANDLE,
+                        /* tab= */ PERSONAL,
+                        /* expectedBlocker= */ PERSONAL_PROFILE_SHARE_BLOCKER
+                ),
                 new TestCase(
                         /* isSendAction= */ true,
                         /* hasCrossProfileIntents= */ true,