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

Commit e0852d25 authored by Chun-Ku Lin's avatar Chun-Ku Lin Committed by Android (Google) Code Review
Browse files

Merge "Don't show quick settings tooltip if the user is in the Setup Wizard,... 

Merge "Don't show quick settings tooltip if the user is in the Setup Wizard, since the user can't access the Quick Settings Panel." into main
parents 3185a36b 0f2cc342

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ android_library { 
        "SettingsLib",

        "SettingsLibActivityEmbedding",

        "aconfig_settings_flags_lib",

        "accessibility_settings_flags_lib",

        "app-usage-event-protos-lite",

        "battery-event-protos-lite",

        "battery-usage-slot-protos-lite",

aconfig/Android.bp

+12 −1
Original line number Diff line number Diff line
@@ -36,3 +36,14 @@ java_aconfig_library { 
    name: "MediaDrmSettingsFlagsLib",

    aconfig_declarations: "media_drm_flags",

}



aconfig_declarations {

    name: "accessibility_flags",

    package: "com.android.settings.accessibility",

    srcs: ["accessibility/*.aconfig"],

}



java_aconfig_library {

    name: "accessibility_settings_flags_lib",

    aconfig_declarations: "accessibility_flags",

}

aconfig/accessibility/OWNERS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
include /src/com/android/settings/accessibility/OWNERS

aconfig/accessibility/accessibility_flags.aconfig

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



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



flag {

  name: "remove_qs_tooltip_in_suw"

  namespace: "accessibility"

  description: "Don't show quick settings tooltip in SUW, since the user can't use quick settings there."

  bug: "294560581"

}
 
 No newline at end of file

aconfig/settings_accessibility_flag_declarations.aconfig→aconfig/settings_accessibility_flag_declarations_legacy.aconfig

+3 −0
Original line number Diff line number Diff line 
package: "com.android.settings.flags"



# NOTE: Don't add new accessibility flags here, since the package name doesn't follow

# the best practice for setting's feature flag go/settings-trunk-stable



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



# NOTE: All Settings flags share the same Flags class, so prefix our