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

Commit 5eaccb5d authored by Dennis Shen's avatar Dennis Shen Committed by Android (Google) Code Review
Browse files

Merge changes Ie8f4efaa,Ic1af43cf into main 

* changes:
  set aconfig_declarations containers to system
  set aconfig_declarations containers to system
parents 60787eec 2e0aab39

packages/SystemUI/accessibility/accessibilitymenu/aconfig/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ package { 
aconfig_declarations {

    name: "com_android_a11y_menu_flags",

    package: "com.android.systemui.accessibility.accessibilitymenu",

    container: "system",

    srcs: [

        "accessibility.aconfig",

    ],

packages/SystemUI/accessibility/accessibilitymenu/aconfig/accessibility.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "com.android.systemui.accessibility.accessibilitymenu"

container: "system"



# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.

packages/SystemUI/aconfig/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ package { 
aconfig_declarations {

    name: "com_android_systemui_flags",

    package: "com.android.systemui",

    container: "system",

    srcs: [

        "*.aconfig",

    ],

packages/SystemUI/aconfig/accessibility.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "com.android.systemui"

container: "system"



# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.

packages/SystemUI/aconfig/biometrics_framework.aconfig

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

container: "system"



# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.