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

Commit a06440f8 authored by Evan Laird's avatar Evan Laird
Browse files

Define aconfig flags for settingslib 

Adds a settingslib.aconfig that is separate from the existing
settlingslib_media_flag_declarations.aconfig file. The existing aconfig
uses a media package and it seemed to make more sense to break out a
shared settlingslib flag file

The new file defines com.settingslib.flags.new_status_bar_icons

Test: compile
Test: settingslib robo tests, settingslib unit tests
Bug: 314812750
Flag: ACONFIG com.settingslib.flags.new_status_bar_icons DEVELOPMENT
Change-Id: I33399555c81acaed314e2b8dc2fed37ef7249050
parent 9d708f7e

packages/SettingsLib/Android.bp

+15 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ android_library { 
        "SettingsLibTwoTargetPreference",

        "SettingsLibUsageProgressBarPreference",

        "SettingsLibUtils",

        "settingslib_media_flags_lib",

        "settingslib_flags_lib",

    ],
@@ -78,6 +79,19 @@ aconfig_declarations { 
}



java_aconfig_library {

    name: "settingslib_flags_lib",

    name: "settingslib_media_flags_lib",

    aconfig_declarations: "settingslib_media_flags",

}



aconfig_declarations {

    name: "settingslib_flags",

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

    srcs: [

        "aconfig/settingslib.aconfig",

    ],

}



java_aconfig_library {

    name: "settingslib_flags_lib",

    aconfig_declarations: "settingslib_flags",

}

packages/SettingsLib/aconfig/settingslib.aconfig

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



flag {

    name: "new_status_bar_icons"

    namespace: "systemui"

    description: "Enable new status bar system icons"

    bug: "314812750"

}

packages/SettingsLib/tests/integ/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ android_test { 
        "SettingsLibDeviceStateRotationLock",

        "SettingsLibSettingsSpinner",

        "SettingsLibUsageProgressBarPreference",

        "settingslib_flags_lib",

        "settingslib_media_flags_lib",

    ],



    dxflags: ["--multi-dex"],

packages/SettingsLib/tests/robotests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ android_robolectric_test { 
        "androidx.test.core",

        "androidx.core_core",

        "flag-junit",

        "settingslib_flags_lib",

        "settingslib_media_flags_lib",

        "testng", // TODO: remove once JUnit on Android provides assertThrows

    ],

    java_resource_dirs: ["config"],