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

Commit 6d480c34 authored by Ned Burns's avatar Ned Burns
Browse files

Update SystemUI aconfig files to match new style 

See go/sysui-aconfig-structure

Bug: 297872375
Test: build
Change-Id: Ide9ec71e572195d69f2e1995bd140b41f21e4041
parent b472a2f4

packages/SystemUI/Android.bp

+2 −16
Original line number Diff line number Diff line
@@ -132,20 +132,6 @@ android_library { 
    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 @@ android_library { 
        "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 @@ android_library { 
        "SystemUICustomizationLib",

        "SystemUI-statsd",

        "SettingsLib",

        "systemui_aconfig_flags_lib",

        "com_android_systemui_flags_lib",

        "androidx.viewpager2_viewpager2",

        "androidx.legacy_legacy-support-v4",

        "androidx.recyclerview_recyclerview",

packages/SystemUI/aconfig/Android.bp

0 → 100644
+13 −0
Original line number Diff line number Diff line 
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",

}

packages/SystemUI/src/com/android/systemui/accessibility/aconfig/accessibility.aconfig→packages/SystemUI/aconfig/accessibility.aconfig

+3 −2
Original line number Diff line number Diff line 
package: "com.android.systemui.aconfig"

package: "com.android.systemui"



flag {

    name: "floating_menu_overlaps_nav_bars_flag"

    namespace: "accessibility"

packages/SystemUI/src/com/android/systemui/aconfig/systemui.aconfig→packages/SystemUI/aconfig/systemui.aconfig

+2 −2
Original line number Diff line number Diff line 
package: "com.android.systemui.aconfig"

package: "com.android.systemui"



flag {

    name: "example_flag"

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import androidx.recyclerview.widget.RecyclerView; 
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;