Updated project directories for unified 'systemUI' folder (#5034)

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')

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'

systemUI/README.md

@@ -0,0 +1,3 @@
+# SystemUI Module
+
+https://android.googlesource.com/platform/frameworks/base/+/refs/heads/main/packages/SystemUI/

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'
 }

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
 }