From 0d1e2f46a5dde64df8506691afe89efda697a60c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 26 Oct 2023 14:57:57 +0000 Subject: Revert "Build DocumentsUI sources once" Revert submission 25032702-DocumentsUI-lib Reason for revert: broke document browsing Reverted changes: /q/submissionid:25032702-DocumentsUI-lib Bug: 307873144 Bug: 307882692 Change-Id: I5042f5f430f515cfe648156f21f7570e43aabbe6 --- Android.bp | 62 ++++++++++++-- AndroidManifestForUnitTests.xml | 39 +++++++++ AndroidManifestLib.xml | 39 --------- perf-tests/Android.bp | 2 +- .../android/documentsui/ActionModeController.java | 3 +- .../android/documentsui/NavigationViewManager.java | 3 +- .../android/documentsui/inspector/KeyValueRow.java | 8 +- .../documentsui/queries/SearchViewManager.java | 4 +- tests/Android.bp | 97 +++++++++------------- tests/AndroidManifestUnitTests.xml | 5 -- .../com/android/documentsui/bots/SearchBot.java | 5 +- .../documentsui/FilesActivityDefaultsUiTest.java | 1 + .../com/android/documentsui/SearchViewUiTest.java | 1 + 13 files changed, 143 insertions(+), 126 deletions(-) create mode 100644 AndroidManifestForUnitTests.xml delete mode 100644 AndroidManifestLib.xml delete mode 100644 tests/AndroidManifestUnitTests.xml diff --git a/Android.bp b/Android.bp index 0a0521a7a..598beb6dd 100644 --- a/Android.bp +++ b/Android.bp @@ -68,6 +68,14 @@ platform_compat_config { src: ":DocumentsUI", } +filegroup { + name: "DocumentsUI-srcs", + srcs: [ + "src/**/*.java", + ":statslog-docsui-java-gen", + ], +} + java_library { name: "docsui-statsd", srcs: [ @@ -85,18 +93,51 @@ genrule { } android_library { - name: "DocumentsUI-lib", - defaults: ["documentsui_defaults"], + name: "DocumentsUI-res-lib", + + manifest: "AndroidManifest.xml", - manifest: "AndroidManifestLib.xml", + static_libs: [ + "androidx.appcompat_appcompat", + "com.google.android.material_material", + ], resource_dirs: [ "res", ], - srcs: [ - "src/**/*.java", - ":statslog-docsui-java-gen", + aaptflags: [ + "--auto-add-overlay", + ], + + sdk_version: "system_current", + target_sdk_version: "33", + min_sdk_version: "29", + lint: { strict_updatability_linting: true } +} + +android_library { + name: "DocumentsUIUnitTests-res-lib", + + manifest: "AndroidManifestForUnitTests.xml", + + static_libs: [ + "androidx.appcompat_appcompat", + "com.google.android.material_material", + "modules-utils-build_system", + ], + + resource_dirs: [ + "res", + ], + + licenses: [ + "Android-Apache-2.0", + "packages_apps_DocumentsUI_res_drawable_pd_license", + ], + + aaptflags: [ + "--auto-add-overlay", ], sdk_version: "system_current", @@ -112,8 +153,13 @@ android_app { manifest: "AndroidManifest.xml", - static_libs: ["DocumentsUI-lib"], - resource_dirs: [], + srcs: [ + ":DocumentsUI-srcs", + ], + + resource_dirs: [ + "res", + ], licenses: [ "Android-Apache-2.0", diff --git a/AndroidManifestForUnitTests.xml b/AndroidManifestForUnitTests.xml new file mode 100644 index 000000000..993d4409a --- /dev/null +++ b/AndroidManifestForUnitTests.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/AndroidManifestLib.xml b/AndroidManifestLib.xml deleted file mode 100644 index 993d4409a..000000000 --- a/AndroidManifestLib.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/perf-tests/Android.bp b/perf-tests/Android.bp index 4cf6c6508..d98c36cf5 100644 --- a/perf-tests/Android.bp +++ b/perf-tests/Android.bp @@ -8,6 +8,7 @@ android_test { manifest: "AndroidManifest.xml", srcs: [ + ":DocumentsUIPerfTests-files", "src/**/*.java", ], @@ -22,7 +23,6 @@ android_test { ], static_libs: [ - "DocumentsUIPerfTests-lib", "androidx.legacy_legacy-support-v4", "androidx.test.rules", "androidx.test.espresso.core", diff --git a/src/com/android/documentsui/ActionModeController.java b/src/com/android/documentsui/ActionModeController.java index 1bd4eea3c..89b8ff383 100644 --- a/src/com/android/documentsui/ActionModeController.java +++ b/src/com/android/documentsui/ActionModeController.java @@ -79,8 +79,7 @@ public class ActionModeController extends SelectionObserver Log.d(TAG, "Starting action mode."); } mActionMode = mActivity.startActionMode(this); - final View closeButton = - mActivity.findViewById(androidx.appcompat.R.id.action_mode_close_button); + final View closeButton = mActivity.findViewById(R.id.action_mode_close_button); if (closeButton != null) { closeButton.setContentDescription(mActivity.getString(android.R.string.cancel)); } diff --git a/src/com/android/documentsui/NavigationViewManager.java b/src/com/android/documentsui/NavigationViewManager.java index 0a66aa5a7..a9dec9e5b 100644 --- a/src/com/android/documentsui/NavigationViewManager.java +++ b/src/com/android/documentsui/NavigationViewManager.java @@ -141,8 +141,7 @@ public class NavigationViewManager implements AppBarLayout.OnOffsetChangedListen // move directory_header out of the AppBarLayout. Window window = mActivity.getWindow(); - View actionBar = - window.getDecorView().findViewById(androidx.appcompat.R.id.action_mode_bar); + View actionBar = window.getDecorView().findViewById(R.id.action_mode_bar); int dynamicHeaderColor = ContextCompat.getColor(mActivity, offset == 0 ? mDefaultStatusBarColorResId : R.color.color_surface_header); if (actionBar != null) { diff --git a/src/com/android/documentsui/inspector/KeyValueRow.java b/src/com/android/documentsui/inspector/KeyValueRow.java index 349d01794..00ef819f8 100644 --- a/src/com/android/documentsui/inspector/KeyValueRow.java +++ b/src/com/android/documentsui/inspector/KeyValueRow.java @@ -98,11 +98,9 @@ public class KeyValueRow extends LinearLayout { public void setOnClickListener(OnClickListener callback) { TextView clickable = ((TextView) findViewById(R.id.table_row_value)); mDefaultTextColor = clickable.getTextColors(); - TypedArray ta = - getContext().obtainStyledAttributes(androidx.appcompat.R.styleable.TextAppearance); - int linkColor = - ta.getColor(androidx.appcompat.R.styleable.TextAppearance_android_textColorLink, - mDefaultTextColor.getDefaultColor()); + TypedArray ta = getContext().obtainStyledAttributes(R.styleable.TextAppearance); + int linkColor = ta.getColor(R.styleable.TextAppearance_android_textColorLink, + mDefaultTextColor.getDefaultColor()); ta.recycle(); clickable.setTextColor(linkColor); clickable.setPaintFlags(clickable.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); diff --git a/src/com/android/documentsui/queries/SearchViewManager.java b/src/com/android/documentsui/queries/SearchViewManager.java index 053dc93c8..b0c298731 100644 --- a/src/com/android/documentsui/queries/SearchViewManager.java +++ b/src/com/android/documentsui/queries/SearchViewManager.java @@ -227,7 +227,7 @@ public class SearchViewManager implements mSearchView.setOnCloseListener(this); mSearchView.setOnSearchClickListener(this); mSearchView.setOnQueryTextFocusChangeListener(this); - final View clearButton = mSearchView.findViewById(androidx.appcompat.R.id.search_close_btn); + final View clearButton = mSearchView.findViewById(R.id.search_close_btn); if (clearButton != null) { clearButton.setPadding(clearButton.getPaddingStart() + getPixelForDp(4), clearButton.getPaddingTop(), clearButton.getPaddingEnd() + getPixelForDp(4), @@ -239,7 +239,7 @@ public class SearchViewManager implements }); } if (SdkLevel.isAtLeastU()) { - final View textView = mSearchView.findViewById(androidx.appcompat.R.id.search_src_text); + final View textView = mSearchView.findViewById(R.id.search_src_text); if (textView != null) { try { textView.setIsHandwritingDelegate(true); diff --git a/tests/Android.bp b/tests/Android.bp index 0ae6b0674..65a4bbdbd 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -16,80 +16,36 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -java_defaults { - name: "DocumentsUITests-defaults", - libs: [ - "android.test.base", - "android.test.mock", - "android.test.runner", - ], - - static_libs: [ - "DocumentsUI-lib", - "androidx.test.rules", - "androidx.test.espresso.core", - "androidx.test.ext.truth", - "guava", - "mockito-target", - "androidx.test.uiautomator_uiautomator", - ], -} - -android_library { - name: "DocumentsUIPerfTests-lib", +filegroup { + name: "DocumentsUIPerfTests-files", srcs: [ "common/com/android/documentsui/**/*.java", "functional/com/android/documentsui/ActivityTest.java", ], - resource_dirs: [], - libs: [ - "android.test.base", - "android.test.mock", - "android.test.runner", - "DocumentsUI-lib", - ], - - static_libs: [ - "androidx.legacy_legacy-support-v4", - "androidx.test.rules", - "androidx.test.espresso.core", - "mockito-target", - "ub-janktesthelper", - "androidx.test.uiautomator_uiautomator", - ], } -android_library { - name: "DocumentsUIUnitTests-lib", - defaults: ["DocumentsUITests-defaults"], - - manifest: "AndroidManifestUnitTests.xml", - +filegroup { + name: "DocumentsUITests-srcs", srcs: [ "common/**/*.java", + "functional/**/*.java", "unit/**/*.java", ], +} - resource_dirs: [ - "res", +filegroup { + name: "DocumentsUIUnitTests-srcs", + srcs: [ + "common/**/*.java", + "unit/**/*.java", ], - - min_sdk_version : "29", - target_sdk_version : "29", } android_library { - name: "DocumentsUITests-lib", - defaults: ["DocumentsUITests-defaults"], + name: "DocumentsUITests-res-lib", manifest: "AndroidManifest.xml", - srcs: [ - "common/**/*.java", - "functional/**/*.java", - "unit/**/*.java", - ], - asset_dirs: [ "assets", ], @@ -101,6 +57,7 @@ android_library { aaptflags: [ // pack some raw file locate in assets folder "-0 .zip", + "--auto-add-overlay", ], min_sdk_version : "29", @@ -109,14 +66,36 @@ android_library { android_test { name: "DocumentsUITests", - defaults: ["DocumentsUITests-defaults"], manifest: "AndroidManifest.xml", - resource_dirs: [], + srcs: [ + "common/**/*.java", + "functional/**/*.java", + "unit/**/*.java", + ], + + resource_dirs: [ + "res", + ], + + aaptflags: [ + "-0 .zip", + ], + + libs: [ + "android.test.base", + "android.test.mock", + "android.test.runner", + ], static_libs: [ - "DocumentsUITests-lib", + "androidx.test.rules", + "androidx.test.espresso.core", + "androidx.test.ext.truth", + "guava", + "mockito-target", + "androidx.test.uiautomator_uiautomator", ], jarjar_rules: "jarjar-rules.txt", diff --git a/tests/AndroidManifestUnitTests.xml b/tests/AndroidManifestUnitTests.xml deleted file mode 100644 index 13d7a08f7..000000000 --- a/tests/AndroidManifestUnitTests.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/tests/common/com/android/documentsui/bots/SearchBot.java b/tests/common/com/android/documentsui/bots/SearchBot.java index bde74cab7..51f93943a 100644 --- a/tests/common/com/android/documentsui/bots/SearchBot.java +++ b/tests/common/com/android/documentsui/bots/SearchBot.java @@ -33,13 +33,12 @@ import static org.hamcrest.CoreMatchers.anyOf; import android.content.Context; import android.view.View; +import androidx.recyclerview.R; import androidx.test.uiautomator.UiDevice; import androidx.test.uiautomator.UiObject; import androidx.test.uiautomator.UiObjectNotFoundException; import androidx.test.uiautomator.UiSelector; -import com.android.documentsui.R; - import org.hamcrest.Matcher; /** @@ -61,7 +60,7 @@ public class SearchBot extends Bots.BaseBot { // require this input be not clickable. @SuppressWarnings("unchecked") private static final Matcher SEARCH_INPUT = allOf( - withId(androidx.appcompat.R.id.search_src_text), + withId(R.id.search_src_text), isDisplayed()); public SearchBot(UiDevice device, Context context, int timeout) { diff --git a/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java index a33cca37a..b8ef8d651 100644 --- a/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java +++ b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java @@ -21,6 +21,7 @@ import static com.android.documentsui.StubProvider.ROOT_1_ID; import android.os.RemoteException; +import androidx.recyclerview.R; import androidx.test.filters.LargeTest; import com.android.documentsui.base.RootInfo; diff --git a/tests/functional/com/android/documentsui/SearchViewUiTest.java b/tests/functional/com/android/documentsui/SearchViewUiTest.java index 78ce44a5e..04ea87a41 100644 --- a/tests/functional/com/android/documentsui/SearchViewUiTest.java +++ b/tests/functional/com/android/documentsui/SearchViewUiTest.java @@ -19,6 +19,7 @@ package com.android.documentsui; import static com.android.documentsui.StubProvider.ROOT_0_ID; import static com.android.documentsui.StubProvider.ROOT_1_ID; +import androidx.recyclerview.R; import androidx.test.filters.LargeTest; import androidx.test.filters.Suppress; -- cgit v1.2.3-59-g8ed1b