Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d1e2f46 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

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
parent 1189e8b1

Android.bp

+54 −8
Original line number Diff line number Diff line
@@ -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",

AndroidManifestLib.xml→AndroidManifestForUnitTests.xml

+0 −0

File moved.

View file

perf-tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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",

src/com/android/documentsui/ActionModeController.java

+1 −2
Original line number Diff line number Diff line
@@ -79,8 +79,7 @@ public class ActionModeController extends SelectionObserver<String> 
                    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));

                }

src/com/android/documentsui/NavigationViewManager.java

+1 −2
Original line number Diff line number Diff line
@@ -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) {