summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2018-06-04 11:16:21 -0700
committerCopybara-Service <copybara-piper@google.com>2018-06-04 12:25:54 -0700
commitaf13a9740331b6f515643f6560a9badb8c627f84 (patch)
treefc8bc02c5b8a3165b22653deafcb3d900b5ccdc1
parent203f1464310f8964169b9f540aa6874caca5ce71 (diff)
Fix video call icon color
It is a state list. TEST=manual Bug: 80315482 Test: manual PiperOrigin-RevId: 199162757 Change-Id: I3be255506871e0d32e5433c2a96bf620701b9c0d
-rw-r--r--java/com/android/incallui/video/impl/res/color/videocall_button_icon_tint.xml19
-rw-r--r--java/com/android/incallui/video/impl/res/values/styles.xml2
2 files changed, 18 insertions, 3 deletions
diff --git a/java/com/android/incallui/video/impl/res/color/videocall_button_icon_tint.xml b/java/com/android/incallui/video/impl/res/color/videocall_button_icon_tint.xml
index b46607b1b..bb0c7676f 100644
--- a/java/com/android/incallui/video/impl/res/color/videocall_button_icon_tint.xml
+++ b/java/com/android/incallui/video/impl/res/color/videocall_button_icon_tint.xml
@@ -1,5 +1,20 @@
<?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.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="#ff000000" android:state_checked="true"/>
- <item android:color="#ffffffff"/>
+ <item android:color="?android:attr/colorBackgroundFloating" android:state_checked="true"/>
+ <item android:color="?android:attr/textColorPrimary"/>
</selector>
diff --git a/java/com/android/incallui/video/impl/res/values/styles.xml b/java/com/android/incallui/video/impl/res/values/styles.xml
index 61360b6a4..03395d989 100644
--- a/java/com/android/incallui/video/impl/res/values/styles.xml
+++ b/java/com/android/incallui/video/impl/res/values/styles.xml
@@ -19,7 +19,7 @@
<item name="android:layout_height">@dimen/videocall_button_size</item>
<item name="android:layout_width">@dimen/videocall_button_size</item>
<item name="android:background">@drawable/videocall_video_button_background</item>
- <item name="android:tint">?android:attr/colorBackgroundFloating</item>
+ <item name="android:tint">@color/videocall_button_icon_tint</item>
<item name="android:tintMode">src_atop</item>
<item name="android:padding">@dimen/videocall_button_padding</item>
<item name="android:scaleType">fitCenter</item>