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

Commit fbc23bb0 authored by Shubham Basu's avatar Shubham Basu Committed by Android (Google) Code Review
Browse files

Merge "material next change for toolbar text" into sc-mainline-prod

parents 218267f1 0263e9d9
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2021 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  -->

<resources>
    <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
        <item name="colorControlNormal">?android:textColorSecondary</item>
        <item name="android:actionMenuTextColor">@*android:color/accent_device_default_dark</item>
        <item name="android:textAllCaps">false</item>
    </style>
</resources>
+7 −2
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
  ~ Copyright (C) 2021 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,4 +20,10 @@
        <item name="fontFamily">@string/config_fontFamilyMedium</item>
        <item name="android:textSize">12sp</item>
    </style>

    <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
        <item name="colorControlNormal">?android:textColorSecondary</item>
        <item name="android:actionMenuTextColor">@*android:color/accent_device_default_light</item>
        <item name="android:textAllCaps">false</item>
    </style>
</resources>