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

Commit 840b33e3 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Automerger Merge Worker
Browse files

Merge "Set actionMenuTextColor in ActionBarThemeCommon" into udc-dev am: 06278b9e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/23690703



Change-Id: I0b2d29fea8f947f0a73aae63258d0460241a9c8f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75cf2979 06278b9e

res/values-night-v31/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 
  -->



<resources>

    <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">

        <item name="colorControlNormal">?android:textColorSecondary</item>

    <!--

    <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon">

        <item name="android:actionMenuTextColor">@*android:color/accent_device_default_dark</item>

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

    </style>

    -->



    <style name="TabTextAppearance" parent="@android:style/TextAppearance.Material.Medium">

        <item name="android:textSize">14sp</item>

res/values-v31/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 
    <item name="android:textSize">12sp</item>

  </style>



  <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">

    <item name="colorControlNormal">?android:textColorSecondary</item>

  <!--

  <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon">

    <item name="android:actionMenuTextColor">

      @*android:color/accent_device_default_light

    </item>

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

  </style>

  -->



  <style name="MaterialButton" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">

    <item name="android:textAppearance">@style/MaterialButtonTextAppearance

res/values/styles.xml

+11 −1
Original line number Diff line number Diff line
@@ -15,10 +15,20 @@ 
-->



<resources xmlns:android="http://schemas.android.com/apk/res/android">

    <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">

    <style name="ActionBarThemeCommon" parent="@style/ThemeOverlay.AppCompat.ActionBar">

        <item name="colorControlNormal">?android:textColorSecondary</item>

        <!-- Modern platform themes set actionMenuTextColor to textColorPrimary. For example,

             see Theme.Material in frameworks/base/core/res/res/values/themes_material.xml.

             However, if the platform theme does not set actionMenuTextColor we are going to

             crash, so let's set it here. Additionally, most of our ActionBarTheme themes

             override this -->

        <item name="android:actionMenuTextColor">?android:textColorPrimary</item>

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

    </style>



    <!-- This gets overridden for specific platform versions and/or configs -->

    <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon"/>



    <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">

        <!-- attr "height" was used by support lib should not in overlay scope -->

        <item name="height">@dimen/action_bar_size</item>