Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (983ef1e2) · Commits · e / os / android_packages_apps_Trebuchet

Android.bp

+6 −2

Original line number	Diff line number	Diff line
		@@ -80,10 +80,10 @@ android_library {
		"androidx.preference_preference",
		"SystemUISharedLib",
		"SystemUIAnimationLib",
		"launcher-testing-shared",
		],
		srcs: [
		"tests/tapl/*/.java",
		"src/com/android/launcher3/testing/shared/*/.java",
		],
		resource_dirs: [ ],
		manifest: "tests/tapl/AndroidManifest.xml",
		@@ -177,7 +177,11 @@ android_library {
		android_library {
		name: "Launcher3CommonDepsLib",
		srcs: ["src_build_config/*/.java"],
		static_libs: ["Launcher3ResLib", "org.lineageos.platform"],
		static_libs: [
		"Launcher3ResLib",
		"launcher-testing-shared",
		"org.lineageos.platform"
		],
		sdk_version: "current",
		min_sdk_version: min_launcher3_sdk_version,
		manifest: "AndroidManifest-common.xml",

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@
		<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" />
		<uses-permission android:name="android.permission.VIBRATE"/>
		<!-- for rotating surface by arbitrary degree -->
		<uses-permission android:name="android.permission.ROTATE_SURFACE_FLINGER" />
		<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

+26 −20

Original line number	Diff line number	Diff line
		@@ -4,31 +4,37 @@
		# People who can approve changes for submission
		#

		alexchau@google.com
		andraskloczl@google.com
		patmanning@google.com
		adamcohen@google.com
		hyunyoungs@google.com
		mrcasey@google.com
		sunnygoyal@google.com
		alexchau@google.com
		andonian@google.com
		awickham@google.com
		twickham@google.com
		winsonc@google.com
		zakcohen@google.com
		santie@google.com
		vadimt@google.com
		brdayauon@google.com
		brianji@google.com
		captaincole@google.com
		charlander@google.com
		fbaron@google.com
		ganjam@google.com
		hwwang@google.com
		hyunyoungs@google.com
		jagrutdesai@google.com
		jeremysim@google.com
		jiuyu@google.com
		jonmiranda@google.com
		kylim@google.com
		patmanning@google.com
		peanutbutter@google.com
		pinyaoting@google.com
		gwasserman@google.com
		jamesoleary@google.com
		joshtrask@google.com
		mrenouf@google.com
		mkephart@google.com
		hwwang@google.com
		randypfohl@google.com
		saumyaprakash@google.com
		sihua@google.com
		sunnygoyal@google.com
		tracyzhou@google.com
		peanutbutter@google.com
		tsuharesu@google.com
		twickham@google.com
		vadimt@google.com
		victortulias@google.com
		winsonc@google.com
		xuqiu@google.com
		brianji@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
		per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.com

+2 −0

Original line number	Diff line number	Diff line
		[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}
		No newline at end of file

+1 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,7 @@ dependencies {
		implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
		implementation "androidx.preference:preference:${ANDROID_X_VERSION}"
		implementation project(':IconLoader')
		implementation project(':UiTestsLibLauncher')
		withQuickstepImplementation project(':SharedLibWrapper')

		// Recents lib dependency