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

Commit c1dd3ab2 authored by Edgar Wang's avatar Edgar Wang
Browse files

Add expressive design flag 

Bug: 386013400
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Test: manual test via build & robotest
Change-Id: I584645e82fc55c2d1dc835180ba6b798bf8659e3
parent 9c46d15d

AconfigFlags.bp

+35 −0
Original line number Diff line number Diff line
@@ -1845,6 +1845,41 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// SettingsTheme Lib

aconfig_declarations {

    name: "aconfig_settings_theme_flags",

    package: "com.android.settingslib.widget.theme.flags",

    container: "system",

    exportable: true,

    srcs: [

        "packages/SettingsLib/SettingsTheme/aconfig/settingstheme.aconfig",

    ],

}



java_aconfig_library {

    name: "aconfig_settingstheme_exported_flags_java_lib",

    aconfig_declarations: "aconfig_settings_theme_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    mode: "exported",

    min_sdk_version: "21",

    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",

    ],

}



java_aconfig_library {

    name: "aconfig_settingstheme_flags_java_lib",

    aconfig_declarations: "aconfig_settings_theme_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Quick Access Wallet

aconfig_declarations {

    name: "android.service.quickaccesswallet.flags-aconfig",

packages/SettingsLib/SettingsTheme/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ android_library { 
    ],

    resource_dirs: ["res"],

    static_libs: [

        "aconfig_settingstheme_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",

    ],

}

packages/SettingsLib/SettingsTheme/aconfig/settingstheme.aconfig

0 → 100644
+10 −0
Original line number Diff line number Diff line 
package: "com.android.settingslib.widget.theme.flags"

container: "system"



flag {

    name: "is_expressive_design_enabled"

    namespace: "android_settings"

    description: "enable expressive design in Settings"

    bug: "386013400"

    is_exported: true

}
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsThemeHelper.kt

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settingslib.widget 


import android.content.Context

import android.os.Build

import com.android.settingslib.widget.theme.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 {