summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-06-26 17:59:21 -0700
committerCopybara-Service <copybara-piper@google.com>2018-06-27 11:07:35 -0700
commit20f8f6018e0f80083ebbabb43965ec19996d5f87 (patch)
treeb147086efa2ac55191246ab98b0e8647ffc6925e
parent23c51ac27a5b3e99d9ce6a2509c8aa4ca14f2d17 (diff)
Update emergency call map and device number UI.
Bug: 79878432 Test: manual PiperOrigin-RevId: 202228927 Change-Id: Ia68d3b1366a36ba5bdde85049b1b23ca98495ed1
-rw-r--r--java/com/android/dialer/theme/common/res/values/text_styles.xml11
-rw-r--r--java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml7
-rw-r--r--java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml2
-rw-r--r--java/com/android/incallui/calllocation/impl/res/values/styles.xml47
-rw-r--r--java/com/android/incallui/contactgrid/res/layout/device_number_row.xml10
5 files changed, 18 insertions, 59 deletions
diff --git a/java/com/android/dialer/theme/common/res/values/text_styles.xml b/java/com/android/dialer/theme/common/res/values/text_styles.xml
index 0d1fd850e..df5dafa31 100644
--- a/java/com/android/dialer/theme/common/res/values/text_styles.xml
+++ b/java/com/android/dialer/theme/common/res/values/text_styles.xml
@@ -43,6 +43,12 @@
<item name="android:fontFamily">sans-serif-regular</item>
</style>
+ <style name="Dialer.TextAppearance.Primary2" parent="TextAppearance.AppCompat">
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
+ <item name="android:textSize">16sp</item>
+ <item name="android:fontFamily">sans-serif-regular</item>
+ </style>
+
<style name="Dialer.TextAppearance.Secondary" parent="TextAppearance.AppCompat">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textSize">14sp</item>
@@ -81,6 +87,11 @@
<item name="android:maxLines">1</item>
</style>
+ <style name="Dialer.TextAppearance.Primary2.Ellipsize">
+ <item name="android:ellipsize">end</item>
+ <item name="android:maxLines">1</item>
+ </style>
+
<style name="Dialer.TextAppearance.Secondary.Ellipsize">
<item name="android:ellipsize">end</item>
<item name="android:maxLines">1</item>
diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
index 3a68bd4f6..b5f1e4bb3 100644
--- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
+++ b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
@@ -118,9 +118,9 @@
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"/>
- <!-- TODO(a bug): textColorPrimary or textColorPrimaryInverse? -->
<TextView
android:id="@+id/incall_important_call_badge"
+ style="@style/Dialer.TextAppearance.SubHeader"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginTop="4dp"
@@ -129,7 +129,6 @@
android:gravity="center"
android:maxLines="1"
android:text="@string/call_incoming_important"
- style="@style/Dialer.TextAppearance.SubHeader"
android:textColor="?android:attr/colorBackground"/>
<FrameLayout
@@ -138,9 +137,7 @@
android:layout_height="wrap_content"/>
<include
- layout="@layout/device_number_row"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
+ layout="@layout/device_number_row"/>
<FrameLayout
android:id="@+id/incall_data_container"
diff --git a/java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml b/java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml
index 0bcba95f2..c0924468c 100644
--- a/java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml
+++ b/java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml
@@ -17,5 +17,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/ripple_material_light">
- <item android:drawable="@android:color/white"/>
+ <item android:drawable="?android:attr/colorBackgroundFloating"/>
</ripple>
diff --git a/java/com/android/incallui/calllocation/impl/res/values/styles.xml b/java/com/android/incallui/calllocation/impl/res/values/styles.xml
deleted file mode 100644
index 45e9c98d4..000000000
--- a/java/com/android/incallui/calllocation/impl/res/values/styles.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
- ~ 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
- -->
-<resources>
-
- <style name="LocationAddressTitleTextStyle">
- <item name="android:textSize">14sp</item>
- <item name="android:textColor">#dd000000</item>
- <item name="android:fontFamily">sans-serif-medium</item>
- </style>
-
- <style name="LocationAddressTextStyle">
- <item name="android:textSize">16sp</item>
- <item name="android:textColor">#dd000000</item>
- <item name="android:fontFamily">sans-serif</item>
- </style>
-
- <style name="LocationLatLongTextStyle">
- <item name="android:textSize">14sp</item>
- <item name="android:textColor">#88000000</item>
- <item name="android:fontFamily">sans-serif</item>
- </style>
-
- <style name="LocationLoadingTextStyle">
- <item name="android:textSize">14sp</item>
- <item name="android:textColor">#dd000000</item>
- <item name="android:fontFamily">sans-serif</item>
- </style>
-
- <style name="LocationErrorTextStyle">
- <item name="android:textSize">14sp</item>
- <item name="android:textColor">#dd000000</item>
- <item name="android:fontFamily">sans-serif</item>
- </style>
-</resources>
diff --git a/java/com/android/incallui/contactgrid/res/layout/device_number_row.xml b/java/com/android/incallui/contactgrid/res/layout/device_number_row.xml
index 4f8bbad5a..f4792d8ed 100644
--- a/java/com/android/incallui/contactgrid/res/layout/device_number_row.xml
+++ b/java/com/android/incallui/contactgrid/res/layout/device_number_row.xml
@@ -19,21 +19,19 @@
android:id="@+id/contactgrid_location_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
- android:layout_gravity="bottom"
- android:background="#D8D8D8"
+ android:background="@color/dialer_divider_line_color"
android:visibility="gone"/>
<TextView
android:id="@+id/contactgrid_device_number_text"
+ style="@style/Dialer.TextAppearance.Primary2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:padding="16dp"
- android:background="@android:color/white"
- android:elevation="2dp"
+ android:background="?android:attr/colorBackgroundFloating"
+ android:elevation="4dp"
android:gravity="start"
android:orientation="vertical"
- android:textColor="#DD000000"
- android:textSize="16sp"
android:visibility="gone"/>
</merge> \ No newline at end of file