From 4e32c3eedd19c6725b860934bb89304f81cde158 Mon Sep 17 00:00:00 2001 From: Joshua Trask Date: Wed, 22 Feb 2023 23:47:28 +0000 Subject: Extract ResolvedComponentInfo to top-level. This was previously an inner class of `ResolverActivity` but that seems inappropriate since it's a common component used throughout our code base (including "Chooser" configurations). Test: `atest IntentResolverUnitTests` Bug: 202167050 Change-Id: I9b001d02c87faa376032682796ccb2bc9c902401 --- .../intentresolver/ResolverActivityTest.java | 1 - .../intentresolver/ResolverDataProvider.java | 29 +++++++++++++--------- .../UnbundledChooserActivityTest.java | 1 - .../UnbundledChooserActivityWorkProfileTest.java | 1 - .../model/AbstractResolverComparatorTest.java | 12 ++++----- 5 files changed, 23 insertions(+), 21 deletions(-) (limited to 'java/tests') diff --git a/java/tests/src/com/android/intentresolver/ResolverActivityTest.java b/java/tests/src/com/android/intentresolver/ResolverActivityTest.java index 7950b16b..ae1b99f8 100644 --- a/java/tests/src/com/android/intentresolver/ResolverActivityTest.java +++ b/java/tests/src/com/android/intentresolver/ResolverActivityTest.java @@ -54,7 +54,6 @@ import androidx.test.espresso.NoMatchingViewException; import androidx.test.rule.ActivityTestRule; import androidx.test.runner.AndroidJUnit4; -import com.android.intentresolver.ResolverActivity.ResolvedComponentInfo; import com.android.intentresolver.widget.ResolverDrawerLayout; import com.android.internal.R; diff --git a/java/tests/src/com/android/intentresolver/ResolverDataProvider.java b/java/tests/src/com/android/intentresolver/ResolverDataProvider.java index 6807bfd6..b6b32b5a 100644 --- a/java/tests/src/com/android/intentresolver/ResolverDataProvider.java +++ b/java/tests/src/com/android/intentresolver/ResolverDataProvider.java @@ -36,28 +36,33 @@ public class ResolverDataProvider { static private int USER_SOMEONE_ELSE = 10; - static ResolverActivity.ResolvedComponentInfo createResolvedComponentInfo(int i) { - return new ResolverActivity.ResolvedComponentInfo(createComponentName(i), - createResolverIntent(i), createResolveInfo(i, UserHandle.USER_CURRENT)); + static ResolvedComponentInfo createResolvedComponentInfo(int i) { + return new ResolvedComponentInfo( + createComponentName(i), + createResolverIntent(i), + createResolveInfo(i, UserHandle.USER_CURRENT)); } - static ResolverActivity.ResolvedComponentInfo createResolvedComponentInfo( + static ResolvedComponentInfo createResolvedComponentInfo( ComponentName componentName, Intent intent) { - return new ResolverActivity.ResolvedComponentInfo( + return new ResolvedComponentInfo( componentName, intent, createResolveInfo(componentName, UserHandle.USER_CURRENT)); } - static ResolverActivity.ResolvedComponentInfo createResolvedComponentInfoWithOtherId(int i) { - return new ResolverActivity.ResolvedComponentInfo(createComponentName(i), - createResolverIntent(i), createResolveInfo(i, USER_SOMEONE_ELSE)); + static ResolvedComponentInfo createResolvedComponentInfoWithOtherId(int i) { + return new ResolvedComponentInfo( + createComponentName(i), + createResolverIntent(i), + createResolveInfo(i, USER_SOMEONE_ELSE)); } - static ResolverActivity.ResolvedComponentInfo createResolvedComponentInfoWithOtherId(int i, - int userId) { - return new ResolverActivity.ResolvedComponentInfo(createComponentName(i), - createResolverIntent(i), createResolveInfo(i, userId)); + static ResolvedComponentInfo createResolvedComponentInfoWithOtherId(int i, int userId) { + return new ResolvedComponentInfo( + createComponentName(i), + createResolverIntent(i), + createResolveInfo(i, userId)); } public static ComponentName createComponentName(int i) { diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java index b0c0f360..9ffd02d4 100644 --- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java +++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java @@ -101,7 +101,6 @@ import androidx.test.espresso.matcher.BoundedDiagnosingMatcher; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.rule.ActivityTestRule; -import com.android.intentresolver.ResolverActivity.ResolvedComponentInfo; import com.android.intentresolver.chooser.DisplayResolveInfo; import com.android.intentresolver.flags.Flags; import com.android.intentresolver.shortcuts.ShortcutLoader; diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java index 904f1148..87dc1b9d 100644 --- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java +++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java @@ -48,7 +48,6 @@ import androidx.test.InstrumentationRegistry; import androidx.test.espresso.NoMatchingViewException; import androidx.test.rule.ActivityTestRule; -import com.android.intentresolver.ResolverActivity.ResolvedComponentInfo; import com.android.intentresolver.UnbundledChooserActivityWorkProfileTest.TestCase.Tab; import com.android.internal.R; diff --git a/java/tests/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java b/java/tests/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java index 448718cd..006f3b2d 100644 --- a/java/tests/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java +++ b/java/tests/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java @@ -27,7 +27,7 @@ import android.os.Message; import androidx.test.InstrumentationRegistry; -import com.android.intentresolver.ResolverActivity; +import com.android.intentresolver.ResolvedComponentInfo; import org.junit.Test; @@ -37,12 +37,12 @@ public class AbstractResolverComparatorTest { @Test public void testPinned() { - ResolverActivity.ResolvedComponentInfo r1 = new ResolverActivity.ResolvedComponentInfo( + ResolvedComponentInfo r1 = new ResolvedComponentInfo( new ComponentName("package", "class"), new Intent(), new ResolveInfo() ); r1.setPinned(true); - ResolverActivity.ResolvedComponentInfo r2 = new ResolverActivity.ResolvedComponentInfo( + ResolvedComponentInfo r2 = new ResolvedComponentInfo( new ComponentName("zackage", "zlass"), new Intent(), new ResolveInfo() ); @@ -60,14 +60,14 @@ public class AbstractResolverComparatorTest { pmInfo1.activityInfo = new ActivityInfo(); pmInfo1.activityInfo.packageName = "aaa"; - ResolverActivity.ResolvedComponentInfo r1 = new ResolverActivity.ResolvedComponentInfo( + ResolvedComponentInfo r1 = new ResolvedComponentInfo( new ComponentName("package", "class"), new Intent(), pmInfo1); r1.setPinned(true); ResolveInfo pmInfo2 = new ResolveInfo(); pmInfo2.activityInfo = new ActivityInfo(); pmInfo2.activityInfo.packageName = "zzz"; - ResolverActivity.ResolvedComponentInfo r2 = new ResolverActivity.ResolvedComponentInfo( + ResolvedComponentInfo r2 = new ResolvedComponentInfo( new ComponentName("zackage", "zlass"), new Intent(), pmInfo2); r2.setPinned(true); @@ -91,7 +91,7 @@ public class AbstractResolverComparatorTest { } @Override - void doCompute(List targets) {} + void doCompute(List targets) {} @Override public float getScore(ComponentName name) { -- cgit v1.2.3-59-g8ed1b