Add expressive design flag

Bug: 386013400
Flag: com.android.settingslib.flags.is_expressive_design_enabled
Test: manual test via build
Change-Id: I3f2b1dadf4aa238bec25f2af24225a1992971feb

4 files changed, 44 insertions, 5 deletions

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 69892f9ba103..b5e22f687a64 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -65,13 +65,13 @@ aconfig_declarations_group {
         "android.sdk.flags-aconfig-java",
         "android.security.flags-aconfig-java",
         "android.server.app.flags-aconfig-java",
+        "android.service.appprediction.flags-aconfig-java",
         "android.service.autofill.flags-aconfig-java",
         "android.service.chooser.flags-aconfig-java",
         "android.service.compat.flags-aconfig-java",
         "android.service.controls.flags-aconfig-java",
         "android.service.dreams.flags-aconfig-java",
         "android.service.notification.flags-aconfig-java",
-        "android.service.appprediction.flags-aconfig-java",
         "android.service.quickaccesswallet.flags-aconfig-java",
         "android.service.voice.flags-aconfig-java",
         "android.speech.flags-aconfig-java",
@@ -827,8 +827,8 @@ java_aconfig_library {
     min_sdk_version: "30",
     apex_available: [
         "//apex_available:platform",
-        "com.android.permission",
         "com.android.nfcservices",
+        "com.android.permission",
     ],
 }
 
@@ -1824,6 +1824,12 @@ java_aconfig_library {
     min_sdk_version: "30",
     apex_available: [
         "//apex_available:platform",
+        "com.android.adservices",
+        "com.android.cellbroadcast",
+        "com.android.devicelock",
+        "com.android.extservices",
+        "com.android.healthfitness",
+        "com.android.mediaprovider",
         "com.android.permission",
     ],
 }
diff --git a/packages/SettingsLib/SettingsTheme/Android.bp b/packages/SettingsLib/SettingsTheme/Android.bp
index 1661dfb2a86b..3e109f13ae7b 100644
--- a/packages/SettingsLib/SettingsTheme/Android.bp
+++ b/packages/SettingsLib/SettingsTheme/Android.bp
@@ -16,6 +16,7 @@ android_library {
     ],
     resource_dirs: ["res"],
     static_libs: [
+        "aconfig_settingslib_exported_flags_java_lib",
         "androidx.preference_preference",
         "com.google.android.material_material",
     ],
@@ -23,12 +24,12 @@ android_library {
     min_sdk_version: "21",
     apex_available: [
         "//apex_available:platform",
+        "com.android.adservices",
         "com.android.cellbroadcast",
         "com.android.devicelock",
         "com.android.extservices",
-        "com.android.permission",
-        "com.android.adservices",
         "com.android.healthfitness",
         "com.android.mediaprovider",
+        "com.android.permission",
     ],
 }
diff --git a/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsThemeHelper.kt b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsThemeHelper.kt
index 74f5441f6760..8223eff1e024 100644
--- a/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsThemeHelper.kt
+++ b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsThemeHelper.kt
@@ -18,6 +18,7 @@ package com.android.settingslib.widget
 
 import android.content.Context
 import android.os.Build
+import com.android.settingslib.flags.Flags
 
 object SettingsThemeHelper {
     private const val IS_EXPRESSIVE_DESIGN_ENABLED = "is_expressive_design_enabled"
@@ -49,7 +50,8 @@ object SettingsThemeHelper {
         expressiveThemeState =
             if (
                 (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) &&
-                        getPropBoolean(context, IS_EXPRESSIVE_DESIGN_ENABLED, false)
+                        (getPropBoolean(context, IS_EXPRESSIVE_DESIGN_ENABLED, false) ||
+                                Flags.isExpressiveDesignEnabled())
             ) {
                 ExpressiveThemeState.ENABLED
             } else {
diff --git a/packages/SettingsLib/aconfig/settingslib.aconfig b/packages/SettingsLib/aconfig/settingslib.aconfig
index bbe08f254283..71cf8f6ee53b 100644
--- a/packages/SettingsLib/aconfig/settingslib.aconfig
+++ b/packages/SettingsLib/aconfig/settingslib.aconfig
@@ -6,6 +6,7 @@ flag {
     namespace: "systemui"
     description: "Enable new status bar system icons"
     bug: "314812750"
+    is_exported: true
 }
 
 flag {
@@ -13,6 +14,7 @@ flag {
     namespace: "bluetooth"
     description: "Displays the auto on toggle in the bluetooth QS tile dialog"
     bug: "316985153"
+    is_exported: true
 }
 
 flag {
@@ -20,6 +22,7 @@ flag {
     namespace: "pixel_cross_device_control"
     description: "Gates the legacy le audio sharing UI."
     bug: "322295262"
+    is_exported: true
 }
 
 flag {
@@ -27,6 +30,7 @@ flag {
     namespace: "pixel_cross_device_control"
     description: "Gates whether to enable LE audio sharing"
     bug: "323125723"
+    is_exported: true
 }
 
 flag {
@@ -34,6 +38,7 @@ flag {
     namespace: "pixel_cross_device_control"
     description: "Gates whether to enable LE audio private broadcast sharing via QR code"
     bug: "323125723"
+    is_exported: true
 }
 
 flag {
@@ -41,6 +46,7 @@ flag {
     namespace: "dck_framework"
     description: "Hide exclusively managed Bluetooth devices in BT settings menu."
     bug: "324475542"
+    is_exported: true
 }
 
 flag {
@@ -48,6 +54,7 @@ flag {
     namespace: "bluetooth"
     description: "Enable setting preferred transport for Le Audio device"
     bug: "330581926"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
@@ -58,6 +65,7 @@ flag {
     namespace: "pixel_cross_device_control"
     description: "Use metadata instead of device type to determine whether a bluetooth device should use advanced details header."
     bug: "328556903"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
@@ -68,6 +76,7 @@ flag {
     namespace: "cross_device_experiences"
     description: "Use bluetooth profile connection policy to determine spatial audio attributes"
     bug: "341005211"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
@@ -78,6 +87,7 @@ flag {
     namespace: "cross_device_experiences"
     description: "Gates whether to show separate volume bars during audio sharing"
     bug: "336716411"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
@@ -117,6 +127,7 @@ flag {
     namespace: "accessibility"
     description: "Changes the return value of HearingAidProfile.accessProfileEnabled() to true"
     bug: "356530795"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
@@ -127,6 +138,7 @@ flag {
     namespace: "cross_device_experiences"
     description: "Gates whether to enable fix for hysteresis mode"
     bug: "355222285"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
@@ -137,6 +149,7 @@ flag {
     namespace: "cross_device_experiences"
     description: "Gates whether to enable fix for member device active state sync on lea profile"
     bug: "364201289"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
@@ -147,6 +160,7 @@ flag {
     namespace: "cross_device_experiences"
     description: "Gates whether to enable audio sharing qs dialog improvement"
     bug: "360759048"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
@@ -157,6 +171,7 @@ flag {
     namespace: "cross_device_experiences"
     description: "Gates whether to enable audio sharing developer option"
     bug: "368401233"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
@@ -167,6 +182,7 @@ flag {
     namespace: "accessibility"
     description: "Enable the ambient volume control in device details and hearing devices dialog."
     bug: "357878944"
+    is_exported: true
 }
 
 flag {
@@ -174,6 +190,7 @@ flag {
     namespace: "android_settings"
     description: "Enable the user consent prompt before writing sensitive preferences via service"
     bug: "378552675"
+    is_exported: true
 }
 
 flag {
@@ -181,6 +198,7 @@ flag {
     namespace: "accessibility"
     description: "Enable the input routing control in device details and hearing devices dialog."
     bug: "349255906"
+    is_exported: true
 }
 
 flag {
@@ -188,6 +206,7 @@ flag {
     namespace: "accessibility"
     description: "Enable the connection status report for a set of hearing device."
     bug: "357882387"
+    is_exported: true
 }
 
 flag {
@@ -195,6 +214,7 @@ flag {
     namespace: "cross_device_experiences"
     description: "Do not show problem connecting message when Android Auto disconnect A2DP"
     bug: "381981752"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
@@ -205,6 +225,7 @@ flag {
     namespace: "cross_device_experiences"
     description: "Do not auto pick audio sharing fallback device in UI"
     bug: "383469911"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
@@ -215,7 +236,16 @@ flag {
     namespace: "cross_device_experiences"
     description: "UI changes for temporary bond devices in audio sharing."
     bug: "362859132"
+    is_exported: true
     metadata {
         purpose: PURPOSE_BUGFIX
     }
 }
+
+flag {
+    name: "is_expressive_design_enabled"
+    namespace: "android_settings"
+    description: "enable expressive design in Settings"
+    bug: "386013400"
+    is_exported: true
+}