diff --git a/build.gradle b/build.gradle index 6dde26521f..cf3d22fb0f 100644 --- a/build.gradle +++ b/build.gradle @@ -103,7 +103,6 @@ allprojects { compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-core.jar') compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-statsd.jar') compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell-15.jar') -// compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'QuickstepResLib.jar') compileOnly projects.compatLib compileOnly projects.compatLib.compatLibVQ @@ -335,14 +334,14 @@ dependencies { // Recents lib dependency withQuickstepCompileOnly projects.hiddenApi - withQuickstepImplementation projects.systemUIShared - withQuickstepImplementation projects.systemUIAnim - withQuickstepImplementation projects.systemUnFold - withQuickstepImplementation projects.systemUIViewCapture - withQuickstepImplementation projects.systemUILog - withQuickstepCompileOnly projects.systemUIPlugin - withQuickstepImplementation projects.systemUIPluginCore - withQuickstepCompileOnly projects.systemUICommon + withQuickstepImplementation projects.shared + withQuickstepImplementation projects.anim + withQuickstepImplementation projects.unfold + withQuickstepImplementation projects.viewcapture + withQuickstepImplementation projects.log + withQuickstepCompileOnly projects.plugin + withQuickstepImplementation projects.plugincore + withQuickstepCompileOnly projects.common // QuickSwitch Compat withQuickstepImplementation projects.compatLib @@ -354,7 +353,6 @@ dependencies { withQuickstepImplementation projects.compatLib.compatLibVV withQuickstepImplementation projects.wmshell withQuickstepImplementation projects.flags -// withQuickstepImplementation projects.androidxLib implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0' implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-statsd-15.jar') diff --git a/settings.gradle b/settings.gradle index 2bc7480445..8f5b3ed69a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -56,14 +56,31 @@ include ':animationlib' project(':animationlib').projectDir = new File(rootDir, 'platform_frameworks_libs_systemui/animationlib') include ':hidden-api' -include ':systemUIShared' -include ':systemUIPlugin' -include ':systemUIPluginCore' -include ':systemUICommon' -include ':systemUILog' -include ':systemUIAnim' -include ':systemUnFold' -include ':systemUIViewCapture' + +include ':shared' +project(':shared').projectDir = new File(rootDir, 'systemUI/shared') + +include ':plugin' +project(':plugin').projectDir = new File(rootDir, 'systemUI/plugin') + +include ':plugincore' +project(':plugincore').projectDir = new File(rootDir, 'systemUI/plugin_core') + +include ':common' +project(':common').projectDir = new File(rootDir, 'systemUI/common') + +include ':log' +project(':log').projectDir = new File(rootDir, 'systemUI/log') + +include ':anim' +project(':anim').projectDir = new File(rootDir, 'systemUI/anim') + +include ':unfold' +project(':unfold').projectDir = new File(rootDir, 'systemUI/unfold') + +include ':viewcapture' +project(':viewcapture').projectDir = new File(rootDir, 'systemUI/viewcapture') + include ':compatLib' include ':compatLib:compatLibVQ' diff --git a/systemUI/README.md b/systemUI/README.md new file mode 100644 index 0000000000..578e945709 --- /dev/null +++ b/systemUI/README.md @@ -0,0 +1,3 @@ +# SystemUI Module + +https://android.googlesource.com/platform/frameworks/base/+/refs/heads/main/packages/SystemUI/ \ No newline at end of file diff --git a/systemUIAnim/Android.bp b/systemUI/anim/Android.bp similarity index 100% rename from systemUIAnim/Android.bp rename to systemUI/anim/Android.bp diff --git a/systemUIAnim/AndroidManifest.xml b/systemUI/anim/AndroidManifest.xml similarity index 100% rename from systemUIAnim/AndroidManifest.xml rename to systemUI/anim/AndroidManifest.xml diff --git a/systemUIAnim/build.gradle b/systemUI/anim/build.gradle similarity index 100% rename from systemUIAnim/build.gradle rename to systemUI/anim/build.gradle diff --git a/systemUIAnim/res/anim/launch_dialog_enter.xml b/systemUI/anim/res/anim/launch_dialog_enter.xml similarity index 100% rename from systemUIAnim/res/anim/launch_dialog_enter.xml rename to systemUI/anim/res/anim/launch_dialog_enter.xml diff --git a/systemUIAnim/res/anim/launch_dialog_exit.xml b/systemUI/anim/res/anim/launch_dialog_exit.xml similarity index 100% rename from systemUIAnim/res/anim/launch_dialog_exit.xml rename to systemUI/anim/res/anim/launch_dialog_exit.xml diff --git a/systemUIAnim/res/values/ids.xml b/systemUI/anim/res/values/ids.xml similarity index 100% rename from systemUIAnim/res/values/ids.xml rename to systemUI/anim/res/values/ids.xml diff --git a/systemUIAnim/res/values/styles.xml b/systemUI/anim/res/values/styles.xml similarity index 100% rename from systemUIAnim/res/values/styles.xml rename to systemUI/anim/res/values/styles.xml diff --git a/systemUIAnim/src/com/android/systemui/animation/ActivityTransitionAnimator.kt b/systemUI/anim/src/com/android/systemui/animation/ActivityTransitionAnimator.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/ActivityTransitionAnimator.kt rename to systemUI/anim/src/com/android/systemui/animation/ActivityTransitionAnimator.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/AnimationFeatureFlags.kt b/systemUI/anim/src/com/android/systemui/animation/AnimationFeatureFlags.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/AnimationFeatureFlags.kt rename to systemUI/anim/src/com/android/systemui/animation/AnimationFeatureFlags.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/DelegateTransitionAnimatorController.kt b/systemUI/anim/src/com/android/systemui/animation/DelegateTransitionAnimatorController.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/DelegateTransitionAnimatorController.kt rename to systemUI/anim/src/com/android/systemui/animation/DelegateTransitionAnimatorController.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/DialogTransitionAnimator.kt b/systemUI/anim/src/com/android/systemui/animation/DialogTransitionAnimator.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/DialogTransitionAnimator.kt rename to systemUI/anim/src/com/android/systemui/animation/DialogTransitionAnimator.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/Expandable.kt b/systemUI/anim/src/com/android/systemui/animation/Expandable.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/Expandable.kt rename to systemUI/anim/src/com/android/systemui/animation/Expandable.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/FontInterpolator.kt b/systemUI/anim/src/com/android/systemui/animation/FontInterpolator.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/FontInterpolator.kt rename to systemUI/anim/src/com/android/systemui/animation/FontInterpolator.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/FontVariationUtils.kt b/systemUI/anim/src/com/android/systemui/animation/FontVariationUtils.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/FontVariationUtils.kt rename to systemUI/anim/src/com/android/systemui/animation/FontVariationUtils.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/GhostedViewTransitionAnimatorController.kt b/systemUI/anim/src/com/android/systemui/animation/GhostedViewTransitionAnimatorController.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/GhostedViewTransitionAnimatorController.kt rename to systemUI/anim/src/com/android/systemui/animation/GhostedViewTransitionAnimatorController.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/LaunchableView.kt b/systemUI/anim/src/com/android/systemui/animation/LaunchableView.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/LaunchableView.kt rename to systemUI/anim/src/com/android/systemui/animation/LaunchableView.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/RemoteAnimationDelegate.kt b/systemUI/anim/src/com/android/systemui/animation/RemoteAnimationDelegate.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/RemoteAnimationDelegate.kt rename to systemUI/anim/src/com/android/systemui/animation/RemoteAnimationDelegate.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java b/systemUI/anim/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java rename to systemUI/anim/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java diff --git a/systemUIAnim/src/com/android/systemui/animation/RemoteAnimationTargetCompat.java b/systemUI/anim/src/com/android/systemui/animation/RemoteAnimationTargetCompat.java similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/RemoteAnimationTargetCompat.java rename to systemUI/anim/src/com/android/systemui/animation/RemoteAnimationTargetCompat.java diff --git a/systemUIAnim/src/com/android/systemui/animation/ShadeInterpolation.kt b/systemUI/anim/src/com/android/systemui/animation/ShadeInterpolation.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/ShadeInterpolation.kt rename to systemUI/anim/src/com/android/systemui/animation/ShadeInterpolation.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/TextAnimator.kt b/systemUI/anim/src/com/android/systemui/animation/TextAnimator.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/TextAnimator.kt rename to systemUI/anim/src/com/android/systemui/animation/TextAnimator.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/TextInterpolator.kt b/systemUI/anim/src/com/android/systemui/animation/TextInterpolator.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/TextInterpolator.kt rename to systemUI/anim/src/com/android/systemui/animation/TextInterpolator.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/TransitionAnimator.kt b/systemUI/anim/src/com/android/systemui/animation/TransitionAnimator.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/TransitionAnimator.kt rename to systemUI/anim/src/com/android/systemui/animation/TransitionAnimator.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/ViewDialogTransitionAnimatorController.kt b/systemUI/anim/src/com/android/systemui/animation/ViewDialogTransitionAnimatorController.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/ViewDialogTransitionAnimatorController.kt rename to systemUI/anim/src/com/android/systemui/animation/ViewDialogTransitionAnimatorController.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/ViewHierarchyAnimator.kt b/systemUI/anim/src/com/android/systemui/animation/ViewHierarchyAnimator.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/ViewHierarchyAnimator.kt rename to systemUI/anim/src/com/android/systemui/animation/ViewHierarchyAnimator.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/ViewRootSync.kt b/systemUI/anim/src/com/android/systemui/animation/ViewRootSync.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/ViewRootSync.kt rename to systemUI/anim/src/com/android/systemui/animation/ViewRootSync.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/back/BackAnimationSpec.kt b/systemUI/anim/src/com/android/systemui/animation/back/BackAnimationSpec.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/back/BackAnimationSpec.kt rename to systemUI/anim/src/com/android/systemui/animation/back/BackAnimationSpec.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/back/BackAnimationSpecForSysUi.kt b/systemUI/anim/src/com/android/systemui/animation/back/BackAnimationSpecForSysUi.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/back/BackAnimationSpecForSysUi.kt rename to systemUI/anim/src/com/android/systemui/animation/back/BackAnimationSpecForSysUi.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/back/BackTransformation.kt b/systemUI/anim/src/com/android/systemui/animation/back/BackTransformation.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/back/BackTransformation.kt rename to systemUI/anim/src/com/android/systemui/animation/back/BackTransformation.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/back/BottomsheetBackAnimationSpec.kt b/systemUI/anim/src/com/android/systemui/animation/back/BottomsheetBackAnimationSpec.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/back/BottomsheetBackAnimationSpec.kt rename to systemUI/anim/src/com/android/systemui/animation/back/BottomsheetBackAnimationSpec.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/back/OnBackAnimationCallbackExtension.kt b/systemUI/anim/src/com/android/systemui/animation/back/OnBackAnimationCallbackExtension.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/back/OnBackAnimationCallbackExtension.kt rename to systemUI/anim/src/com/android/systemui/animation/back/OnBackAnimationCallbackExtension.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/view/LaunchableFrameLayout.kt b/systemUI/anim/src/com/android/systemui/animation/view/LaunchableFrameLayout.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/view/LaunchableFrameLayout.kt rename to systemUI/anim/src/com/android/systemui/animation/view/LaunchableFrameLayout.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/view/LaunchableImageView.kt b/systemUI/anim/src/com/android/systemui/animation/view/LaunchableImageView.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/view/LaunchableImageView.kt rename to systemUI/anim/src/com/android/systemui/animation/view/LaunchableImageView.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/view/LaunchableLinearLayout.kt b/systemUI/anim/src/com/android/systemui/animation/view/LaunchableLinearLayout.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/view/LaunchableLinearLayout.kt rename to systemUI/anim/src/com/android/systemui/animation/view/LaunchableLinearLayout.kt diff --git a/systemUIAnim/src/com/android/systemui/animation/view/LaunchableTextView.kt b/systemUI/anim/src/com/android/systemui/animation/view/LaunchableTextView.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/animation/view/LaunchableTextView.kt rename to systemUI/anim/src/com/android/systemui/animation/view/LaunchableTextView.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/PaintDrawCallback.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/PaintDrawCallback.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/PaintDrawCallback.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/PaintDrawCallback.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/RenderEffectDrawCallback.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/RenderEffectDrawCallback.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/RenderEffectDrawCallback.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/RenderEffectDrawCallback.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxConfig.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxConfig.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxConfig.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxConfig.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxEffect.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxEffect.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxEffect.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxEffect.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxShader.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxShader.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxShader.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/glowboxeffect/GlowBoxShader.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffect.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffect.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffect.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffect.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffectView.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffectView.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffectView.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffectView.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/MultiRippleController.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/MultiRippleController.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/MultiRippleController.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/MultiRippleController.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/MultiRippleView.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/MultiRippleView.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/MultiRippleView.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/MultiRippleView.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/RippleAnimation.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/RippleAnimation.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/RippleAnimation.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/RippleAnimation.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/shaders/SolidColorShader.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/shaders/SolidColorShader.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/shaders/SolidColorShader.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/shaders/SolidColorShader.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/shaders/SparkleShader.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/shaders/SparkleShader.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/shaders/SparkleShader.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/shaders/SparkleShader.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/shaderutil/SdfShaderLibrary.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/shaderutil/SdfShaderLibrary.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/shaderutil/SdfShaderLibrary.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/shaderutil/SdfShaderLibrary.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/shaderutil/ShaderUtilLibrary.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/shaderutil/ShaderUtilLibrary.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/shaderutil/ShaderUtilLibrary.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/shaderutil/ShaderUtilLibrary.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseAnimationConfig.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseAnimationConfig.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseAnimationConfig.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseAnimationConfig.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseController.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseController.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseController.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseController.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseView.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseView.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseView.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseView.kt diff --git a/systemUIAnim/src/com/android/systemui/surfaceeffects/utils/MathUtils.kt b/systemUI/anim/src/com/android/systemui/surfaceeffects/utils/MathUtils.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/surfaceeffects/utils/MathUtils.kt rename to systemUI/anim/src/com/android/systemui/surfaceeffects/utils/MathUtils.kt diff --git a/systemUIAnim/src/com/android/systemui/util/AnimatorExtensions.kt b/systemUI/anim/src/com/android/systemui/util/AnimatorExtensions.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/util/AnimatorExtensions.kt rename to systemUI/anim/src/com/android/systemui/util/AnimatorExtensions.kt diff --git a/systemUIAnim/src/com/android/systemui/util/Dialog.kt b/systemUI/anim/src/com/android/systemui/util/Dialog.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/util/Dialog.kt rename to systemUI/anim/src/com/android/systemui/util/Dialog.kt diff --git a/systemUIAnim/src/com/android/systemui/util/Dimension.kt b/systemUI/anim/src/com/android/systemui/util/Dimension.kt similarity index 100% rename from systemUIAnim/src/com/android/systemui/util/Dimension.kt rename to systemUI/anim/src/com/android/systemui/util/Dimension.kt diff --git a/systemUICommon/.gitignore b/systemUI/common/.gitignore similarity index 100% rename from systemUICommon/.gitignore rename to systemUI/common/.gitignore diff --git a/systemUICommon/Android.bp b/systemUI/common/Android.bp similarity index 100% rename from systemUICommon/Android.bp rename to systemUI/common/Android.bp diff --git a/systemUICommon/AndroidManifest.xml b/systemUI/common/AndroidManifest.xml similarity index 100% rename from systemUICommon/AndroidManifest.xml rename to systemUI/common/AndroidManifest.xml diff --git a/systemUICommon/OWNERS b/systemUI/common/OWNERS similarity index 100% rename from systemUICommon/OWNERS rename to systemUI/common/OWNERS diff --git a/systemUICommon/README.md b/systemUI/common/README.md similarity index 100% rename from systemUICommon/README.md rename to systemUI/common/README.md diff --git a/systemUICommon/build.gradle b/systemUI/common/build.gradle similarity index 100% rename from systemUICommon/build.gradle rename to systemUI/common/build.gradle diff --git a/systemUICommon/src/com/android/systemui/common/buffer/RingBuffer.kt b/systemUI/common/src/com/android/systemui/common/buffer/RingBuffer.kt similarity index 100% rename from systemUICommon/src/com/android/systemui/common/buffer/RingBuffer.kt rename to systemUI/common/src/com/android/systemui/common/buffer/RingBuffer.kt diff --git a/systemUILog/.gitignore b/systemUI/log/.gitignore similarity index 100% rename from systemUILog/.gitignore rename to systemUI/log/.gitignore diff --git a/systemUILog/Android.bp b/systemUI/log/Android.bp similarity index 100% rename from systemUILog/Android.bp rename to systemUI/log/Android.bp diff --git a/systemUILog/AndroidManifest.xml b/systemUI/log/AndroidManifest.xml similarity index 100% rename from systemUILog/AndroidManifest.xml rename to systemUI/log/AndroidManifest.xml diff --git a/systemUILog/build.gradle b/systemUI/log/build.gradle similarity index 85% rename from systemUILog/build.gradle rename to systemUI/log/build.gradle index 74492854a5..b06b008ecd 100644 --- a/systemUILog/build.gradle +++ b/systemUI/log/build.gradle @@ -21,7 +21,7 @@ addFrameworkJar('framework-15.jar') compileOnlyCommonJars() dependencies { - compileOnly projects.systemUIPluginCore - compileOnly projects.systemUICommon + compileOnly projects.plugincore + compileOnly projects.common implementation 'com.google.errorprone:error_prone_annotations:2.36.0' } diff --git a/systemUILog/src/com/android/systemui/log/ConstantStringsLogger.kt b/systemUI/log/src/com/android/systemui/log/ConstantStringsLogger.kt similarity index 100% rename from systemUILog/src/com/android/systemui/log/ConstantStringsLogger.kt rename to systemUI/log/src/com/android/systemui/log/ConstantStringsLogger.kt diff --git a/systemUILog/src/com/android/systemui/log/ConstantStringsLoggerImpl.kt b/systemUI/log/src/com/android/systemui/log/ConstantStringsLoggerImpl.kt similarity index 100% rename from systemUILog/src/com/android/systemui/log/ConstantStringsLoggerImpl.kt rename to systemUI/log/src/com/android/systemui/log/ConstantStringsLoggerImpl.kt diff --git a/systemUILog/src/com/android/systemui/log/LogBuffer.kt b/systemUI/log/src/com/android/systemui/log/LogBuffer.kt similarity index 100% rename from systemUILog/src/com/android/systemui/log/LogBuffer.kt rename to systemUI/log/src/com/android/systemui/log/LogBuffer.kt diff --git a/systemUILog/src/com/android/systemui/log/LogMessageImpl.kt b/systemUI/log/src/com/android/systemui/log/LogMessageImpl.kt similarity index 100% rename from systemUILog/src/com/android/systemui/log/LogMessageImpl.kt rename to systemUI/log/src/com/android/systemui/log/LogMessageImpl.kt diff --git a/systemUILog/src/com/android/systemui/log/LogcatEchoTracker.kt b/systemUI/log/src/com/android/systemui/log/LogcatEchoTracker.kt similarity index 100% rename from systemUILog/src/com/android/systemui/log/LogcatEchoTracker.kt rename to systemUI/log/src/com/android/systemui/log/LogcatEchoTracker.kt diff --git a/systemUILog/src/com/android/systemui/log/core/LogLevel.kt b/systemUI/log/src/com/android/systemui/log/core/LogLevel.kt similarity index 100% rename from systemUILog/src/com/android/systemui/log/core/LogLevel.kt rename to systemUI/log/src/com/android/systemui/log/core/LogLevel.kt diff --git a/systemUILog/src/com/android/systemui/log/core/LogMessage.kt b/systemUI/log/src/com/android/systemui/log/core/LogMessage.kt similarity index 100% rename from systemUILog/src/com/android/systemui/log/core/LogMessage.kt rename to systemUI/log/src/com/android/systemui/log/core/LogMessage.kt diff --git a/systemUILog/src/com/android/systemui/log/core/LogcatOnlyMessageBuffer.kt b/systemUI/log/src/com/android/systemui/log/core/LogcatOnlyMessageBuffer.kt similarity index 100% rename from systemUILog/src/com/android/systemui/log/core/LogcatOnlyMessageBuffer.kt rename to systemUI/log/src/com/android/systemui/log/core/LogcatOnlyMessageBuffer.kt diff --git a/systemUILog/src/com/android/systemui/log/core/Logger.kt b/systemUI/log/src/com/android/systemui/log/core/Logger.kt similarity index 100% rename from systemUILog/src/com/android/systemui/log/core/Logger.kt rename to systemUI/log/src/com/android/systemui/log/core/Logger.kt diff --git a/systemUILog/src/com/android/systemui/log/core/MessageBuffer.kt b/systemUI/log/src/com/android/systemui/log/core/MessageBuffer.kt similarity index 100% rename from systemUILog/src/com/android/systemui/log/core/MessageBuffer.kt rename to systemUI/log/src/com/android/systemui/log/core/MessageBuffer.kt diff --git a/systemUIPlugin/Android.bp b/systemUI/plugin/Android.bp similarity index 100% rename from systemUIPlugin/Android.bp rename to systemUI/plugin/Android.bp diff --git a/systemUIPlugin/AndroidManifest.xml b/systemUI/plugin/AndroidManifest.xml similarity index 100% rename from systemUIPlugin/AndroidManifest.xml rename to systemUI/plugin/AndroidManifest.xml diff --git a/systemUIPlugin/ExamplePlugin/Android.bp b/systemUI/plugin/ExamplePlugin/Android.bp similarity index 100% rename from systemUIPlugin/ExamplePlugin/Android.bp rename to systemUI/plugin/ExamplePlugin/Android.bp diff --git a/systemUIPlugin/ExamplePlugin/AndroidManifest.xml b/systemUI/plugin/ExamplePlugin/AndroidManifest.xml similarity index 100% rename from systemUIPlugin/ExamplePlugin/AndroidManifest.xml rename to systemUI/plugin/ExamplePlugin/AndroidManifest.xml diff --git a/systemUIPlugin/ExamplePlugin/res/layout/colored_overlay.xml b/systemUI/plugin/ExamplePlugin/res/layout/colored_overlay.xml similarity index 100% rename from systemUIPlugin/ExamplePlugin/res/layout/colored_overlay.xml rename to systemUI/plugin/ExamplePlugin/res/layout/colored_overlay.xml diff --git a/systemUIPlugin/ExamplePlugin/res/layout/plugin_settings.xml b/systemUI/plugin/ExamplePlugin/res/layout/plugin_settings.xml similarity index 100% rename from systemUIPlugin/ExamplePlugin/res/layout/plugin_settings.xml rename to systemUI/plugin/ExamplePlugin/res/layout/plugin_settings.xml diff --git a/systemUIPlugin/ExamplePlugin/res/values/strings.xml b/systemUI/plugin/ExamplePlugin/res/values/strings.xml similarity index 100% rename from systemUIPlugin/ExamplePlugin/res/values/strings.xml rename to systemUI/plugin/ExamplePlugin/res/values/strings.xml diff --git a/systemUIPlugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/CustomView.java b/systemUI/plugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/CustomView.java similarity index 100% rename from systemUIPlugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/CustomView.java rename to systemUI/plugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/CustomView.java diff --git a/systemUIPlugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/PluginSettings.java b/systemUI/plugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/PluginSettings.java similarity index 100% rename from systemUIPlugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/PluginSettings.java rename to systemUI/plugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/PluginSettings.java diff --git a/systemUIPlugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/SampleOverlayPlugin.java b/systemUI/plugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/SampleOverlayPlugin.java similarity index 100% rename from systemUIPlugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/SampleOverlayPlugin.java rename to systemUI/plugin/ExamplePlugin/src/com/android/systemui/plugin/testoverlayplugin/SampleOverlayPlugin.java diff --git a/systemUIPlugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceConfigPlugin.kt b/systemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceConfigPlugin.kt similarity index 100% rename from systemUIPlugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceConfigPlugin.kt rename to systemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceConfigPlugin.kt diff --git a/systemUIPlugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java b/systemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java similarity index 100% rename from systemUIPlugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java rename to systemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java diff --git a/systemUIPlugin/build.gradle b/systemUI/plugin/build.gradle similarity index 79% rename from systemUIPlugin/build.gradle rename to systemUI/plugin/build.gradle index 5b6b034dee..63c01fb404 100644 --- a/systemUIPlugin/build.gradle +++ b/systemUI/plugin/build.gradle @@ -22,7 +22,7 @@ addFrameworkJar('framework-15.jar') compileOnlyCommonJars() dependencies { - compileOnly projects.systemUIPluginCore - compileOnly projects.systemUILog - compileOnly projects.systemUIAnim + compileOnly projects.plugincore + compileOnly projects.log + compileOnly projects.anim } diff --git a/systemUIPlugin/src/com/android/systemui/plugins/ActivityStarter.java b/systemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/ActivityStarter.java rename to systemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/DarkIconDispatcher.java b/systemUI/plugin/src/com/android/systemui/plugins/DarkIconDispatcher.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/DarkIconDispatcher.java rename to systemUI/plugin/src/com/android/systemui/plugins/DarkIconDispatcher.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/DozeServicePlugin.java b/systemUI/plugin/src/com/android/systemui/plugins/DozeServicePlugin.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/DozeServicePlugin.java rename to systemUI/plugin/src/com/android/systemui/plugins/DozeServicePlugin.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/FalsingManager.java b/systemUI/plugin/src/com/android/systemui/plugins/FalsingManager.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/FalsingManager.java rename to systemUI/plugin/src/com/android/systemui/plugins/FalsingManager.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/FalsingPlugin.java b/systemUI/plugin/src/com/android/systemui/plugins/FalsingPlugin.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/FalsingPlugin.java rename to systemUI/plugin/src/com/android/systemui/plugins/FalsingPlugin.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/FragmentBase.java b/systemUI/plugin/src/com/android/systemui/plugins/FragmentBase.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/FragmentBase.java rename to systemUI/plugin/src/com/android/systemui/plugins/FragmentBase.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/GlobalActions.java b/systemUI/plugin/src/com/android/systemui/plugins/GlobalActions.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/GlobalActions.java rename to systemUI/plugin/src/com/android/systemui/plugins/GlobalActions.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/GlobalActionsPanelPlugin.java b/systemUI/plugin/src/com/android/systemui/plugins/GlobalActionsPanelPlugin.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/GlobalActionsPanelPlugin.java rename to systemUI/plugin/src/com/android/systemui/plugins/GlobalActionsPanelPlugin.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/IntentButtonProvider.java b/systemUI/plugin/src/com/android/systemui/plugins/IntentButtonProvider.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/IntentButtonProvider.java rename to systemUI/plugin/src/com/android/systemui/plugins/IntentButtonProvider.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java b/systemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java rename to systemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/NotificationListenerController.java b/systemUI/plugin/src/com/android/systemui/plugins/NotificationListenerController.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/NotificationListenerController.java rename to systemUI/plugin/src/com/android/systemui/plugins/NotificationListenerController.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/NotificationPersonExtractorPlugin.java b/systemUI/plugin/src/com/android/systemui/plugins/NotificationPersonExtractorPlugin.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/NotificationPersonExtractorPlugin.java rename to systemUI/plugin/src/com/android/systemui/plugins/NotificationPersonExtractorPlugin.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/OverlayPlugin.java b/systemUI/plugin/src/com/android/systemui/plugins/OverlayPlugin.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/OverlayPlugin.java rename to systemUI/plugin/src/com/android/systemui/plugins/OverlayPlugin.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/PluginDependency.java b/systemUI/plugin/src/com/android/systemui/plugins/PluginDependency.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/PluginDependency.java rename to systemUI/plugin/src/com/android/systemui/plugins/PluginDependency.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/PluginUtils.java b/systemUI/plugin/src/com/android/systemui/plugins/PluginUtils.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/PluginUtils.java rename to systemUI/plugin/src/com/android/systemui/plugins/PluginUtils.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/SensorManagerPlugin.java b/systemUI/plugin/src/com/android/systemui/plugins/SensorManagerPlugin.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/SensorManagerPlugin.java rename to systemUI/plugin/src/com/android/systemui/plugins/SensorManagerPlugin.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/ToastPlugin.java b/systemUI/plugin/src/com/android/systemui/plugins/ToastPlugin.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/ToastPlugin.java rename to systemUI/plugin/src/com/android/systemui/plugins/ToastPlugin.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/ViewProvider.java b/systemUI/plugin/src/com/android/systemui/plugins/ViewProvider.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/ViewProvider.java rename to systemUI/plugin/src/com/android/systemui/plugins/ViewProvider.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/VolumeDialog.java b/systemUI/plugin/src/com/android/systemui/plugins/VolumeDialog.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/VolumeDialog.java rename to systemUI/plugin/src/com/android/systemui/plugins/VolumeDialog.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/VolumeDialogController.java b/systemUI/plugin/src/com/android/systemui/plugins/VolumeDialogController.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/VolumeDialogController.java rename to systemUI/plugin/src/com/android/systemui/plugins/VolumeDialogController.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/clocks/AlarmData.kt b/systemUI/plugin/src/com/android/systemui/plugins/clocks/AlarmData.kt similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/clocks/AlarmData.kt rename to systemUI/plugin/src/com/android/systemui/plugins/clocks/AlarmData.kt diff --git a/systemUIPlugin/src/com/android/systemui/plugins/clocks/ClockProviderPlugin.kt b/systemUI/plugin/src/com/android/systemui/plugins/clocks/ClockProviderPlugin.kt similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/clocks/ClockProviderPlugin.kt rename to systemUI/plugin/src/com/android/systemui/plugins/clocks/ClockProviderPlugin.kt diff --git a/systemUIPlugin/src/com/android/systemui/plugins/clocks/WeatherData.kt b/systemUI/plugin/src/com/android/systemui/plugins/clocks/WeatherData.kt similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/clocks/WeatherData.kt rename to systemUI/plugin/src/com/android/systemui/plugins/clocks/WeatherData.kt diff --git a/systemUIPlugin/src/com/android/systemui/plugins/clocks/ZenData.kt b/systemUI/plugin/src/com/android/systemui/plugins/clocks/ZenData.kt similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/clocks/ZenData.kt rename to systemUI/plugin/src/com/android/systemui/plugins/clocks/ZenData.kt diff --git a/systemUIPlugin/src/com/android/systemui/plugins/log/TableLogBufferBase.kt b/systemUI/plugin/src/com/android/systemui/plugins/log/TableLogBufferBase.kt similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/log/TableLogBufferBase.kt rename to systemUI/plugin/src/com/android/systemui/plugins/log/TableLogBufferBase.kt diff --git a/systemUIPlugin/src/com/android/systemui/plugins/qs/QS.java b/systemUI/plugin/src/com/android/systemui/plugins/qs/QS.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/qs/QS.java rename to systemUI/plugin/src/com/android/systemui/plugins/qs/QS.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/qs/QSContainerController.kt b/systemUI/plugin/src/com/android/systemui/plugins/qs/QSContainerController.kt similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/qs/QSContainerController.kt rename to systemUI/plugin/src/com/android/systemui/plugins/qs/QSContainerController.kt diff --git a/systemUIPlugin/src/com/android/systemui/plugins/qs/QSFactory.java b/systemUI/plugin/src/com/android/systemui/plugins/qs/QSFactory.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/qs/QSFactory.java rename to systemUI/plugin/src/com/android/systemui/plugins/qs/QSFactory.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/qs/QSIconView.java b/systemUI/plugin/src/com/android/systemui/plugins/qs/QSIconView.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/qs/QSIconView.java rename to systemUI/plugin/src/com/android/systemui/plugins/qs/QSIconView.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/qs/QSTile.java b/systemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/qs/QSTile.java rename to systemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/qs/QSTileView.java b/systemUI/plugin/src/com/android/systemui/plugins/qs/QSTileView.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/qs/QSTileView.java rename to systemUI/plugin/src/com/android/systemui/plugins/qs/QSTileView.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/statusbar/DozeParameters.java b/systemUI/plugin/src/com/android/systemui/plugins/statusbar/DozeParameters.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/statusbar/DozeParameters.java rename to systemUI/plugin/src/com/android/systemui/plugins/statusbar/DozeParameters.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/statusbar/NotificationMenuRowPlugin.java b/systemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationMenuRowPlugin.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/statusbar/NotificationMenuRowPlugin.java rename to systemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationMenuRowPlugin.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/statusbar/NotificationSwipeActionHelper.java b/systemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationSwipeActionHelper.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/statusbar/NotificationSwipeActionHelper.java rename to systemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationSwipeActionHelper.java diff --git a/systemUIPlugin/src/com/android/systemui/plugins/statusbar/StatusBarStateController.java b/systemUI/plugin/src/com/android/systemui/plugins/statusbar/StatusBarStateController.java similarity index 100% rename from systemUIPlugin/src/com/android/systemui/plugins/statusbar/StatusBarStateController.java rename to systemUI/plugin/src/com/android/systemui/plugins/statusbar/StatusBarStateController.java diff --git a/systemUIPlugin/update_plugin_lib.sh b/systemUI/plugin/update_plugin_lib.sh similarity index 100% rename from systemUIPlugin/update_plugin_lib.sh rename to systemUI/plugin/update_plugin_lib.sh diff --git a/systemUIPluginCore/Android.bp b/systemUI/plugin_core/Android.bp similarity index 100% rename from systemUIPluginCore/Android.bp rename to systemUI/plugin_core/Android.bp diff --git a/systemUIPluginCore/AndroidManifest.xml b/systemUI/plugin_core/AndroidManifest.xml similarity index 100% rename from systemUIPluginCore/AndroidManifest.xml rename to systemUI/plugin_core/AndroidManifest.xml diff --git a/systemUIPluginCore/build.gradle b/systemUI/plugin_core/build.gradle similarity index 100% rename from systemUIPluginCore/build.gradle rename to systemUI/plugin_core/build.gradle diff --git a/systemUIPluginCore/proguard.flags b/systemUI/plugin_core/proguard.flags similarity index 100% rename from systemUIPluginCore/proguard.flags rename to systemUI/plugin_core/proguard.flags diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/Plugin.java b/systemUI/plugin_core/src/com/android/systemui/plugins/Plugin.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/Plugin.java rename to systemUI/plugin_core/src/com/android/systemui/plugins/Plugin.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/PluginFragment.java b/systemUI/plugin_core/src/com/android/systemui/plugins/PluginFragment.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/PluginFragment.java rename to systemUI/plugin_core/src/com/android/systemui/plugins/PluginFragment.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/PluginLifecycleManager.java b/systemUI/plugin_core/src/com/android/systemui/plugins/PluginLifecycleManager.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/PluginLifecycleManager.java rename to systemUI/plugin_core/src/com/android/systemui/plugins/PluginLifecycleManager.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/PluginListener.java b/systemUI/plugin_core/src/com/android/systemui/plugins/PluginListener.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/PluginListener.java rename to systemUI/plugin_core/src/com/android/systemui/plugins/PluginListener.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/PluginManager.java b/systemUI/plugin_core/src/com/android/systemui/plugins/PluginManager.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/PluginManager.java rename to systemUI/plugin_core/src/com/android/systemui/plugins/PluginManager.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Dependencies.java b/systemUI/plugin_core/src/com/android/systemui/plugins/annotations/Dependencies.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/annotations/Dependencies.java rename to systemUI/plugin_core/src/com/android/systemui/plugins/annotations/Dependencies.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/annotations/DependsOn.java b/systemUI/plugin_core/src/com/android/systemui/plugins/annotations/DependsOn.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/annotations/DependsOn.java rename to systemUI/plugin_core/src/com/android/systemui/plugins/annotations/DependsOn.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/annotations/ProvidesInterface.java b/systemUI/plugin_core/src/com/android/systemui/plugins/annotations/ProvidesInterface.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/annotations/ProvidesInterface.java rename to systemUI/plugin_core/src/com/android/systemui/plugins/annotations/ProvidesInterface.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requirements.java b/systemUI/plugin_core/src/com/android/systemui/plugins/annotations/Requirements.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requirements.java rename to systemUI/plugin_core/src/com/android/systemui/plugins/annotations/Requirements.java diff --git a/systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requires.java b/systemUI/plugin_core/src/com/android/systemui/plugins/annotations/Requires.java similarity index 100% rename from systemUIPluginCore/src/com/android/systemui/plugins/annotations/Requires.java rename to systemUI/plugin_core/src/com/android/systemui/plugins/annotations/Requires.java diff --git a/systemUIShared/Android.bp b/systemUI/shared/Android.bp similarity index 100% rename from systemUIShared/Android.bp rename to systemUI/shared/Android.bp diff --git a/systemUIShared/AndroidManifest.xml b/systemUI/shared/AndroidManifest.xml similarity index 100% rename from systemUIShared/AndroidManifest.xml rename to systemUI/shared/AndroidManifest.xml diff --git a/systemUIShared/build.gradle b/systemUI/shared/build.gradle similarity index 87% rename from systemUIShared/build.gradle rename to systemUI/shared/build.gradle index 6ed3c402fb..0fc210e5e7 100644 --- a/systemUIShared/build.gradle +++ b/systemUI/shared/build.gradle @@ -27,9 +27,9 @@ compileOnlyCommonJars() dependencies { compileOnly projects.hiddenApi - compileOnly projects.systemUnFold - compileOnly projects.systemUIPlugin - compileOnly projects.systemUIPluginCore + compileOnly projects.unfold + compileOnly projects.plugin + compileOnly projects.plugincore compileOnly projects.flags implementation "com.google.dagger:hilt-android:$daggerVersion" diff --git a/systemUIShared/res/values-my/bools.xml b/systemUI/shared/res/values-my/bools.xml similarity index 100% rename from systemUIShared/res/values-my/bools.xml rename to systemUI/shared/res/values-my/bools.xml diff --git a/systemUIShared/res/values/attrs.xml b/systemUI/shared/res/values/attrs.xml similarity index 100% rename from systemUIShared/res/values/attrs.xml rename to systemUI/shared/res/values/attrs.xml diff --git a/systemUIShared/res/values/bools.xml b/systemUI/shared/res/values/bools.xml similarity index 100% rename from systemUIShared/res/values/bools.xml rename to systemUI/shared/res/values/bools.xml diff --git a/systemUIShared/src/app/lawnchair/compat/LawnchairQuickstepCompat.kt b/systemUI/shared/src/app/lawnchair/compat/LawnchairQuickstepCompat.kt similarity index 100% rename from systemUIShared/src/app/lawnchair/compat/LawnchairQuickstepCompat.kt rename to systemUI/shared/src/app/lawnchair/compat/LawnchairQuickstepCompat.kt diff --git a/systemUIShared/src/com/android/internal/util/ScreenshotRequest.aidl b/systemUI/shared/src/com/android/internal/util/ScreenshotRequest.aidl similarity index 100% rename from systemUIShared/src/com/android/internal/util/ScreenshotRequest.aidl rename to systemUI/shared/src/com/android/internal/util/ScreenshotRequest.aidl diff --git a/systemUIShared/src/com/android/systemui/dagger/qualifiers/DisplaySpecific.kt b/systemUI/shared/src/com/android/systemui/dagger/qualifiers/DisplaySpecific.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/dagger/qualifiers/DisplaySpecific.kt rename to systemUI/shared/src/com/android/systemui/dagger/qualifiers/DisplaySpecific.kt diff --git a/systemUIShared/src/com/android/systemui/dagger/qualifiers/Main.java b/systemUI/shared/src/com/android/systemui/dagger/qualifiers/Main.java similarity index 100% rename from systemUIShared/src/com/android/systemui/dagger/qualifiers/Main.java rename to systemUI/shared/src/com/android/systemui/dagger/qualifiers/Main.java diff --git a/systemUIShared/src/com/android/systemui/dagger/qualifiers/Tracing.kt b/systemUI/shared/src/com/android/systemui/dagger/qualifiers/Tracing.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/dagger/qualifiers/Tracing.kt rename to systemUI/shared/src/com/android/systemui/dagger/qualifiers/Tracing.kt diff --git a/systemUIShared/src/com/android/systemui/dagger/qualifiers/UiBackground.java b/systemUI/shared/src/com/android/systemui/dagger/qualifiers/UiBackground.java similarity index 100% rename from systemUIShared/src/com/android/systemui/dagger/qualifiers/UiBackground.java rename to systemUI/shared/src/com/android/systemui/dagger/qualifiers/UiBackground.java diff --git a/systemUIShared/src/com/android/systemui/flags/Flag.kt b/systemUI/shared/src/com/android/systemui/flags/Flag.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/flags/Flag.kt rename to systemUI/shared/src/com/android/systemui/flags/Flag.kt diff --git a/systemUIShared/src/com/android/systemui/flags/FlagListenable.kt b/systemUI/shared/src/com/android/systemui/flags/FlagListenable.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/flags/FlagListenable.kt rename to systemUI/shared/src/com/android/systemui/flags/FlagListenable.kt diff --git a/systemUIShared/src/com/android/systemui/flags/FlagManager.kt b/systemUI/shared/src/com/android/systemui/flags/FlagManager.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/flags/FlagManager.kt rename to systemUI/shared/src/com/android/systemui/flags/FlagManager.kt diff --git a/systemUIShared/src/com/android/systemui/flags/FlagSerializer.kt b/systemUI/shared/src/com/android/systemui/flags/FlagSerializer.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/flags/FlagSerializer.kt rename to systemUI/shared/src/com/android/systemui/flags/FlagSerializer.kt diff --git a/systemUIShared/src/com/android/systemui/flags/FlagSettingsHelper.kt b/systemUI/shared/src/com/android/systemui/flags/FlagSettingsHelper.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/flags/FlagSettingsHelper.kt rename to systemUI/shared/src/com/android/systemui/flags/FlagSettingsHelper.kt diff --git a/systemUIShared/src/com/android/systemui/shared/animation/UnfoldConstantTranslateAnimator.kt b/systemUI/shared/src/com/android/systemui/shared/animation/UnfoldConstantTranslateAnimator.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/animation/UnfoldConstantTranslateAnimator.kt rename to systemUI/shared/src/com/android/systemui/shared/animation/UnfoldConstantTranslateAnimator.kt diff --git a/systemUIShared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt b/systemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt rename to systemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt diff --git a/systemUIShared/src/com/android/systemui/shared/condition/CombinedCondition.kt b/systemUI/shared/src/com/android/systemui/shared/condition/CombinedCondition.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/condition/CombinedCondition.kt rename to systemUI/shared/src/com/android/systemui/shared/condition/CombinedCondition.kt diff --git a/systemUIShared/src/com/android/systemui/shared/condition/Condition.java b/systemUI/shared/src/com/android/systemui/shared/condition/Condition.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/condition/Condition.java rename to systemUI/shared/src/com/android/systemui/shared/condition/Condition.java diff --git a/systemUIShared/src/com/android/systemui/shared/condition/ConditionExtensions.kt b/systemUI/shared/src/com/android/systemui/shared/condition/ConditionExtensions.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/condition/ConditionExtensions.kt rename to systemUI/shared/src/com/android/systemui/shared/condition/ConditionExtensions.kt diff --git a/systemUIShared/src/com/android/systemui/shared/condition/Evaluator.kt b/systemUI/shared/src/com/android/systemui/shared/condition/Evaluator.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/condition/Evaluator.kt rename to systemUI/shared/src/com/android/systemui/shared/condition/Evaluator.kt diff --git a/systemUIShared/src/com/android/systemui/shared/condition/Monitor.java b/systemUI/shared/src/com/android/systemui/shared/condition/Monitor.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/condition/Monitor.java rename to systemUI/shared/src/com/android/systemui/shared/condition/Monitor.java diff --git a/systemUIShared/src/com/android/systemui/shared/hardware/InputDevice.kt b/systemUI/shared/src/com/android/systemui/shared/hardware/InputDevice.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/hardware/InputDevice.kt rename to systemUI/shared/src/com/android/systemui/shared/hardware/InputDevice.kt diff --git a/systemUIShared/src/com/android/systemui/shared/hardware/InputManager.kt b/systemUI/shared/src/com/android/systemui/shared/hardware/InputManager.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/hardware/InputManager.kt rename to systemUI/shared/src/com/android/systemui/shared/hardware/InputManager.kt diff --git a/systemUIShared/src/com/android/systemui/shared/navigationbar/KeyButtonRipple.java b/systemUI/shared/src/com/android/systemui/shared/navigationbar/KeyButtonRipple.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/navigationbar/KeyButtonRipple.java rename to systemUI/shared/src/com/android/systemui/shared/navigationbar/KeyButtonRipple.java diff --git a/systemUIShared/src/com/android/systemui/shared/navigationbar/RegionSamplingHelper.java b/systemUI/shared/src/com/android/systemui/shared/navigationbar/RegionSamplingHelper.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/navigationbar/RegionSamplingHelper.java rename to systemUI/shared/src/com/android/systemui/shared/navigationbar/RegionSamplingHelper.java diff --git a/systemUIShared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java b/systemUI/shared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java rename to systemUI/shared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java diff --git a/systemUIShared/src/com/android/systemui/shared/plugins/PluginActionManager.java b/systemUI/shared/src/com/android/systemui/shared/plugins/PluginActionManager.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/plugins/PluginActionManager.java rename to systemUI/shared/src/com/android/systemui/shared/plugins/PluginActionManager.java diff --git a/systemUIShared/src/com/android/systemui/shared/plugins/PluginEnabler.java b/systemUI/shared/src/com/android/systemui/shared/plugins/PluginEnabler.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/plugins/PluginEnabler.java rename to systemUI/shared/src/com/android/systemui/shared/plugins/PluginEnabler.java diff --git a/systemUIShared/src/com/android/systemui/shared/plugins/PluginInstance.java b/systemUI/shared/src/com/android/systemui/shared/plugins/PluginInstance.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/plugins/PluginInstance.java rename to systemUI/shared/src/com/android/systemui/shared/plugins/PluginInstance.java diff --git a/systemUIShared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java b/systemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java rename to systemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java diff --git a/systemUIShared/src/com/android/systemui/shared/plugins/PluginPrefs.java b/systemUI/shared/src/com/android/systemui/shared/plugins/PluginPrefs.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/plugins/PluginPrefs.java rename to systemUI/shared/src/com/android/systemui/shared/plugins/PluginPrefs.java diff --git a/systemUIShared/src/com/android/systemui/shared/plugins/VersionInfo.java b/systemUI/shared/src/com/android/systemui/shared/plugins/VersionInfo.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/plugins/VersionInfo.java rename to systemUI/shared/src/com/android/systemui/shared/plugins/VersionInfo.java diff --git a/systemUIShared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl b/systemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl rename to systemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl diff --git a/systemUIShared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl b/systemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl rename to systemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl diff --git a/systemUIShared/src/com/android/systemui/shared/recents/model/Task.aidl b/systemUI/shared/src/com/android/systemui/shared/recents/model/Task.aidl similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/recents/model/Task.aidl rename to systemUI/shared/src/com/android/systemui/shared/recents/model/Task.aidl diff --git a/systemUIShared/src/com/android/systemui/shared/recents/model/Task.java b/systemUI/shared/src/com/android/systemui/shared/recents/model/Task.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/recents/model/Task.java rename to systemUI/shared/src/com/android/systemui/shared/recents/model/Task.java diff --git a/systemUIShared/src/com/android/systemui/shared/recents/model/ThumbnailData.kt b/systemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/recents/model/ThumbnailData.kt rename to systemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.kt diff --git a/systemUIShared/src/com/android/systemui/shared/recents/utilities/PreviewPositionHelper.java b/systemUI/shared/src/com/android/systemui/shared/recents/utilities/PreviewPositionHelper.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/recents/utilities/PreviewPositionHelper.java rename to systemUI/shared/src/com/android/systemui/shared/recents/utilities/PreviewPositionHelper.java diff --git a/systemUIShared/src/com/android/systemui/shared/recents/utilities/Utilities.java b/systemUI/shared/src/com/android/systemui/shared/recents/utilities/Utilities.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/recents/utilities/Utilities.java rename to systemUI/shared/src/com/android/systemui/shared/recents/utilities/Utilities.java diff --git a/systemUIShared/src/com/android/systemui/shared/recents/utilities/ViewRippler.java b/systemUI/shared/src/com/android/systemui/shared/recents/utilities/ViewRippler.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/recents/utilities/ViewRippler.java rename to systemUI/shared/src/com/android/systemui/shared/recents/utilities/ViewRippler.java diff --git a/systemUIShared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecCompat.java b/systemUI/shared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecCompat.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecCompat.java rename to systemUI/shared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecCompat.java diff --git a/systemUIShared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecsFuture.java b/systemUI/shared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecsFuture.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecsFuture.java rename to systemUI/shared/src/com/android/systemui/shared/recents/view/AppTransitionAnimationSpecsFuture.java diff --git a/systemUIShared/src/com/android/systemui/shared/recents/view/RecentsTransition.java b/systemUI/shared/src/com/android/systemui/shared/recents/view/RecentsTransition.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/recents/view/RecentsTransition.java rename to systemUI/shared/src/com/android/systemui/shared/recents/view/RecentsTransition.java diff --git a/systemUIShared/src/com/android/systemui/shared/regionsampling/RegionDarkness.kt b/systemUI/shared/src/com/android/systemui/shared/regionsampling/RegionDarkness.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/regionsampling/RegionDarkness.kt rename to systemUI/shared/src/com/android/systemui/shared/regionsampling/RegionDarkness.kt diff --git a/systemUIShared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt b/systemUI/shared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt rename to systemUI/shared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt diff --git a/systemUIShared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java b/systemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java rename to systemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java diff --git a/systemUIShared/src/com/android/systemui/shared/rotation/FloatingRotationButtonPositionCalculator.kt b/systemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButtonPositionCalculator.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/rotation/FloatingRotationButtonPositionCalculator.kt rename to systemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButtonPositionCalculator.kt diff --git a/systemUIShared/src/com/android/systemui/shared/rotation/FloatingRotationButtonView.java b/systemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButtonView.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/rotation/FloatingRotationButtonView.java rename to systemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButtonView.java diff --git a/systemUIShared/src/com/android/systemui/shared/rotation/RotationButton.java b/systemUI/shared/src/com/android/systemui/shared/rotation/RotationButton.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/rotation/RotationButton.java rename to systemUI/shared/src/com/android/systemui/shared/rotation/RotationButton.java diff --git a/systemUIShared/src/com/android/systemui/shared/rotation/RotationButtonController.java b/systemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/rotation/RotationButtonController.java rename to systemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java diff --git a/systemUIShared/src/com/android/systemui/shared/shadow/DoubleShadowIconDrawable.kt b/systemUI/shared/src/com/android/systemui/shared/shadow/DoubleShadowIconDrawable.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/shadow/DoubleShadowIconDrawable.kt rename to systemUI/shared/src/com/android/systemui/shared/shadow/DoubleShadowIconDrawable.kt diff --git a/systemUIShared/src/com/android/systemui/shared/shadow/DoubleShadowTextClock.kt b/systemUI/shared/src/com/android/systemui/shared/shadow/DoubleShadowTextClock.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/shadow/DoubleShadowTextClock.kt rename to systemUI/shared/src/com/android/systemui/shared/shadow/DoubleShadowTextClock.kt diff --git a/systemUIShared/src/com/android/systemui/shared/shadow/DoubleShadowTextHelper.kt b/systemUI/shared/src/com/android/systemui/shared/shadow/DoubleShadowTextHelper.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/shadow/DoubleShadowTextHelper.kt rename to systemUI/shared/src/com/android/systemui/shared/shadow/DoubleShadowTextHelper.kt diff --git a/systemUIShared/src/com/android/systemui/shared/shadow/DoubleShadowTextView.kt b/systemUI/shared/src/com/android/systemui/shared/shadow/DoubleShadowTextView.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/shadow/DoubleShadowTextView.kt rename to systemUI/shared/src/com/android/systemui/shared/shadow/DoubleShadowTextView.kt diff --git a/systemUIShared/src/com/android/systemui/shared/system/ActivityManagerKt.kt b/systemUI/shared/src/com/android/systemui/shared/system/ActivityManagerKt.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/ActivityManagerKt.kt rename to systemUI/shared/src/com/android/systemui/shared/system/ActivityManagerKt.kt diff --git a/systemUIShared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java b/systemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java rename to systemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/BlurUtils.java b/systemUI/shared/src/com/android/systemui/shared/system/BlurUtils.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/BlurUtils.java rename to systemUI/shared/src/com/android/systemui/shared/system/BlurUtils.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/DevicePolicyManagerWrapper.java b/systemUI/shared/src/com/android/systemui/shared/system/DevicePolicyManagerWrapper.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/DevicePolicyManagerWrapper.java rename to systemUI/shared/src/com/android/systemui/shared/system/DevicePolicyManagerWrapper.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/InputChannelCompat.java b/systemUI/shared/src/com/android/systemui/shared/system/InputChannelCompat.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/InputChannelCompat.java rename to systemUI/shared/src/com/android/systemui/shared/system/InputChannelCompat.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/InputConsumerController.java b/systemUI/shared/src/com/android/systemui/shared/system/InputConsumerController.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/InputConsumerController.java rename to systemUI/shared/src/com/android/systemui/shared/system/InputConsumerController.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/InputMonitorCompat.java b/systemUI/shared/src/com/android/systemui/shared/system/InputMonitorCompat.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/InputMonitorCompat.java rename to systemUI/shared/src/com/android/systemui/shared/system/InputMonitorCompat.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java b/systemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java rename to systemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/PackageManagerWrapper.java b/systemUI/shared/src/com/android/systemui/shared/system/PackageManagerWrapper.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/PackageManagerWrapper.java rename to systemUI/shared/src/com/android/systemui/shared/system/PackageManagerWrapper.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/PeopleProviderUtils.java b/systemUI/shared/src/com/android/systemui/shared/system/PeopleProviderUtils.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/PeopleProviderUtils.java rename to systemUI/shared/src/com/android/systemui/shared/system/PeopleProviderUtils.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/QuickStepContract.java b/systemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/QuickStepContract.java rename to systemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/RecentsAnimationControllerCompat.java b/systemUI/shared/src/com/android/systemui/shared/system/RecentsAnimationControllerCompat.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/RecentsAnimationControllerCompat.java rename to systemUI/shared/src/com/android/systemui/shared/system/RecentsAnimationControllerCompat.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/RecentsAnimationListener.java b/systemUI/shared/src/com/android/systemui/shared/system/RecentsAnimationListener.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/RecentsAnimationListener.java rename to systemUI/shared/src/com/android/systemui/shared/system/RecentsAnimationListener.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/SurfaceViewRequestReceiver.java b/systemUI/shared/src/com/android/systemui/shared/system/SurfaceViewRequestReceiver.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/SurfaceViewRequestReceiver.java rename to systemUI/shared/src/com/android/systemui/shared/system/SurfaceViewRequestReceiver.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/SurfaceViewRequestUtils.java b/systemUI/shared/src/com/android/systemui/shared/system/SurfaceViewRequestUtils.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/SurfaceViewRequestUtils.java rename to systemUI/shared/src/com/android/systemui/shared/system/SurfaceViewRequestUtils.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/TaskStackChangeListener.java b/systemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/TaskStackChangeListener.java rename to systemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java b/systemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java rename to systemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java diff --git a/systemUIShared/src/com/android/systemui/shared/system/UncaughtExceptionPreHandlerManager.kt b/systemUI/shared/src/com/android/systemui/shared/system/UncaughtExceptionPreHandlerManager.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/UncaughtExceptionPreHandlerManager.kt rename to systemUI/shared/src/com/android/systemui/shared/system/UncaughtExceptionPreHandlerManager.kt diff --git a/systemUIShared/src/com/android/systemui/shared/system/smartspace/ILauncherUnlockAnimationController.aidl b/systemUI/shared/src/com/android/systemui/shared/system/smartspace/ILauncherUnlockAnimationController.aidl similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/smartspace/ILauncherUnlockAnimationController.aidl rename to systemUI/shared/src/com/android/systemui/shared/system/smartspace/ILauncherUnlockAnimationController.aidl diff --git a/systemUIShared/src/com/android/systemui/shared/system/smartspace/ISysuiUnlockAnimationController.aidl b/systemUI/shared/src/com/android/systemui/shared/system/smartspace/ISysuiUnlockAnimationController.aidl similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/smartspace/ISysuiUnlockAnimationController.aidl rename to systemUI/shared/src/com/android/systemui/shared/system/smartspace/ISysuiUnlockAnimationController.aidl diff --git a/systemUIShared/src/com/android/systemui/shared/system/smartspace/SmartspaceState.aidl b/systemUI/shared/src/com/android/systemui/shared/system/smartspace/SmartspaceState.aidl similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/smartspace/SmartspaceState.aidl rename to systemUI/shared/src/com/android/systemui/shared/system/smartspace/SmartspaceState.aidl diff --git a/systemUIShared/src/com/android/systemui/shared/system/smartspace/SmartspaceState.kt b/systemUI/shared/src/com/android/systemui/shared/system/smartspace/SmartspaceState.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/shared/system/smartspace/SmartspaceState.kt rename to systemUI/shared/src/com/android/systemui/shared/system/smartspace/SmartspaceState.kt diff --git a/systemUIShared/src/com/android/systemui/statusbar/policy/CallbackController.java b/systemUI/shared/src/com/android/systemui/statusbar/policy/CallbackController.java similarity index 100% rename from systemUIShared/src/com/android/systemui/statusbar/policy/CallbackController.java rename to systemUI/shared/src/com/android/systemui/statusbar/policy/CallbackController.java diff --git a/systemUIShared/src/com/android/systemui/unfold/system/ActivityManagerActivityTypeProvider.kt b/systemUI/shared/src/com/android/systemui/unfold/system/ActivityManagerActivityTypeProvider.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/unfold/system/ActivityManagerActivityTypeProvider.kt rename to systemUI/shared/src/com/android/systemui/unfold/system/ActivityManagerActivityTypeProvider.kt diff --git a/systemUIShared/src/com/android/systemui/unfold/system/DeviceStateManagerFoldProvider.kt b/systemUI/shared/src/com/android/systemui/unfold/system/DeviceStateManagerFoldProvider.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/unfold/system/DeviceStateManagerFoldProvider.kt rename to systemUI/shared/src/com/android/systemui/unfold/system/DeviceStateManagerFoldProvider.kt diff --git a/systemUIShared/src/com/android/systemui/unfold/system/DeviceStateRepository.kt b/systemUI/shared/src/com/android/systemui/unfold/system/DeviceStateRepository.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/unfold/system/DeviceStateRepository.kt rename to systemUI/shared/src/com/android/systemui/unfold/system/DeviceStateRepository.kt diff --git a/systemUIShared/src/com/android/systemui/unfold/system/SystemUnfoldSharedModule.kt b/systemUI/shared/src/com/android/systemui/unfold/system/SystemUnfoldSharedModule.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/unfold/system/SystemUnfoldSharedModule.kt rename to systemUI/shared/src/com/android/systemui/unfold/system/SystemUnfoldSharedModule.kt diff --git a/systemUIShared/src/com/android/systemui/unfold/util/JankMonitorTransitionProgressListener.kt b/systemUI/shared/src/com/android/systemui/unfold/util/JankMonitorTransitionProgressListener.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/unfold/util/JankMonitorTransitionProgressListener.kt rename to systemUI/shared/src/com/android/systemui/unfold/util/JankMonitorTransitionProgressListener.kt diff --git a/systemUIShared/src/com/android/systemui/unfold/util/NaturalRotationUnfoldProgressProvider.kt b/systemUI/shared/src/com/android/systemui/unfold/util/NaturalRotationUnfoldProgressProvider.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/unfold/util/NaturalRotationUnfoldProgressProvider.kt rename to systemUI/shared/src/com/android/systemui/unfold/util/NaturalRotationUnfoldProgressProvider.kt diff --git a/systemUIShared/src/com/android/systemui/unfold/util/UnfoldOnlyProgressProvider.kt b/systemUI/shared/src/com/android/systemui/unfold/util/UnfoldOnlyProgressProvider.kt similarity index 100% rename from systemUIShared/src/com/android/systemui/unfold/util/UnfoldOnlyProgressProvider.kt rename to systemUI/shared/src/com/android/systemui/unfold/util/UnfoldOnlyProgressProvider.kt diff --git a/systemUnFold/build.gradle b/systemUI/unfold/build.gradle similarity index 91% rename from systemUnFold/build.gradle rename to systemUI/unfold/build.gradle index e3bf782d4c..914fd75d86 100644 --- a/systemUnFold/build.gradle +++ b/systemUI/unfold/build.gradle @@ -31,5 +31,4 @@ dependencies { implementation "androidx.lifecycle:lifecycle-common:2.8.7" compileOnly projects.androidxLib -// implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0' } diff --git a/systemUnFold/src/com/android/systemui/unfold/UnfoldRemoteModule.kt b/systemUI/unfold/src/com/android/systemui/unfold/UnfoldRemoteModule.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/UnfoldRemoteModule.kt rename to systemUI/unfold/src/com/android/systemui/unfold/UnfoldRemoteModule.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/UnfoldSharedComponent.kt b/systemUI/unfold/src/com/android/systemui/unfold/UnfoldSharedComponent.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/UnfoldSharedComponent.kt rename to systemUI/unfold/src/com/android/systemui/unfold/UnfoldSharedComponent.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/UnfoldSharedModule.kt b/systemUI/unfold/src/com/android/systemui/unfold/UnfoldSharedModule.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/UnfoldSharedModule.kt rename to systemUI/unfold/src/com/android/systemui/unfold/UnfoldSharedModule.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/UnfoldTransitionFactory.kt b/systemUI/unfold/src/com/android/systemui/unfold/UnfoldTransitionFactory.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/UnfoldTransitionFactory.kt rename to systemUI/unfold/src/com/android/systemui/unfold/UnfoldTransitionFactory.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/UnfoldTransitionProgressProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/UnfoldTransitionProgressProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/UnfoldTransitionProgressProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/UnfoldTransitionProgressProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/compat/ScreenSizeFoldProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/compat/ScreenSizeFoldProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/compat/ScreenSizeFoldProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/compat/ScreenSizeFoldProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/compat/SizeScreenStatusProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/compat/SizeScreenStatusProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/compat/SizeScreenStatusProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/compat/SizeScreenStatusProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/config/ResourceUnfoldTransitionConfig.kt b/systemUI/unfold/src/com/android/systemui/unfold/config/ResourceUnfoldTransitionConfig.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/config/ResourceUnfoldTransitionConfig.kt rename to systemUI/unfold/src/com/android/systemui/unfold/config/ResourceUnfoldTransitionConfig.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/config/UnfoldTransitionConfig.kt b/systemUI/unfold/src/com/android/systemui/unfold/config/UnfoldTransitionConfig.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/config/UnfoldTransitionConfig.kt rename to systemUI/unfold/src/com/android/systemui/unfold/config/UnfoldTransitionConfig.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/dagger/NaturalRotation.kt b/systemUI/unfold/src/com/android/systemui/unfold/dagger/NaturalRotation.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/dagger/NaturalRotation.kt rename to systemUI/unfold/src/com/android/systemui/unfold/dagger/NaturalRotation.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/dagger/UnfoldBg.kt b/systemUI/unfold/src/com/android/systemui/unfold/dagger/UnfoldBg.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/dagger/UnfoldBg.kt rename to systemUI/unfold/src/com/android/systemui/unfold/dagger/UnfoldBg.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/dagger/UnfoldBgProgressFlag.kt b/systemUI/unfold/src/com/android/systemui/unfold/dagger/UnfoldBgProgressFlag.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/dagger/UnfoldBgProgressFlag.kt rename to systemUI/unfold/src/com/android/systemui/unfold/dagger/UnfoldBgProgressFlag.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/dagger/UnfoldMain.kt b/systemUI/unfold/src/com/android/systemui/unfold/dagger/UnfoldMain.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/dagger/UnfoldMain.kt rename to systemUI/unfold/src/com/android/systemui/unfold/dagger/UnfoldMain.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/dagger/UnfoldSingleThreadBg.kt b/systemUI/unfold/src/com/android/systemui/unfold/dagger/UnfoldSingleThreadBg.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/dagger/UnfoldSingleThreadBg.kt rename to systemUI/unfold/src/com/android/systemui/unfold/dagger/UnfoldSingleThreadBg.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/dagger/UseReceivingFilter.kt b/systemUI/unfold/src/com/android/systemui/unfold/dagger/UseReceivingFilter.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/dagger/UseReceivingFilter.kt rename to systemUI/unfold/src/com/android/systemui/unfold/dagger/UseReceivingFilter.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/progress/FixedTimingTransitionProgressProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/progress/FixedTimingTransitionProgressProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/progress/FixedTimingTransitionProgressProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/progress/FixedTimingTransitionProgressProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/progress/IUnfoldAnimation.aidl b/systemUI/unfold/src/com/android/systemui/unfold/progress/IUnfoldAnimation.aidl similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/progress/IUnfoldAnimation.aidl rename to systemUI/unfold/src/com/android/systemui/unfold/progress/IUnfoldAnimation.aidl diff --git a/systemUnFold/src/com/android/systemui/unfold/progress/IUnfoldTransitionListener.aidl b/systemUI/unfold/src/com/android/systemui/unfold/progress/IUnfoldTransitionListener.aidl similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/progress/IUnfoldTransitionListener.aidl rename to systemUI/unfold/src/com/android/systemui/unfold/progress/IUnfoldTransitionListener.aidl diff --git a/systemUnFold/src/com/android/systemui/unfold/progress/MainThreadUnfoldTransitionProgressProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/progress/MainThreadUnfoldTransitionProgressProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/progress/MainThreadUnfoldTransitionProgressProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/progress/MainThreadUnfoldTransitionProgressProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/progress/PhysicsBasedUnfoldTransitionProgressProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/progress/PhysicsBasedUnfoldTransitionProgressProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/progress/PhysicsBasedUnfoldTransitionProgressProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/progress/PhysicsBasedUnfoldTransitionProgressProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/progress/RemoteUnfoldTransitionReceiver.kt b/systemUI/unfold/src/com/android/systemui/unfold/progress/RemoteUnfoldTransitionReceiver.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/progress/RemoteUnfoldTransitionReceiver.kt rename to systemUI/unfold/src/com/android/systemui/unfold/progress/RemoteUnfoldTransitionReceiver.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/progress/UnfoldFrameCallbackScheduler.kt b/systemUI/unfold/src/com/android/systemui/unfold/progress/UnfoldFrameCallbackScheduler.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/progress/UnfoldFrameCallbackScheduler.kt rename to systemUI/unfold/src/com/android/systemui/unfold/progress/UnfoldFrameCallbackScheduler.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/progress/UnfoldRemoteFilter.kt b/systemUI/unfold/src/com/android/systemui/unfold/progress/UnfoldRemoteFilter.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/progress/UnfoldRemoteFilter.kt rename to systemUI/unfold/src/com/android/systemui/unfold/progress/UnfoldRemoteFilter.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/progress/UnfoldTransitionProgressForwarder.kt b/systemUI/unfold/src/com/android/systemui/unfold/progress/UnfoldTransitionProgressForwarder.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/progress/UnfoldTransitionProgressForwarder.kt rename to systemUI/unfold/src/com/android/systemui/unfold/progress/UnfoldTransitionProgressForwarder.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/updates/FoldProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/updates/FoldProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/updates/FoldProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/updates/FoldProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/updates/FoldStateProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/updates/FoldStateProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/updates/FoldStateProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/updates/FoldStateProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/updates/RotationChangeProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/updates/RotationChangeProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/updates/RotationChangeProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/updates/RotationChangeProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/updates/hinge/EmptyHingeAngleProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/updates/hinge/EmptyHingeAngleProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/updates/hinge/EmptyHingeAngleProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/updates/hinge/EmptyHingeAngleProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/updates/hinge/HingeAngleProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/updates/hinge/HingeAngleProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/updates/hinge/HingeAngleProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/updates/hinge/HingeAngleProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/updates/hinge/HingeSensorAngleProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/updates/hinge/HingeSensorAngleProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/updates/hinge/HingeSensorAngleProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/updates/hinge/HingeSensorAngleProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/util/ATraceLoggerTransitionProgressListener.kt b/systemUI/unfold/src/com/android/systemui/unfold/util/ATraceLoggerTransitionProgressListener.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/util/ATraceLoggerTransitionProgressListener.kt rename to systemUI/unfold/src/com/android/systemui/unfold/util/ATraceLoggerTransitionProgressListener.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/util/CallbackController.kt b/systemUI/unfold/src/com/android/systemui/unfold/util/CallbackController.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/util/CallbackController.kt rename to systemUI/unfold/src/com/android/systemui/unfold/util/CallbackController.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/util/CurrentActivityTypeProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/util/CurrentActivityTypeProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/util/CurrentActivityTypeProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/util/CurrentActivityTypeProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/util/ScaleAwareTransitionProgressProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/util/ScaleAwareTransitionProgressProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/util/ScaleAwareTransitionProgressProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/util/ScaleAwareTransitionProgressProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/util/ScopedUnfoldTransitionProgressProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/util/ScopedUnfoldTransitionProgressProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/util/ScopedUnfoldTransitionProgressProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/util/ScopedUnfoldTransitionProgressProvider.kt diff --git a/systemUnFold/src/com/android/systemui/unfold/util/UnfoldKeyguardVisibilityProvider.kt b/systemUI/unfold/src/com/android/systemui/unfold/util/UnfoldKeyguardVisibilityProvider.kt similarity index 100% rename from systemUnFold/src/com/android/systemui/unfold/util/UnfoldKeyguardVisibilityProvider.kt rename to systemUI/unfold/src/com/android/systemui/unfold/util/UnfoldKeyguardVisibilityProvider.kt diff --git a/systemUIViewCapture/.gitignore b/systemUI/viewcapture/.gitignore similarity index 100% rename from systemUIViewCapture/.gitignore rename to systemUI/viewcapture/.gitignore diff --git a/systemUIViewCapture/Android.bp b/systemUI/viewcapture/Android.bp similarity index 100% rename from systemUIViewCapture/Android.bp rename to systemUI/viewcapture/Android.bp diff --git a/systemUIViewCapture/AndroidManifest.xml b/systemUI/viewcapture/AndroidManifest.xml similarity index 100% rename from systemUIViewCapture/AndroidManifest.xml rename to systemUI/viewcapture/AndroidManifest.xml diff --git a/systemUIViewCapture/OWNERS b/systemUI/viewcapture/OWNERS similarity index 100% rename from systemUIViewCapture/OWNERS rename to systemUI/viewcapture/OWNERS diff --git a/systemUIViewCapture/README.md b/systemUI/viewcapture/README.md similarity index 100% rename from systemUIViewCapture/README.md rename to systemUI/viewcapture/README.md diff --git a/systemUIViewCapture/TEST_MAPPING b/systemUI/viewcapture/TEST_MAPPING similarity index 100% rename from systemUIViewCapture/TEST_MAPPING rename to systemUI/viewcapture/TEST_MAPPING diff --git a/systemUIViewCapture/build.gradle b/systemUI/viewcapture/build.gradle similarity index 100% rename from systemUIViewCapture/build.gradle rename to systemUI/viewcapture/build.gradle diff --git a/systemUIViewCapture/src/com/android/app/viewcapture/LooperExecutor.java b/systemUI/viewcapture/src/com/android/app/viewcapture/LooperExecutor.java similarity index 100% rename from systemUIViewCapture/src/com/android/app/viewcapture/LooperExecutor.java rename to systemUI/viewcapture/src/com/android/app/viewcapture/LooperExecutor.java diff --git a/systemUIViewCapture/src/com/android/app/viewcapture/NoOpViewCapture.kt b/systemUI/viewcapture/src/com/android/app/viewcapture/NoOpViewCapture.kt similarity index 100% rename from systemUIViewCapture/src/com/android/app/viewcapture/NoOpViewCapture.kt rename to systemUI/viewcapture/src/com/android/app/viewcapture/NoOpViewCapture.kt diff --git a/systemUIViewCapture/src/com/android/app/viewcapture/PerfettoViewCapture.kt b/systemUI/viewcapture/src/com/android/app/viewcapture/PerfettoViewCapture.kt similarity index 100% rename from systemUIViewCapture/src/com/android/app/viewcapture/PerfettoViewCapture.kt rename to systemUI/viewcapture/src/com/android/app/viewcapture/PerfettoViewCapture.kt diff --git a/systemUIViewCapture/src/com/android/app/viewcapture/SettingsAwareViewCapture.kt b/systemUI/viewcapture/src/com/android/app/viewcapture/SettingsAwareViewCapture.kt similarity index 100% rename from systemUIViewCapture/src/com/android/app/viewcapture/SettingsAwareViewCapture.kt rename to systemUI/viewcapture/src/com/android/app/viewcapture/SettingsAwareViewCapture.kt diff --git a/systemUIViewCapture/src/com/android/app/viewcapture/SimpleViewCapture.kt b/systemUI/viewcapture/src/com/android/app/viewcapture/SimpleViewCapture.kt similarity index 100% rename from systemUIViewCapture/src/com/android/app/viewcapture/SimpleViewCapture.kt rename to systemUI/viewcapture/src/com/android/app/viewcapture/SimpleViewCapture.kt diff --git a/systemUIViewCapture/src/com/android/app/viewcapture/ViewCapture.java b/systemUI/viewcapture/src/com/android/app/viewcapture/ViewCapture.java similarity index 100% rename from systemUIViewCapture/src/com/android/app/viewcapture/ViewCapture.java rename to systemUI/viewcapture/src/com/android/app/viewcapture/ViewCapture.java diff --git a/systemUIViewCapture/src/com/android/app/viewcapture/ViewCaptureDataSource.java b/systemUI/viewcapture/src/com/android/app/viewcapture/ViewCaptureDataSource.java similarity index 100% rename from systemUIViewCapture/src/com/android/app/viewcapture/ViewCaptureDataSource.java rename to systemUI/viewcapture/src/com/android/app/viewcapture/ViewCaptureDataSource.java diff --git a/systemUIViewCapture/src/com/android/app/viewcapture/ViewCaptureFactory.kt b/systemUI/viewcapture/src/com/android/app/viewcapture/ViewCaptureFactory.kt similarity index 100% rename from systemUIViewCapture/src/com/android/app/viewcapture/ViewCaptureFactory.kt rename to systemUI/viewcapture/src/com/android/app/viewcapture/ViewCaptureFactory.kt diff --git a/systemUIViewCapture/src/com/android/app/viewcapture/proto/view_capture.proto b/systemUI/viewcapture/src/com/android/app/viewcapture/proto/view_capture.proto similarity index 100% rename from systemUIViewCapture/src/com/android/app/viewcapture/proto/view_capture.proto rename to systemUI/viewcapture/src/com/android/app/viewcapture/proto/view_capture.proto diff --git a/systemUIViewCapture/tests/AndroidManifest.xml b/systemUI/viewcapture/tests/AndroidManifest.xml similarity index 100% rename from systemUIViewCapture/tests/AndroidManifest.xml rename to systemUI/viewcapture/tests/AndroidManifest.xml diff --git a/systemUIViewCapture/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt b/systemUI/viewcapture/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt similarity index 100% rename from systemUIViewCapture/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt rename to systemUI/viewcapture/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt diff --git a/systemUIViewCapture/tests/com/android/app/viewcapture/TestActivity.kt b/systemUI/viewcapture/tests/com/android/app/viewcapture/TestActivity.kt similarity index 100% rename from systemUIViewCapture/tests/com/android/app/viewcapture/TestActivity.kt rename to systemUI/viewcapture/tests/com/android/app/viewcapture/TestActivity.kt diff --git a/systemUIViewCapture/tests/com/android/app/viewcapture/ViewCaptureTest.kt b/systemUI/viewcapture/tests/com/android/app/viewcapture/ViewCaptureTest.kt similarity index 100% rename from systemUIViewCapture/tests/com/android/app/viewcapture/ViewCaptureTest.kt rename to systemUI/viewcapture/tests/com/android/app/viewcapture/ViewCaptureTest.kt