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

Commit 39d923d7 authored by Greg Kaiser's avatar Greg Kaiser Committed by Android (Google) Code Review
Browse files

Merge "Revert "Workaround for sysui studio builds"" into sc-dev

parents cb071176 624459fd

core/res/res/values/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -427,7 +427,4 @@ 
    <!-- Darkest shade of the secondary neutral color used by the system. Black.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_neutral2_1000">#000000</color>



    <!-- Exposes colorSurface in cases where it can't be directly referenced. -->

    <color name="surface_above_background">?attr/colorSurface</color>

</resources>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -4343,5 +4343,4 @@ 
  <java-symbol type="string" name="view_and_control_notification_content" />



  <java-symbol type="layout" name="notification_expand_button"/>

  <java-symbol type="color" name="surface_above_background" />

</resources>

packages/SystemUI/res-keyguard/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
*/

-->



<resources>

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

    <!-- Keyguard PIN pad styles -->

    <style name="Keyguard.TextView" parent="@android:style/Widget.DeviceDefault.TextView">

        <item name="android:textSize">@dimen/kg_status_line_font_size</item>
@@ -32,7 +32,7 @@ 
        <item name="android:stateListAnimator">@null</item>

    </style>

    <style name="NumPadKey" parent="Theme.SystemUI">

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

      <item name="android:colorControlNormal">?androidprv:attr/colorSurface</item>

      <item name="android:colorControlHighlight">?android:attr/colorAccent</item>

      <item name="android:background">@drawable/num_pad_key_background</item>

    </style>