Merge "Merge 24Q3 to AOSP main" into main (3b0deb9a) · Commits · e / os / BlissLauncher3

Android.bp

+60 −126

Original line number	Diff line number	Diff line
		@@ -17,10 +17,12 @@ package {
		default_applicable_licenses: ["Android-Apache-2.0"],
		}

		min_launcher3_sdk_version = "26"
		min_launcher3_sdk_version = "30"

		// Common source files used to build launcher (java and kotlin)
		// All sources are split so they can be reused in many other libraries/apps in other folders

		// Main Launcher source, excluding the build config
		filegroup {
		name: "launcher-src",
		srcs: [
		@@ -29,6 +31,7 @@ filegroup {
		],
		}

		// Source code for quickstep build, on top of launcher-src
		filegroup {
		name: "launcher-quickstep-src",
		srcs: [
		@@ -37,51 +40,20 @@ filegroup {
		],
		}

		// Alternate source when quickstep is not included
		filegroup {
		name: "launcher-go-src",
		srcs: [
		"go/src/*/.java",
		"go/src/*/.kt",
		],
		}

		filegroup {
		name: "launcher-go-quickstep-src",
		srcs: [
		"go/quickstep/src/*/.java",
		"go/quickstep/src/*/.kt",
		],
		}

		filegroup {
		name: "launcher-src_shortcuts_overrides",
		name: "launcher-src_no_quickstep",
		srcs: [
		"src_shortcuts_overrides/*/.java",
		"src_shortcuts_overrides/*/.kt",
		"src_no_quickstep/*/.java",
		"src_no_quickstep/*/.kt",
		],
		}

		// Default build config for Launcher3
		filegroup {
		name: "launcher-src_ui_overrides",
		name: "launcher-build-config",
		srcs: [
		"src_ui_overrides/*/.java",
		"src_ui_overrides/*/.kt",
		],
		}

		filegroup {
		name: "launcher-ext_tests",
		srcs: [
		"ext_tests/*/.java",
		"ext_tests/*/.kt",
		],
		}

		filegroup {
		name: "launcher-quickstep-ext_tests",
		srcs: [
		"quickstep/ext_tests/*/.java",
		"quickstep/ext_tests/*/.kt",
		"src_build_config/*/.java",
		],
		}

		@@ -103,7 +75,7 @@ android_library {
		"androidx.test.uiautomator_uiautomator",
		"androidx.preference_preference",
		"SystemUISharedLib",
		"animationlib",
		"//frameworks/libs/systemui:animationlib",
		"launcher-testing-shared",
		],
		srcs: [
		@@ -169,6 +141,7 @@ android_library {
		static_libs: [
		"LauncherPluginLib",
		"launcher_quickstep_log_protos_lite",
		"android.os.flags-aconfig-java",
		"androidx-constraintlayout_constraintlayout",
		"androidx.recyclerview_recyclerview",
		"androidx.dynamicanimation_dynamicanimation",
		@@ -178,39 +151,26 @@ android_library {
		"androidx.cardview_cardview",
		"androidx.window_window",
		"com.google.android.material_material",
		"iconloader_base",
		"view_capture",
		"animationlib",
		],
		manifest: "AndroidManifest-common.xml",
		sdk_version: "current",
		min_sdk_version: min_launcher3_sdk_version,
		lint: {
		baseline_filename: "lint-baseline2.xml",
		},
		}

		//
		// Build rule for Launcher3 dependencies lib.
		//
		android_library {
		name: "Launcher3CommonDepsLib",
		srcs: ["src_build_config/*/.java"],
		static_libs: [
		"//frameworks/libs/systemui:iconloader_base",
		"//frameworks/libs/systemui:view_capture",
		"//frameworks/libs/systemui:animationlib",
		"SystemUI-statsd",
		"Launcher3ResLib",
		"launcher-testing-shared",
		"animationlib",
		"androidx.lifecycle_lifecycle-common-java8",
		"androidx.lifecycle_lifecycle-extensions",
		"androidx.lifecycle_lifecycle-runtime-ktx",
		"kotlinx_coroutines_android",
		"kotlinx_coroutines",
		"com_android_launcher3_flags_lib",
		"com_android_wm_shell_flags_lib",
		"android.appwidget.flags-aconfig-java",
		"com.android.window.flags.window-aconfig-java",
		],
		manifest: "AndroidManifest-common.xml",
		sdk_version: "current",
		min_sdk_version: min_launcher3_sdk_version,
		manifest: "AndroidManifest-common.xml",
		lint: {
		baseline_filename: "lint-baseline2.xml",
		baseline_filename: "lint-baseline.xml",
		},
		}

		@@ -221,17 +181,14 @@ android_app {
		name: "Launcher3",

		static_libs: [
		"Launcher3CommonDepsLib",
		"Launcher3ResLib",
		],
		srcs: [
		":launcher-src",
		":launcher-src_shortcuts_overrides",
		":launcher-src_ui_overrides",
		":launcher-ext_tests",
		],
		resource_dirs: [
		"ext_tests/res",
		":launcher-src_no_quickstep",
		":launcher-build-config",
		],

		optimize: {
		proguard_flags_files: ["proguard.flags"],
		// Proguard is disable for testing. Derivarive prjects to keep proguard enabled
		@@ -276,24 +233,21 @@ android_library {
		"lottie",
		"SystemUISharedLib",
		"SettingsLibSettingsTheme",
		"SystemUI-statsd",
		"animationlib",
		],
		manifest: "quickstep/AndroidManifest.xml",
		min_sdk_version: "current",
		}

		// Library with all the dependencies for building Launcher Go
		// Library with all the source code and dependencies for building Launcher Go
		android_library {
		name: "LauncherGoResLib",
		name: "Launcher3GoLib",
		srcs: [
		":launcher-src",
		":launcher-quickstep-src",
		":launcher-go-src",
		":launcher-go-quickstep-src",
		"go/quickstep/src/*/.java",
		"go/quickstep/src/*/.kt",
		],
		resource_dirs: [
		"go/res",
		"go/quickstep/res",
		],
		// Note the ordering here is important when it comes to resource
		@@ -301,7 +255,6 @@ android_library {
		// in QuickstepResLib to take precendece, so it should be the final
		// dependency. See b/205278434 for how this can go wrong.
		static_libs: [
		"Launcher3CommonDepsLib",
		"QuickstepResLib",
		"androidx.room_room-runtime",
		],
		@@ -316,13 +269,13 @@ android_library {
		use_resource_processor: false,
		}

		// Build rule for Quickstep library
		// Library with all the source code and dependencies for building Quickstep
		android_library {
		name: "Launcher3QuickStepLib",
		srcs: [
		":launcher-src",
		":launcher-quickstep-src",
		":launcher-src_shortcuts_overrides",
		":launcher-build-config",
		],
		resource_dirs: [],
		libs: [
		@@ -334,10 +287,7 @@ android_library {
		// dependency. See b/208647810 for how this can go wrong.
		static_libs: [
		"SystemUI-statsd",
		"SystemUISharedLib",
		"Launcher3CommonDepsLib",
		"QuickstepResLib",
		"animationlib",
		],
		manifest: "quickstep/AndroidManifest.xml",
		platform_apis: true,
		@@ -346,75 +296,74 @@ android_library {
		use_resource_processor: false,
		}

		// Build rule for Launcher3 Go app for Android Go devices.
		// Build rule for Quickstep app.
		android_app {
		name: "Launcher3Go",

		static_libs: ["Launcher3CommonDepsLib"],

		srcs: [
		":launcher-src",
		":launcher-go-src",
		":launcher-src_ui_overrides",
		],

		resource_dirs: ["go/res"],
		name: "Launcher3QuickStep",

		static_libs: ["Launcher3QuickStepLib"],
		optimize: {
		proguard_flags_files: ["proguard.flags"],
		enabled: false,
		},

		sdk_version: "current",
		platform_apis: true,
		min_sdk_version: "current",
		target_sdk_version: "current",

		privileged: true,
		system_ext_specific: true,
		overrides: [
		"Home",
		"Launcher2",
		"Launcher3",
		"Launcher3QuickStep",
		],
		required: ["privapp_whitelist_com.android.launcher3"],

		resource_dirs: ["quickstep/res"],

		additional_manifests: [
		"AndroidManifest.xml",
		"quickstep/AndroidManifest-launcher.xml",
		"AndroidManifest-common.xml",
		],

		manifest: "go/AndroidManifest.xml",
		manifest: "quickstep/AndroidManifest.xml",
		jacoco: {
		include_filter: ["com.android.launcher3.*"],
		},

		}

		// Build rule for Quickstep app.

		// Build rule for Launcher3 Go app with quickstep for Android Go devices.
		// Note that the following two rules are exactly same, and should
		// eventually be merged into a single target
		android_app {
		name: "Launcher3QuickStep",
		name: "Launcher3Go",

		static_libs: ["Launcher3QuickStepLib"],
		optimize: {
		enabled: false,
		},
		static_libs: ["Launcher3GoLib"],
		resource_dirs: [],

		platform_apis: true,
		min_sdk_version: "current",
		target_sdk_version: "current",

		optimize: {
		proguard_flags_files: ["proguard.flags"],
		enabled: true,
		},

		privileged: true,
		system_ext_specific: true,
		overrides: [
		"Home",
		"Launcher2",
		"Launcher3",
		"Launcher3QuickStep",
		],
		required: ["privapp_whitelist_com.android.launcher3"],

		resource_dirs: ["quickstep/res"],

		additional_manifests: [
		"quickstep/AndroidManifest-launcher.xml",
		"go/AndroidManifest.xml",
		"go/AndroidManifest-launcher.xml",
		"AndroidManifest-common.xml",
		],

		@@ -422,31 +371,17 @@ android_app {
		jacoco: {
		include_filter: ["com.android.launcher3.*"],
		},

		}

		// Build rule for Launcher3 Go app with quickstep for Android Go devices.
		android_app {
		name: "Launcher3QuickStepGo",

		static_libs: [
		"SystemUI-statsd",
		"SystemUISharedLib",
		"LauncherGoResLib",
		],
		static_libs: ["Launcher3GoLib"],
		resource_dirs: [],

		platform_apis: true,
		min_sdk_version: "current",
		target_sdk_version: "current",

		srcs: [],

		resource_dirs: [
		"go/quickstep/res",
		"go/res",
		"quickstep/res",
		],

		optimize: {
		proguard_flags_files: ["proguard.flags"],
		enabled: true,
		@@ -472,5 +407,4 @@ android_app {
		jacoco: {
		include_filter: ["com.android.launcher3.*"],
		},

		}

AndroidManifest-common.xml

+10 −10

Original line number	Diff line number	Diff line
		@@ -52,18 +52,18 @@
		name in the permissions. eq com.mypackage.permission.READ_SETTINGS
		-->
		<permission
		android:name="${packageName}.permission.READ_SETTINGS"
		android:name="${applicationId}.permission.READ_SETTINGS"
		android:protectionLevel="signatureOrSystem"
		android:label="@string/permlab_read_settings"
		android:description="@string/permdesc_read_settings"/>
		<permission
		android:name="${packageName}.permission.WRITE_SETTINGS"
		android:name="${applicationId}.permission.WRITE_SETTINGS"
		android:protectionLevel="signatureOrSystem"
		android:label="@string/permlab_write_settings"
		android:description="@string/permdesc_write_settings"/>

		<uses-permission android:name="${packageName}.permission.READ_SETTINGS" />
		<uses-permission android:name="${packageName}.permission.WRITE_SETTINGS" />
		<uses-permission android:name="${applicationId}.permission.READ_SETTINGS" />
		<uses-permission android:name="${applicationId}.permission.WRITE_SETTINGS" />

		<application
		android:backupAgent="com.android.launcher3.LauncherBackupAgent"
		@@ -126,10 +126,10 @@
		-->
		<provider
		android:name="com.android.launcher3.LauncherProvider"
		android:authorities="${packageName}.settings"
		android:authorities="${applicationId}.settings"
		android:exported="true"
		android:writePermission="${packageName}.permission.WRITE_SETTINGS"
		android:readPermission="${packageName}.permission.READ_SETTINGS" />
		android:writePermission="${applicationId}.permission.WRITE_SETTINGS"
		android:readPermission="${applicationId}.permission.READ_SETTINGS" />

		<!--
		The content provider for exposing various launcher grid options.
		@@ -137,7 +137,7 @@
		-->
		<provider
		android:name="com.android.launcher3.graphics.GridCustomizationsProvider"
		android:authorities="${packageName}.grid_control"
		android:authorities="${applicationId}.grid_control"
		android:exported="true" />

		<!--
		@@ -157,7 +157,7 @@

		<provider
		android:name="com.android.launcher3.testing.TestInformationProvider"
		android:authorities="${packageName}.TestInfo"
		android:authorities="${applicationId}.TestInfo"
		android:readPermission="android.permission.WRITE_SECURE_SETTINGS"
		android:writePermission="android.permission.WRITE_SECURE_SETTINGS"
		android:exported="true"
		@@ -179,7 +179,7 @@
		</intent-filter>
		</activity>

		<!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
		<!-- Disable eager initialization of Jetpack libraries. See bug 197780098. -->
		<provider
		android:name="androidx.startup.InitializationProvider"
		android:authorities="${applicationId}.androidx-startup"

OWNERS

+13 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ vadimt@google.com
		winsonc@google.com
		jonmiranda@google.com
		awickham@google.com
		agvard@google.com

		# Launcher workspace eng team
		captaincole@google.com
		@@ -27,6 +28,8 @@ sihua@google.com
		tracyzhou@google.com
		peanutbutter@google.com
		jeremysim@google.com
		atsjenk@google.com
		brianji@google.com

		# Overview eng team
		alexchau@google.com
		@@ -38,5 +41,15 @@ uwaisashraf@google.com
		patmanning@google.com
		helencheuk@google.com

		# Widget Picker team
		shamalip@google.com
		zakcohen@google.com

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

		per-file DeviceConfigWrapper.java, globs = set noparent
		per-file DeviceConfigWrapper.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com

		# Predictive Back
		per-file LauncherBackAnimationController.java = shanh@google.com, gallmann@google.com
		No newline at end of file

PREUPLOAD.cfg

+9 −2

Original line number	Diff line number	Diff line
		[Builtin Hooks]
		ktfmt = true

		[Builtin Hooks Options]
		ktfmt = --kotlinlang-style

		[Tool Paths]
		ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh

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

		ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check ${PREUPLOAD_FILES}

		flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PATH}

aconfig/launcher.aconfig

+112 −2

Original line number	Diff line number	Diff line
		@@ -78,6 +78,13 @@ flag {
		bug: "296231746"
		}

		flag {
		name: "enable_taskbar_customization"
		namespace: "launcher"
		description: "Enables taskbar customization framework."
		bug: "347281365"
		}

		flag {
		name: "enable_unfolded_two_pane_picker"
		namespace: "launcher"
		@@ -170,6 +177,13 @@ flag {
		bug: "318410881"
		}

		flag {
		name: "force_monochrome_app_icons"
		namespace: "launcher"
		description: "Enable the ability to generate monochromatic icons, if it is not provided by the app"
		bug: "270396209"
		}

		flag {
		name: "enable_add_app_widget_via_config_activity_v2"
		namespace: "launcher"
		@@ -188,21 +202,117 @@ flag {
		}

		flag {
		name: "grid_migration_fix"
		name: "enable_grid_migration_fix"
		namespace: "launcher"
		description: "Keep items in place when migrating to a bigger grid"
		bug: "325286145"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "narrow_grid_restore"
		name: "enable_narrow_grid_restore"
		namespace: "launcher"
		description: "Using only the most recent workspace when restoring to avoid confusion."
		is_fixed_read_only: true
		bug: "325285743"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "enable_scaling_reveal_home_animation"
		namespace: "launcher"
		description: "Enables the Home gesture animation"
		bug: "308801666"
		}

		flag {
		name: "enable_widget_tap_to_add"
		namespace: "launcher"
		description: "Enables an add button in the widget picker"
		bug: "323886237"
		}

		flag {
		name: "enable_refactor_task_thumbnail"
		namespace: "launcher"
		description: "Enables rewritten version of TaskThumbnailViews in Overview"
		bug: "331753115"
		}

		flag {
		name: "enable_handle_delayed_gesture_callbacks"
		namespace: "launcher"
		description: "Enables additional handling for delayed mid-gesture callbacks"
		bug: "285636175"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "enable_fallback_overview_in_window"
		namespace: "launcher"
		description: "Enables fallback recents opening inside of a window instead of an activity."
		bug: "292269949"
		}

		flag {
		name: "enable_smartspace_as_a_widget"
		namespace: "launcher"
		description: "Enables smartspace as a widget"
		bug: "300140279"
		}

		flag {
		name: "enable_smartspace_removal_toggle"
		namespace: "launcher"
		description: "Enables smartspace removal toggle"
		bug: "303471576"
		}

		flag {
		name: "enable_additional_home_animations"
		namespace: "launcher"
		description: "Enables custom home animations for non-running tasks"
		bug: "237638627"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "enabled_folders_in_all_apps"
		namespace: "launcher"
		description: "Enables folders in all apps"
		bug: "341582436"
		}

		flag {
		name: "enable_recents_in_taskbar"
		namespace: "launcher"
		description: "Replace hybrid hotseat app predictions with strictly Recent Apps"
		bug: "315354060"
		}

		flag {
		name: "enable_first_screen_broadcast_archiving_extras"
		namespace: "launcher"
		description: "adds Extras to first screen broadcast for archived apps"
		bug: "322314760"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "floating_search_bar"
		namespace: "launcher"
		description: "Search bar persists at the bottom of the screen across Launcher states"
		bug: "346408388"
		}