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

Commit 76524088 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "New color spec" into sc-dev

parents fd9477d7 73efcfcf

core/res/res/color/surface_light.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ 
     limitations under the License.

-->

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

    <item android:color="@color/system_neutral1_500" android:lStar="97" />

    <item android:color="@color/system_neutral1_500" android:lStar="98" />

</selector>

core/res/res/values/colors_device_defaults.xml

+3 −3
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ 
    <color name="accent_tertiary_variant_dark_device_default">@color/system_accent3_300</color>



    <!-- Background colors -->

    <color name="background_device_default_dark">@color/system_neutral1_800</color>

    <color name="background_device_default_dark">@color/system_neutral1_900</color>

    <color name="background_device_default_light">@color/system_neutral1_50</color>

    <color name="background_floating_device_default_dark">@color/system_neutral1_900</color>

    <color name="background_floating_device_default_light">@color/system_neutral1_100</color>

    <color name="background_floating_device_default_dark">@color/background_device_default_dark</color>

    <color name="background_floating_device_default_light">@color/background_device_default_light</color>



    <!-- Surface colors -->

    <color name="surface_header_dark">@color/system_neutral1_700</color>

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:attr/colorBackground</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>

packages/SystemUI/res/drawable/notification_guts_bg.xml

+3 −2
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ 
  ~ limitations under the License

  -->



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

    <solid android:color="?android:attr/colorBackground" />

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

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

    <solid android:color="?androidprv:attr/colorSurface" />

    <!--The radius is 1dp smaller than the notification one, to avoid aliasing bugs on the corners -->

    <corners android:radius="1dp" />

</shape>

packages/SystemUI/res/drawable/notification_material_bg.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,10 +16,11 @@ 
  -->



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

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

        android:color="@color/notification_ripple_untinted_color">

    <item>

        <shape>

            <solid android:color="?android:attr/colorBackground" />

            <solid android:color="?androidprv:attr/colorSurface" />

        </shape>

    </item>

</ripple>
 
 No newline at end of file