Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6249209 authored Aug 30, 2022 by Jordan Demeulenaere Committed by Automerger Merge Worker Aug 30, 2022

Merge "Generate SystemUI ktfmt inclusion file" into tm-qpr-dev am: d184d81f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19745060

Change-Id: I178170f6e46aba74dbfb67174c5b42714744da8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 2e2acdc6 d184d81f

PREUPLOAD.cfg

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,6 @@ hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/c

		hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclude.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}

		ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/base/ktfmt_includes.txt ${PREUPLOAD_FILES}
		ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/base/packages/SystemUI/ktfmt_includes.txt ${PREUPLOAD_FILES}

		ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES}

ktfmt_includes.txt

deleted100644 → 0

+0 −17

Original line number	Diff line number	Diff line
		packages/SystemUI/compose/
		packages/SystemUI/screenshot/
		packages/SystemUI/src/com/android/systemui/people/data
		packages/SystemUI/src/com/android/systemui/people/ui
		packages/SystemUI/src/com/android/systemui/keyguard/data
		packages/SystemUI/src/com/android/systemui/keyguard/dagger
		packages/SystemUI/src/com/android/systemui/keyguard/domain
		packages/SystemUI/src/com/android/systemui/keyguard/shared
		packages/SystemUI/src/com/android/systemui/keyguard/ui
		packages/SystemUI/src/com/android/systemui/qs/footer
		packages/SystemUI/src/com/android/systemui/security
		packages/SystemUI/src/com/android/systemui/common/
		packages/SystemUI/tests/utils/src/com/android/systemui/qs/
		packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeSecurityController.kt
		packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeUserInfoController.kt
		packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/MockUserSwitcherControllerWrapper.kt
		packages/SystemUI/tests/src/com/android/systemui/qs/footer/
		No newline at end of file

packages/SystemUI/ktfmt_includes.txt

0 → 100644

+870 −0

File added.

Preview size limit exceeded, changes collapsed.