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

Commit 1ca2971f authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge changes from topic "ktfmt-v049" into main 

* changes:
  Replace ktfmt.py hook by built-in hook in libs/systemui/
  Remove Kotlin files excluded in libs/systemui/ ktfmt hook
parents eff47c58 78730cd8

PREUPLOAD.cfg

+5 −2
Original line number Diff line number Diff line 
[Builtin Hooks]

bpfmt = true

ktfmt = true



[Builtin Hooks Options]

bpfmt = -d

ktfmt = --kotlinlang-style



[Hook Scripts]

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



ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/libs/systemui/ktfmt_includes.txt ${PREUPLOAD_FILES}



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



[Tool Paths]

ktfmt = ${REPO_ROOT}/prebuilts/build-tools/common/framework/ktfmt.jar

ktfmt_includes.txt

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
+

-animationlib/tests/robolectric/src/com/android/app/animation/robolectric/ShadowAnimationUtils2.kt

-animationlib/tests/src/com/android/app/animation/InterpolatorResourcesTest.kt

-animationlib/tests/src/com/android/app/animation/InterpolatorsAndroidXTest.kt

-motiontoollib/src/com/android/app/motiontool/DdmHandleMotionTool.kt

-motiontoollib/src/com/android/app/motiontool/MotionToolManager.kt

-motiontoollib/tests/com/android/app/motiontool/DdmHandleMotionToolTest.kt

-motiontoollib/tests/com/android/app/motiontool/MotionToolManagerTest.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/activity/TorusViewerActivity.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/app/KeyguardLockController.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/content/ConfigurationChangeListener.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/engine/TorusEngine.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/engine/listener/TorusTouchListener.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/extensions/ConfigurationExt.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/geometry/Vertex.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/power/FpsThrottler.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/time/TimeController.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/wallpaper/LiveWallpaper.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/wallpaper/listener/LiveWallpaperEventListener.kt

-toruslib/torus-framework-canvas/src/main/java/com/google/android/torus/canvas/engine/CanvasWallpaperEngine.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/AffineTransform.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/MathUtils.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/MatrixTransform.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/RotationQuaternion.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/SphericalTransform.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/Vector2.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/Vector3.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/BitmapUtils.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/animation/EasingUtils.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/broadcast/BroadcastEventController.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/broadcast/PowerSaveController.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/content/ResourcesManager.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/display/DisplayOrientationController.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/display/DisplaySizeType.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/display/DisplayUtils.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/extensions/ActivityExt.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/extensions/AssetManagerExt.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/extensions/SizeExt.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/interaction/Gyro2dController.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/interaction/HingeController.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/wallpaper/WallpaperUtils.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/inlinecontrol/BaseSliceConfigProvider.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/inlinecontrol/ColorChipsRowBuilder.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/inlinecontrol/InputRangeRowBuilder.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/inlinecontrol/SingleSelectionRowConfigProvider.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/inlinecontrol/SliceConfigController.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/storage/CustomizedSharedPreferences.kt

-viewcapturelib/src/com/android/app/viewcapture/NoOpViewCapture.kt

-viewcapturelib/src/com/android/app/viewcapture/SettingsAwareViewCapture.kt

-viewcapturelib/src/com/android/app/viewcapture/SimpleViewCapture.kt

-viewcapturelib/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt

-viewcapturelib/tests/com/android/app/viewcapture/TestActivity.kt

-viewcapturelib/tests/com/android/app/viewcapture/ViewCaptureTest.kt

-weathereffects/debug/src/com/google/android/wallpaper/weathereffects/WallpaperEffectsDebugActivity.kt

-weathereffects/debug/src/com/google/android/wallpaper/weathereffects/WallpaperEffectsDebugApplication.kt

-weathereffects/debug/src/com/google/android/wallpaper/weathereffects/dagger/DebugApplicationComponent.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/WeatherEffect.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/WeatherEngine.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/WeatherWallpaperService.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/dagger/ApplicationComponent.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/dagger/DependencyProvider.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/dagger/Qualifiers.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/data/repository/WallpaperFileUtils.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/data/repository/WeatherEffectsRepository.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/domain/WeatherEffectsInteractor.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/fog/FogEffect.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/fog/FogEffectConfig.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/graphics/FrameBuffer.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/none/NoEffect.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/provider/WallpaperInfoContract.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/provider/WeatherEffectsContentProvider.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/rain/RainEffect.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/rain/RainEffectConfig.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/shared/model/WallpaperFileModel.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/snow/SnowEffect.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/snow/SnowEffectConfig.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/utils/GraphicsUtils.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/utils/ImageCrop.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/utils/MatrixUtils.kt

-weathereffects/tests/src/com/google/android/wallpaper/weathereffects/provider/WeatherEffectsContentProviderTest.kt