Update SystemUI aconfig files to match new style
See go/sysui-aconfig-structure
Bug: 297872375
Test: build
Change-Id: Ide9ec71e572195d69f2e1995bd140b41f21e4041
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 2077af8..09a0d07 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -132,20 +132,6 @@
manifest: "AndroidManifest-res.xml",
}
-aconfig_declarations {
- name: "systemui_aconfig_flags",
- package: "com.android.systemui.aconfig",
- srcs: [
- "src/com/android/systemui/aconfig/systemui.aconfig",
- "src/com/android/systemui/accessibility/aconfig/accessibility.aconfig",
- ],
-}
-
-java_aconfig_library {
- name: "systemui_aconfig_flags_lib",
- aconfig_declarations: "systemui_aconfig_flags",
-}
-
android_library {
name: "SystemUI-core",
defaults: [
@@ -180,7 +166,7 @@
"SystemUISharedLib",
"SystemUI-statsd",
"SettingsLib",
- "systemui_aconfig_flags_lib",
+ "com_android_systemui_flags_lib",
"androidx.core_core-ktx",
"androidx.viewpager2_viewpager2",
"androidx.legacy_legacy-support-v4",
@@ -358,7 +344,7 @@
"SystemUICustomizationLib",
"SystemUI-statsd",
"SettingsLib",
- "systemui_aconfig_flags_lib",
+ "com_android_systemui_flags_lib",
"androidx.viewpager2_viewpager2",
"androidx.legacy_legacy-support-v4",
"androidx.recyclerview_recyclerview",
diff --git a/packages/SystemUI/aconfig/Android.bp b/packages/SystemUI/aconfig/Android.bp
new file mode 100644
index 0000000..c1390b2
--- /dev/null
+++ b/packages/SystemUI/aconfig/Android.bp
@@ -0,0 +1,13 @@
+aconfig_declarations {
+ name: "com_android_systemui_flags",
+ package: "com.android.systemui",
+ srcs: [
+ "systemui.aconfig",
+ "accessibility.aconfig",
+ ],
+}
+
+java_aconfig_library {
+ name: "com_android_systemui_flags_lib",
+ aconfig_declarations: "com_android_systemui_flags",
+}
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/aconfig/accessibility.aconfig b/packages/SystemUI/aconfig/accessibility.aconfig
similarity index 83%
rename from packages/SystemUI/src/com/android/systemui/accessibility/aconfig/accessibility.aconfig
rename to packages/SystemUI/aconfig/accessibility.aconfig
index 91c5551..8841967 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/aconfig/accessibility.aconfig
+++ b/packages/SystemUI/aconfig/accessibility.aconfig
@@ -1,7 +1,8 @@
-package: "com.android.systemui.aconfig"
+package: "com.android.systemui"
+
flag {
name: "floating_menu_overlaps_nav_bars_flag"
namespace: "accessibility"
description: "Adjusts bounds to allow the floating menu to render on top of navigation bars."
bug: "283768342"
-}
\ No newline at end of file
+}
diff --git a/packages/SystemUI/src/com/android/systemui/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig
similarity index 73%
rename from packages/SystemUI/src/com/android/systemui/aconfig/systemui.aconfig
rename to packages/SystemUI/aconfig/systemui.aconfig
index 2d6e257..70832f5 100644
--- a/packages/SystemUI/src/com/android/systemui/aconfig/systemui.aconfig
+++ b/packages/SystemUI/aconfig/systemui.aconfig
@@ -1,8 +1,8 @@
-package: "com.android.systemui.aconfig"
+package: "com.android.systemui"
flag {
name: "example_flag"
namespace: "systemui"
description: "An Example Flag"
bug: "292511372"
-}
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java
index f29077d..e1612b0 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java
@@ -38,7 +38,7 @@
import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate;
import com.android.internal.accessibility.dialog.AccessibilityTarget;
-import com.android.systemui.aconfig.Flags;
+import com.android.systemui.Flags;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewAppearance.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewAppearance.java
index 3822936..df2c05d 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewAppearance.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewAppearance.java
@@ -34,8 +34,8 @@
import androidx.annotation.DimenRes;
+import com.android.systemui.Flags;
import com.android.systemui.R;
-import com.android.systemui.aconfig.Flags;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerController.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerController.java
index cc18c30..1f54952 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerController.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerController.java
@@ -24,7 +24,7 @@
import android.view.WindowManager;
import android.view.accessibility.AccessibilityManager;
-import com.android.systemui.aconfig.Flags;
+import com.android.systemui.Flags;
import com.android.systemui.util.settings.SecureSettings;
/**
diff --git a/packages/SystemUI/src/com/android/systemui/aconfig/AConfigModule.kt b/packages/SystemUI/src/com/android/systemui/aconfig/AConfigModule.kt
index 251a699..fa61bba 100644
--- a/packages/SystemUI/src/com/android/systemui/aconfig/AConfigModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/aconfig/AConfigModule.kt
@@ -16,6 +16,8 @@
package com.android.systemui.aconfig
+import com.android.systemui.FeatureFlags
+import com.android.systemui.FeatureFlagsImpl
import com.android.systemui.dagger.SysUISingleton
import dagger.Module
import dagger.Provides