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

Commit 156aa10f authored by Andrew Zeng's avatar Andrew Zeng Committed by Android (Google) Code Review
Browse files

Merge "Update watch global actions menu UI"

parents eaebd529 8f3b4d88

core/res/res/drawable-watch/global_actions_item_grey_background_shape.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

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

    <solid android:color="@color/wear_material_grey_900"/>

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

</shape>
 
 No newline at end of file

core/res/res/drawable-watch/global_actions_item_red_background_shape.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

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

    <solid android:color="@color/wear_material_red_mid"/>

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

</shape>
 
 No newline at end of file

core/res/res/layout-watch/global_actions_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
            android:textSize="15sp"

            android:letterSpacing="0.013"

            android:fadingEdgeLength="12dp"

            android:textColor="@android:color/white"

            android:textColor="?attr/textColorPrimary"

            android:layout_weight="1"

            android:fontFamily="google-sans-text-medium"

            android:layout_width="wrap_content"

core/res/res/values-watch/colors.xml

deleted100644 → 0
+0 −22
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>

    <!-- Wear Material standard colors -->

    <color name="wear_material_red_mid">#CC5D58</color>

    <color name="wear_material_grey_900">#202124</color>

</resources>
 
 No newline at end of file