Merge "Merge Android R" (75abb09a) · Commits · e / os / android_packages_apps_Trebuchet

Android.bp

+28 −0

Original line number	Diff line number	Diff line
		@@ -30,3 +30,31 @@ android_library {
		manifest: "tests/tapl/AndroidManifest.xml",
		platform_apis: true,
		}

		java_library_static {
		name: "launcher_log_protos_lite",
		srcs: [
		"protos/*.proto",
		"proto_overrides/*.proto",
		],
		sdk_version: "current",
		proto: {
		type: "lite",
		local_include_dirs:[
		"protos",
		"proto_overrides",
		],
		},
		static_libs: ["libprotobuf-java-lite"],
		}

		java_library {
		name: "LauncherPluginLib",

		static_libs: ["PluginCoreLib"],

		srcs: ["src_plugins/*/.java"],

		sdk_version: "current",
		min_sdk_version: "28",
		}

Android.mk

+22 −78

Original line number	Diff line number	Diff line
		@@ -16,24 +16,6 @@

		LOCAL_PATH := $(call my-dir)

		#
		# Build rule for plugin lib (needed to write a plugin).
		#
		include $(CLEAR_VARS)
		LOCAL_USE_AAPT2 := true
		LOCAL_AAPT2_ONLY := true
		LOCAL_MODULE_TAGS := optional
		LOCAL_STATIC_JAVA_LIBRARIES:= PluginCoreLib

		LOCAL_SRC_FILES := \
		$(call all-java-files-under, src_plugins)

		LOCAL_SDK_VERSION := current
		LOCAL_MIN_SDK_VERSION := 28
		LOCAL_MODULE := LauncherPluginLib

		include $(BUILD_STATIC_JAVA_LIBRARY)

		#
		# Build rule for Launcher3 dependencies lib.
		#
		@@ -48,7 +30,9 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
		androidx.preference_preference \
		iconloader_base

		LOCAL_STATIC_JAVA_LIBRARIES := LauncherPluginLib
		LOCAL_STATIC_JAVA_LIBRARIES := \
		LauncherPluginLib \
		launcher_log_protos_lite

		LOCAL_SRC_FILES := \
		$(call all-proto-files-under, protos) \
		@@ -78,14 +62,15 @@ include $(CLEAR_VARS)
		LOCAL_USE_AAPT2 := true
		LOCAL_MODULE_TAGS := optional

		LOCAL_STATIC_ANDROID_LIBRARIES := \
		Launcher3CommonDepsLib \
		SecondaryDisplayLauncherLib
		LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib

		LOCAL_SRC_FILES := \
		$(call all-java-files-under, src) \
		$(call all-java-files-under, src_shortcuts_overrides) \
		$(call all-java-files-under, src_ui_overrides) \
		$(call all-java-files-under, src_flags)
		$(call all-java-files-under, ext_tests/src)

		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/ext_tests/res

		LOCAL_PROGUARD_FLAG_FILES := proguard.flags
		# Proguard is disable for testing. Derivarive prjects to keep proguard enabled
		@@ -146,7 +131,11 @@ LOCAL_USE_AAPT2 := true
		LOCAL_AAPT2_ONLY := true
		LOCAL_MODULE_TAGS := optional

		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
		LOCAL_STATIC_JAVA_LIBRARIES := \
		SystemUI-statsd \
		SystemUISharedLib \
		launcherprotosnano \
		launcher_log_protos_lite
		ifneq (,$(wildcard frameworks/base))
		LOCAL_PRIVATE_PLATFORM_APIS := true
		else
		@@ -155,15 +144,12 @@ else
		endif
		LOCAL_MODULE := Launcher3QuickStepLib
		LOCAL_PRIVILEGED_MODULE := true
		LOCAL_STATIC_ANDROID_LIBRARIES := \
		Launcher3CommonDepsLib \
		SecondaryDisplayLauncherLib
		LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib

		LOCAL_SRC_FILES := \
		$(call all-java-files-under, src) \
		$(call all-java-files-under, quickstep/src) \
		$(call all-java-files-under, quickstep/recents_ui_overrides/src) \
		$(call all-java-files-under, src_flags) \
		$(call all-java-files-under, src_shortcuts_overrides)

		LOCAL_RESOURCE_DIR := \
		@@ -202,7 +188,7 @@ LOCAL_RESOURCE_DIR := \
		$(LOCAL_PATH)/quickstep/recents_ui_overrides/res

		LOCAL_FULL_LIBS_MANIFEST_FILES := \
		$(LOCAL_PATH)/AndroidManifest.xml \
		$(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \
		$(LOCAL_PATH)/AndroidManifest-common.xml

		LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
		@@ -218,7 +204,11 @@ include $(CLEAR_VARS)
		LOCAL_USE_AAPT2 := true
		LOCAL_MODULE_TAGS := optional

		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
		LOCAL_STATIC_JAVA_LIBRARIES := \
		SystemUI-statsd \
		SystemUISharedLib \
		launcherprotosnano \
		launcher_log_protos_lite
		ifneq (,$(wildcard frameworks/base))
		LOCAL_PRIVATE_PLATFORM_APIS := true
		else
		@@ -244,58 +234,12 @@ LOCAL_PROGUARD_ENABLED := full
		LOCAL_PACKAGE_NAME := Launcher3QuickStepGo
		LOCAL_PRIVILEGED_MODULE := true
		LOCAL_SYSTEM_EXT_MODULE := true
		LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep Launcher3GoIconRecents
		LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3

		LOCAL_FULL_LIBS_MANIFEST_FILES := \
		$(LOCAL_PATH)/go/AndroidManifest.xml \
		$(LOCAL_PATH)/AndroidManifest.xml \
		$(LOCAL_PATH)/AndroidManifest-common.xml

		LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
		LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
		include $(BUILD_PACKAGE)

		#
		# Build rule for Launcher3 Go app with quickstep and Go-specific
		# version of recents for Android Go devices.
		#
		include $(CLEAR_VARS)
		LOCAL_USE_AAPT2 := true
		LOCAL_MODULE_TAGS := optional

		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
		ifneq (,$(wildcard frameworks/base))
		LOCAL_PRIVATE_PLATFORM_APIS := true
		else
		LOCAL_SDK_VERSION := system_current
		LOCAL_MIN_SDK_VERSION := 26
		endif
		LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib

		LOCAL_SRC_FILES := \
		$(call all-java-files-under, src) \
		$(call all-java-files-under, quickstep/src) \
		$(call all-java-files-under, go/src) \
		$(call all-java-files-under, go/quickstep/src)

		LOCAL_RESOURCE_DIR := \
		$(LOCAL_PATH)/quickstep/res \
		$(LOCAL_PATH)/go/res \
		$(LOCAL_PATH)/go/quickstep/res

		LOCAL_PROGUARD_FLAG_FILES := proguard.flags
		LOCAL_PROGUARD_ENABLED := full

		LOCAL_PACKAGE_NAME := Launcher3GoIconRecents
		LOCAL_PRIVILEGED_MODULE := true
		LOCAL_SYSTEM_EXT_MODULE := true
		LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3Go Launcher3QuickStep
		LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
		LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3

		LOCAL_FULL_LIBS_MANIFEST_FILES := \
		$(LOCAL_PATH)/go/AndroidManifest.xml \
		$(LOCAL_PATH)/AndroidManifest.xml \
		$(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \
		$(LOCAL_PATH)/AndroidManifest-common.xml

		LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml

AndroidManifest-common.xml

+22 −11

Original line number	Diff line number	Diff line
		@@ -44,7 +44,10 @@
		<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
		<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
		<uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
		<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />

		<!-- TODO(b/150802536): Enabled only for ENABLE_FIXED_ROTATION_TRANSFORM feature flag -->
		<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>

		<!--
		Permissions required for read/write access to the workspace data. These permission name
		@@ -70,6 +73,7 @@
		<application
		android:backupAgent="com.android.launcher3.LauncherBackupAgent"
		android:fullBackupOnly="true"
		android:backupInForeground="true"
		android:fullBackupContent="@xml/backupscheme"
		android:hardwareAccelerated="true"
		android:icon="@drawable/ic_launcher_home"
		@@ -133,14 +137,6 @@
		</intent-filter>
		</activity>

		<!--
		Should point to the content provider which can be used to dump Launcher3 compatible
		worspace configuration to the dump's file descriptor by using launcher_dump.proto
		-->
		<meta-data
		android:name="com.android.launcher3.launcher_dump_provider"
		android:value="com.android.launcher3.LauncherProvider" />

		<!--
		The settings provider contains Home's data, like the workspace favorites. The permissions
		should be changed to what is defined above. The authorities should also be changed to
		@@ -160,8 +156,8 @@
		<provider
		android:name="com.android.launcher3.graphics.GridOptionsProvider"
		android:authorities="${packageName}.grid_control"
		android:enabled="false"
		android:exported="true" />
		android:exported="true"
		android:enabled="false" />

		<!--
		The settings activity. To extend point settings_fragment_name to appropriate fragment class
		@@ -184,5 +180,20 @@
		android:writePermission="android.permission.WRITE_SECURE_SETTINGS"
		android:exported="true"
		android:enabled="false" />

		<!--
		Launcher activity for secondary display
		-->
		<activity
		android:name="com.android.launcher3.secondarydisplay.SecondaryDisplayLauncher"
		android:theme="@style/AppTheme"
		android:launchMode="singleTop"
		android:enabled="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.SECONDARY_HOME" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>
		</application>
		</manifest>

OWNERS

+20 −2

Original line number	Diff line number	Diff line
		@@ -8,8 +8,26 @@ adamcohen@google.com
		hyunyoungs@google.com
		mrcasey@google.com
		sunnygoyal@google.com
		awickham@google.com
		twickham@google.com
		winsonc@google.com
		zakcohen@google.com
		santie@google.com
		vadimt@google.com
		mett@google.com
		jonmiranda@google.com
		pinyaoting@google.com
		sfufa@google.com
		gwasserman@google.com
		jamesoleary@google.com
		joshtrask@google.com
		mrenouf@google.com
		mkephart@google.com
		hwwang@google.com
		tracyzhou@google.com
		peanutbutter@google.com
		xuqiu@google.com
		sreyasr@google.com

		per-file FeatureFlags.java = sunnygoyal@google.com, adamcohen@google.com
		per-file BaseFlags.java = sunnygoyal@google.com, adamcohen@google.com
		per-file FeatureFlags.java, globs = set noparent
		per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, zakcohen@google.com, mrcasey@google.com, adamcohen@google.com, hyunyoungs@google.com

PREUPLOAD.cfg

+1 −1

[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --config_xml tools/checkstyle.xml --sha ${PREUPLOAD_COMMIT}