Merge tag 'android-16.0.0_r4' into staging/lineage-23.2_merge-android-16.0.0_r4 (db33475d) · Commits · e / os / android_packages_apps_DocumentsUI

Android.bp

+18 −2

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		package {
		default_applicable_licenses: ["Android-Apache-2.0"],
		default_team: "trendy_team_documentsui",
		}

		// See: http://go/android-license-faq
		@@ -53,25 +54,37 @@ java_defaults {
		name: "documentsui_defaults",

		static_libs: [
		"android.provider.flags-aconfig-java",
		"androidx.appcompat_appcompat",
		"androidx.legacy_legacy-support-core-ui",
		"androidx.legacy_legacy-support-v13",
		"androidx.legacy_legacy-support-v4",
		"androidx.lifecycle_lifecycle-livedata-ktx",
		"androidx.lifecycle_lifecycle-viewmodel-ktx",
		"androidx.recyclerview_recyclerview",
		"androidx.recyclerview_recyclerview-selection",
		"androidx.transition_transition",
		"android.multiuser.flags-aconfig-java",
		"apache-commons-compress",
		"com.google.android.material_material",
		"docsui-change-ids",
		"guava",
		"modules-utils-build_system",
		// Glide and dependencies. Optimized out when use_peek_preview_ro flag enabled.

		// The following dependencies are optimized out when use_peek_preview_ro is disabled.
		// See b/421076517 for more details.
		// Glide dependencies.
		"androidx.exifinterface_exifinterface",
		"glide-annotation-and-compiler-prebuilt",
		"glide-disklrucache-prebuilt",
		"glide-gifdecoder-prebuilt",
		"glide-prebuilt",
		// Exoplayer dependencies.
		"androidx.media3.media3-exoplayer",
		"androidx.media3.media3-ui",
		],
		plugins: [
		"glide-annotation-processor",
		],

		privileged: true,
		@@ -181,6 +194,9 @@ android_app {

		required: ["privapp_whitelist_com.android.documentsui"],

		min_sdk_version: "30",
		min_sdk_version: select(release_flag("RELEASE_DEPRECATE_MAINLINE_R_SUPPORT"), {
		true: "31",
		default: "30",
		}),
		updatable: true,
		}

OWNERS

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@ include platform/frameworks/base:/core/java/android/os/storage/OWNERS
		# For one of the below, please use android-files+reviews@google.com as the
		# reviewer.
		alexbn@google.com
		austinct@google.com
		benreich@google.com
		erfanio@google.com
		lucmult@google.com
		wenbojie@google.com

PREUPLOAD.cfg

+0 −3

Original line number	Diff line number	Diff line
		@@ -2,6 +2,3 @@
		checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
		ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES}

		# go/alint for details
		alint_hook = ${REPO_ROOT}/vendor/google/tools/alint

TEST_MAPPING

+44 −2

Original line number	Diff line number	Diff line
		@@ -6,13 +6,55 @@
		},
		{
		"name": "DocumentsUIUnitTests"
		},
		{
		"name": "DocumentsUIGoogleTests",
		"keywords": ["internal"],
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.LargeTest"
		},
		{
		"exclude-annotation": "com.android.documentsui.filters.HugeLongTest"
		}
		]
		}
		],
		"desktop-postsubmit": [ {
		"name": "DocumentsUIGoogleTests"
		"documentsui-mainline-presubmit": [
		{
		"name": "DocumentsUIUnitTests"
		},
		{
		"name": "DocumentsUIGoogleTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.LargeTest"
		},
		{
		"exclude-annotation": "com.android.documentsui.filters.HugeLongTest"
		}
		]
		}
		],
		"desktop-presubmit": [
		{
		"name": "DocumentsUIUnitTests"
		},
		{
		"name": "DocumentsUIGoogleTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.LargeTest"
		},
		{
		"exclude-annotation": "com.android.documentsui.filters.HugeLongTest"
		}
		]
		}
		],
		"desktop-postsubmit": [
		{
		"name": "DocumentsUIGoogleTests"
		}
		]
		}

flags.aconfig

+32 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,14 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "desktop_ux_phase_2_ro"
		namespace: "documentsui"
		description: "Desktop UX bug fixes and improvements, phase 2"
		bug: "432658978"
		is_fixed_read_only: true
		}

		flag {
		name: "use_search_v2_read_only"
		namespace: "documentsui"
		@@ -64,3 +72,27 @@ flag {
		bug: "409265240"
		is_fixed_read_only: true
		}

		flag {
		name: "support_visible_background_user"
		namespace: "documentsui"
		description: "Enables support for visible background users."
		bug: "393987170"
		is_fixed_read_only: true
		}

		flag {
		name: "home_screen_files_ro"
		namespace: "documentsui"
		description: "Enables the home screen folder and its files."
		bug: "438288106"
		is_fixed_read_only: true
		}

		flag {
		name: "single_click_to_select"
		namespace: "documentsui"
		description: "Enables single mouse-click to select files"
		bug: "389814214"
		is_fixed_read_only: true
		}