Merge Android 14 QPR2 to AOSP main (7e8ae158) · Commits · e / os / BlissLauncher3

Android.bp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -207,9 +207,12 @@ android_library {
	name: "Launcher3CommonDepsLib",		name: "Launcher3CommonDepsLib",
	srcs: ["src_build_config/*/.java"],		srcs: ["src_build_config/*/.java"],
	static_libs: [		static_libs: [
			"SystemUI-statsd",
	"Launcher3ResLib",		"Launcher3ResLib",
	"launcher-testing-shared",		"launcher-testing-shared",
	"animationlib",		"animationlib",
			"com_android_launcher3_flags_lib",
			"com_android_wm_shell_flags_lib",
	],		],
	sdk_version: "current",		sdk_version: "current",
	min_sdk_version: min_launcher3_sdk_version,		min_sdk_version: min_launcher3_sdk_version,
	@@ -280,6 +283,7 @@ android_library {
	"Launcher3ResLib",		"Launcher3ResLib",
	"lottie",		"lottie",
	"SystemUISharedLib",		"SystemUISharedLib",
			"SettingsLibSettingsTheme",
	"SystemUI-statsd",		"SystemUI-statsd",
	"animationlib",		"animationlib",
	],		],

+1 −0

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

	<application		<application
	android:backupAgent="com.android.launcher3.LauncherBackupAgent"		android:backupAgent="com.android.launcher3.LauncherBackupAgent"
			android:name="com.android.launcher3.LauncherApplication"
	android:fullBackupOnly="true"		android:fullBackupOnly="true"
	android:backupInForeground="true"		android:backupInForeground="true"
	android:fullBackupContent="@xml/backupscheme"		android:fullBackupContent="@xml/backupscheme"

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5,9 +5,7 @@
	#		#

	adamcohen@google.com		adamcohen@google.com
	captaincole@google.com
	hyunyoungs@google.com		hyunyoungs@google.com
	sunnygoyal@google.com
	twickham@google.com		twickham@google.com
	vadimt@google.com		vadimt@google.com
	winsonc@google.com		winsonc@google.com
	@@ -17,5 +15,16 @@ patmanning@google.com
	tsuharesu@google.com		tsuharesu@google.com
	awickham@google.com		awickham@google.com

			# Launcher workspace eng team
			captaincole@google.com
			sunnygoyal@google.com
			charlander@google.com
			fbaron@google.com
			fengjial@google.com
			fransebas@google.com
			pinyaoting@google.com
			andonian@google.com
			sihua@google.com

	per-file FeatureFlags.java, globs = set noparent		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 FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.com

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,3 +2,5 @@
	checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --config_xml tools/checkstyle.xml --sha ${PREUPLOAD_COMMIT}		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}		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}

0 → 100644

+29 −0

Original line number	Original line	Diff line number	Diff line
			// Copyright (C) 2023 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 {
			// See: http://go/android-license-faq
			default_applicable_licenses: ["Android-Apache-2.0"],
			}

			aconfig_declarations {
			name: "com_android_launcher3_flags",
			package: "com.android.launcher3",
			srcs: ["*/.aconfig"],
			}

			java_aconfig_library {
			name: "com_android_launcher3_flags_lib",
			aconfig_declarations: "com_android_launcher3_flags",
			}