summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/incall/impl/res
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-06-22 16:27:21 -0700
committerEric Erfanian <erfanian@google.com>2018-06-26 16:23:00 +0000
commitb6c615dba7609e5134e960a92e723cfeadfbc589 (patch)
tree1e3bf129126f76a8c2ab7a2e7130591ce54c2d05 /java/com/android/incallui/incall/impl/res
parent8ea0035f58ed06f2beb3a5d07c0ddb25814912f4 (diff)
UI refresh for voice call screen.
Bug: 79878432 Test: screen diff tests PiperOrigin-RevId: 201758864 Change-Id: Ib3ed6636df3d337cb2fa7c5f6d8f24da035cbd0c
Diffstat (limited to 'java/com/android/incallui/incall/impl/res')
-rw-r--r--java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml4
-rw-r--r--java/com/android/incallui/incall/impl/res/drawable/incall_button_background_checked.xml17
-rw-r--r--java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml3
3 files changed, 19 insertions, 5 deletions
diff --git a/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml b/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
index 000525f5f..292d91f9b 100644
--- a/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
+++ b/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
@@ -16,6 +16,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="?android:attr/colorPrimaryDark" android:state_checked="true"/>
- <item android:color="?android:attr/textColorPrimary"/>
+ <item android:color="?android:attr/colorBackground" android:state_checked="true"/>
+ <item android:color="?colorIcon"/>
</selector>
diff --git a/java/com/android/incallui/incall/impl/res/drawable/incall_button_background_checked.xml b/java/com/android/incallui/incall/impl/res/drawable/incall_button_background_checked.xml
index 73c6947e2..0d8732b4f 100644
--- a/java/com/android/incallui/incall/impl/res/drawable/incall_button_background_checked.xml
+++ b/java/com/android/incallui/incall/impl/res/drawable/incall_button_background_checked.xml
@@ -1,5 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2018 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
+ -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
- <solid android:color="@color/incall_button_white"/>
+ <solid android:color="?android:attr/textColorSecondary"/>
</shape>
diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
index 9cc599dc7..d200547b0 100644
--- a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
+++ b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
@@ -41,8 +41,7 @@
android:id="@id/contactgrid_avatar"
android:layout_width="@dimen/incall_avatar_size"
android:layout_height="@dimen/incall_avatar_size"
- android:layout_marginBottom="8dp"
- android:elevation="2dp"/>
+ android:layout_marginBottom="8dp"/>
<include
layout="@layout/incall_contactgrid_top_row"