Snap for 8590907 from b76e77f51ad4d761ef88758fb0dcfed8eb150d25 to tm-release (1626d916) · Commits · e / os / android_packages_apps_DocumentsUI

Android.bp

+18 −23

Original line number	Diff line number	Diff line
		@@ -13,18 +13,31 @@
		// limitations under the License.

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

		// Added automatically by a large-scale-change that took the approach of
		// 'apply every license found to every target'. While this makes sure we respect
		// every license restriction, it may not be entirely correct.
		//
		// e.g. GPL in an MIT project might only apply to the contrib/ directory.
		//
		// Please consider splitting the single license below into multiple licenses,
		// taking care not to lose any license_kind information, and overriding the
		// default license using the 'licenses: [...]' property on targets as needed.
		//
		// For unused files, consider creating a 'fileGroup' with "//visibility:private"
		// to attach the license to, and including a comment whether the files may be
		// used in the current project.
		// See: http://go/android-license-faq
		license {
		// res/drawable contains at least 1 Public Domain file
		name: "packages_apps_DocumentsUI_res_drawable_pd_license",
		visibility: ["//visibility:private"],
		name: "packages_apps_DocumentsUI_license",
		visibility: [":__subpackages__"],
		license_kinds: [
		"SPDX-license-identifier-Apache-2.0",
		"legacy_unencumbered",
		],
		license_text: [],
		// large-scale-change unable to identify any license_text files
		}

		java_defaults {
		@@ -41,7 +54,6 @@ java_defaults {
		"apache-commons-compress",
		"com.google.android.material_material",
		"guava",
		"modules-utils-build_system",
		],

		libs: [
		@@ -63,7 +75,6 @@ java_defaults {
		plugins: [
		"java_api_finder",
		],
		lint: { strict_updatability_linting: true }
		}

		platform_compat_config {
		@@ -84,7 +95,6 @@ java_library {
		srcs: [
		":statslog-docsui-java-gen",
		],
		lint: { strict_updatability_linting: true }
		}

		genrule {
		@@ -116,7 +126,6 @@ android_library {
		sdk_version: "system_current",
		target_sdk_version: "30",
		min_sdk_version: "29",
		lint: { strict_updatability_linting: true }
		}

		android_library {
		@@ -127,18 +136,12 @@ android_library {
		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",
		],
		@@ -146,7 +149,6 @@ android_library {
		sdk_version: "system_current",
		target_sdk_version: "30",
		min_sdk_version: "29",
		lint: { strict_updatability_linting: true }
		}

		android_app {
		@@ -164,15 +166,8 @@ android_app {
		"res",
		],

		licenses: [
		"Android-Apache-2.0",
		"packages_apps_DocumentsUI_res_drawable_pd_license",
		],

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

		target_sdk_version: "30",
		min_sdk_version: "29",
		lint: { strict_updatability_linting: true }
		}

AndroidManifest.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@
		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
		<uses-permission android:name="android.permission.MODIFY_QUIET_MODE" />
		<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
		<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

		<!-- Permissions required for reading and logging compat changes -->
		<uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>

OWNERS

+2 −2

Original line number	Diff line number	Diff line
		# Default code reviewers picked from top 3 or more developers.
		# Please update this list if you find better candidates.
		yilunliu@google.com
		basushubham@google.com
		dikshag@google.com
		zemiao@google.com

app-perf-tests/src/com/android/documentsui/FilesAppPerfTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ public class FilesAppPerfTest {
		final Bundle status = new Bundle();
		Arrays.sort(measurements);
		final long median = measurements[NUM_MEASUREMENTS / 2 - 1];
		status.putDouble(key + "(ms)", median);
		status.putDouble(key, median);

		InstrumentationRegistry.getInstrumentation().sendStatus(Activity.RESULT_OK, status);
		}

res/color/fragment_pick_button_background_color.xml

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?><!--
		Copyright 2018 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		https://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:color="@color/fragment_pick_active_button_color" android:state_enabled="true" />
		<item android:color="@color/fragment_pick_inactive_button_color" android:state_enabled="false" />
		</selector>
		No newline at end of file