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

Commit 9072dcd8 authored by FEI WU's avatar FEI WU
Browse files

Update colorPrimary in watch

1. Update colorPrimary in watch. This value is only used for icons and
switch background on watch.

2. Replace hard coded color and disable alpha in switch track.

3. Rename watch_switch_track_mtrl_alpha to be  watch_switch_track_mtrl
since it's no longer a alpha mask.

Change-Id: Ia1eaae62a934c89e3ca6cc8736b256c552f0329b
parent d478287a
Loading
Loading
Loading
Loading
+8 −7
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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.
@@ -12,10 +15,8 @@
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="false">
        <bitmap android:alpha="0.1" android:src="@drawable/watch_switch_track_mtrl_alpha" />
    </item>
    <item>
        <bitmap android:alpha="0.2" android:src="@drawable/watch_switch_track_mtrl_alpha" />
    </item>
    <item android:state_enabled="false"
          android:alpha="?attr/disabledAlpha"
          android:color="?android:colorPrimary" />
    <item android:color="?android:colorPrimary" />
</selector>
 No newline at end of file
+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@
    android:thumb="@drawable/watch_switch_thumb_material_anim"
    android:thumbTint="@color/watch_switch_thumb_color_material"
    android:thumbTintMode="multiply"
    android:track="@drawable/watch_switch_track_material"
    android:track="@drawable/watch_switch_track_mtrl"
    android:trackTint="@color/watch_switch_track_color_material"
    android:focusable="false"
    android:clickable="false"
    android:background="@null" />
Loading