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

Commit f9b2ab02 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Inherit theme colorControlHighlight" into sc-dev am: 737d3777 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14460977

Change-Id: I3d2150aa857cd0375c1c300c4fb26261a7dd3c67
parents 97a2215e 737d3777

packages/SystemUI/res/values/styles.xml

+0 −2
Original line number Diff line number Diff line
@@ -342,7 +342,6 @@ 
        <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item>

        <item name="wallpaperTextColorAccent">@*android:color/system_accent1_100</item>

        <item name="android:colorError">@*android:color/error_color_material_dark</item>

        <item name="android:colorControlHighlight">@*android:color/primary_text_material_dark</item>

        <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>

        <item name="passwordStyle">@style/PasswordTheme</item>

        <item name="numPadKeyStyle">@style/NumPadKey</item>
@@ -359,7 +358,6 @@ 
        <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item>

        <item name="wallpaperTextColorAccent">@*android:color/system_accent2_600</item>

        <item name="android:colorError">@*android:color/error_color_material_light</item>

        <item name="android:colorControlHighlight">#40000000</item>

        <item name="shadowRadius">0</item>



        <!-- Needed for MediaRoute chooser dialog -->