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

Commit 16970b58 authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Fixes contrast on A11yMenu settings switch by using Settings theme." into main

parents 2ad9a8cf df0dd50c

packages/SystemUI/accessibility/accessibilitymenu/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ android_app { 
        "androidx.preference_preference",

        "androidx.viewpager_viewpager",

        "SettingsLibDisplayUtils",

        "SettingsLibSettingsTheme",

        "com_android_a11y_menu_flags_lib",

    ],

packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
            android:exported="true"

            android:label="@string/accessibility_menu_settings_name"

            android:launchMode="singleTop"

            android:theme="@style/AccessibilityMenuSettings">

            android:theme="@style/Theme.SettingsBase">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

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

+0 −7
Original line number Diff line number Diff line
@@ -8,10 +8,3 @@ flag { 
    description: "Hides the AccessibilityMenuService UI before taking action instead of after."

    bug: "292020123"

}
 


flag {

    name: "a11y_menu_settings_back_button_fix_and_large_button_sizing"

    namespace: "accessibility"

    description: "Provides/restores back button functionality for the a11yMenu settings page. Also, fixes sizing problems with large shortcut buttons."

    bug: "298467628"

}

packages/SystemUI/accessibility/accessibilitymenu/res/values-night/styles.xml

+0 −4
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 
-->



<resources>

  <style name="AccessibilityMenuSettings" parent="android:Theme.DeviceDefault.DayNight">

    <item name="android:windowLightStatusBar">false</item>

  </style>



  <!--Adds the theme to support SnackBar component and user configurable theme. -->

  <style name="ServiceTheme" parent="android:Theme.DeviceDefault.DayNight">

    <item name="android:colorControlNormal">@color/colorControlNormal</item>

packages/SystemUI/accessibility/accessibilitymenu/res/values/styles.xml

+0 −5
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ 
-->



<resources>

  <!--The theme is for preference CollapsingToolbarBaseActivity settings-->

  <style name="AccessibilityMenuSettings" parent="android:Theme.DeviceDefault.DayNight">

    <item name="android:windowLightStatusBar">true</item>

  </style>



  <!--Adds the theme to support SnackBar component and user configurable theme. -->

  <style name="ServiceTheme" parent="android:Theme.DeviceDefault.Light">

    <item name="android:colorControlNormal">@color/colorControlNormal</item>