From c168f984875ff096720e0a2b092f14c601b5102f Mon Sep 17 00:00:00 2001 From: Joshua Trask Date: Wed, 5 Oct 2022 12:59:07 -0400 Subject: Switch off sharing framework's "widgets" This forks the ResolverDrawerLayout, which appears to be custom and specific to our app. Any other dependencies from the framework package com.android.internal.widget were old copies of androidx libraries, and the "unbundled" IntentResolver is able to take dependencies on the real versions instead. No dependencies into that framework package remain after this CL. These changes were excluded from ag/20001357 (as described in go/chooser-fork-cl) in order to isolate any possible regressions (and also to split up the review burden for the original fork CL). There are no behavior changes *expected* from this CL, but any edge-case discrepancies are hopefully improvements due to bugfixes or other refinements that were put into the androidx libraries after the framework copy was cut. The APIs themselves are supposed to be drop-in compatible. Test: atest IntentResolverUnitTests Bug: 248566504 Change-Id: I8e02fd580d395446066fc2bb239a9bef833ef059 --- .../src/com/android/intentresolver/UnbundledChooserActivityTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/tests') diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java index 7a590584..9ac815f6 100644 --- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java +++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java @@ -86,6 +86,8 @@ import android.view.View; import androidx.annotation.CallSuper; import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import androidx.test.espresso.matcher.BoundedDiagnosingMatcher; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.rule.ActivityTestRule; @@ -96,8 +98,6 @@ import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.FrameworkStatsLog; -import com.android.internal.widget.GridLayoutManager; -import com.android.internal.widget.RecyclerView; import org.hamcrest.Description; import org.hamcrest.Matcher; -- cgit v1.2.3-59-g8ed1b