Merge tag 'android-15.0.0_r20' into staging/lineage-22.2_merge-android-15.0.0_r20 (524ce05c) · Commits · e / os / android_packages_apps_DocumentsUI

Android.bp

+30 −5

Original line number	Diff line number	Diff line
		@@ -27,6 +27,28 @@ license {
		license_text: [],
		}

		aconfig_declarations {
		name: "docsui-flags-aconfig",
		package: "com.android.documentsui.flags",
		container: "system",
		srcs: ["flags.aconfig"],
		}

		java_aconfig_library {
		name: "docsui-flags-aconfig-java-lib",
		aconfig_declarations: "docsui-flags-aconfig",
		min_sdk_version: "29",
		sdk_version: "system_current",
		}

		java_library {
		name: "docsui-change-ids",
		srcs: ["src/com/android/documentsui/ChangeIds.java"],
		libs: ["app-compat-annotations"],
		min_sdk_version: "29",
		sdk_version: "system_current",
		}

		java_defaults {
		name: "documentsui_defaults",

		@@ -40,14 +62,11 @@ java_defaults {
		"androidx.transition_transition",
		"apache-commons-compress",
		"com.google.android.material_material",
		"docsui-change-ids",
		"guava",
		"modules-utils-build_system",
		],

		libs: [
		"app-compat-annotations",
		],

		privileged: true,

		certificate: "platform",
		@@ -63,7 +82,7 @@ java_defaults {

		platform_compat_config {
		name: "documents-ui-compat-config",
		src: ":DocumentsUI",
		src: ":docsui-change-ids",
		}

		java_library {
		@@ -90,6 +109,8 @@ genrule {
		android_library {
		name: "DocumentsUI-lib",
		defaults: ["documentsui_defaults"],
		static_libs: ["docsui-flags-aconfig-java-lib"],
		flags_packages: ["docsui-flags-aconfig"],

		manifest: "AndroidManifestLib.xml",

		@@ -101,8 +122,12 @@ android_library {
		"--auto-add-overlay",
		],

		// This is included in `documentsui_defaults`.
		exclude_srcs: ["src/com/android/documentsui/ChangeIds.java"],

		srcs: [
		"src/*/.java",
		"src/*/.kt",
		":statslog-docsui-java-gen",
		],

AndroidManifest.xml

+0 −10

Original line number	Diff line number	Diff line
		@@ -211,15 +211,5 @@
		android:process=":com.android.documentsui.services">
		</service>

		<activity
		android:name=".selection.demo.SelectionDemoActivity"
		android:label="Selection Demo"
		android:exported="true"
		android:theme="@style/DocumentsTheme">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		</application>
		</manifest>

OWNERS

+3 −1

Original line number	Diff line number	Diff line
		# Bug component: 46626

		include platform/frameworks/base:/core/java/android/os/storage/OWNERS

		benreich@google.com

compose/Android.bp

0 → 100644

+62 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2024 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
		//
		// http://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.

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

		android_library {
		name: "DocumentsUIComposelib",
		manifest: "AndroidManifest.xml",

		resource_dirs: [
		"res",
		],
		srcs: [
		"src/*/.kt",
		],

		static_libs: [
		"androidx.activity_activity-compose",
		"androidx.appcompat_appcompat",
		"androidx.compose.foundation_foundation",
		"androidx.compose.material3_material3",
		"androidx.compose.material3_material3-window-size-class",
		"androidx.compose.material_material-icons-extended",
		"androidx.compose.runtime_runtime",
		"androidx.compose.ui_ui",
		"androidx.core_core-ktx",
		"androidx.hilt_hilt-navigation-compose",
		"androidx.lifecycle_lifecycle-runtime-compose",
		"androidx.lifecycle_lifecycle-runtime-ktx",
		"hilt_android",
		"modules-utils-build_system",
		],

		sdk_version: "system_current",
		target_sdk_version: "33",
		min_sdk_version: "29",
		}

		android_app {
		name: "DocumentsUICompose",
		manifest: "AndroidManifest.xml",
		static_libs: ["DocumentsUIComposelib"],

		privileged: true,
		certificate: "platform",

		sdk_version: "system_current",
		min_sdk_version: "29",
		}

compose/AndroidManifest.xml

0 → 100644

+60 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		* Copyright (C) 2024 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
		*
		* http://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.
		*/
		-->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.documentsui.compose">

		<uses-sdk android:minSdkVersion="29"/>

		<!-- Permissions copied from com.android.documentsui AndroidManifest.xml -->
		<uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
		<uses-permission android:name="android.permission.REMOVE_TASKS" />
		<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
		<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
		<uses-permission android:name="android.permission.WAKE_LOCK" />
		<uses-permission android:name="android.permission.CACHE_CONTENT" />
		<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
		<uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES" />
		<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" />
		<uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS"/>
		<uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>
		<uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>
		<uses-permission android:name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
		<uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>

		<application
		android:name=".DocumentsUIApplication"
		android:label="@string/app_label"
		android:supportsRtl="true"
		android:allowBackup="true"
		android:theme="@style/Theme.DocumentsUINoTitleBar">

		<activity
		android:name=".MainActivity"
		android:exported="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />
		</intent-filter>
		</activity>

		</application>
		</manifest>