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

Commit c62e4b3a authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge "Create dedicated aconfig folder for catalyst" into main

parents 662f5a6a 1aa2c777

aconfig/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ aconfig_declarations { 
    container: "system",

    srcs: [

        "*.aconfig",

        "catalyst/*.aconfig",

    ],

}

aconfig/catalyst/about_phone.aconfig

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

container: "system"



flag {

  name: "catalyst_legal_information"

  namespace: "android_settings"

  description: "Flag for Legal information"

  bug: "323791114"

}

aconfig/settings_flag_declarations.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -50,13 +50,6 @@ flag { 
    bug: "351884562"

}



flag {

  name: "catalyst_legal_information"

  namespace: "android_settings"

  description: "This flag controls the About phone > Legal information page migration"

  bug: "323791114"

}



flag {

    name: "updated_suggestion_card_aosp"

    namespace: "android_settings"