summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/res
diff options
context:
space:
mode:
authoryueg <yueg@google.com>2017-11-09 11:39:10 -0800
committerzachh <zachh@google.com>2017-11-12 02:50:48 +0000
commit8c47d75d9a128db66faf1e824f628ed5a1a87723 (patch)
tree84979a757648547e065cfc58bb718788607ad80d /java/com/android/incallui/res
parentaceaed335f7beb25c340b14a8960a60337dadd8d (diff)
Conferece call management screen UI adjustment.
Including: - change action icon color - hide TextView for name if name is empty - if name is empty, use number to generate avatar - don't show number type Bug: 67053842 Test: manual PiperOrigin-RevId: 175188810 Change-Id: I4ba40e5332d7b8567932360d36c8dc6ec3d604a5
Diffstat (limited to 'java/com/android/incallui/res')
-rw-r--r--java/com/android/incallui/res/layout/caller_in_conference.xml16
-rw-r--r--java/com/android/incallui/res/values/colors.xml2
2 files changed, 2 insertions, 16 deletions
diff --git a/java/com/android/incallui/res/layout/caller_in_conference.xml b/java/com/android/incallui/res/layout/caller_in_conference.xml
index 37918188f..be4eca5f6 100644
--- a/java/com/android/incallui/res/layout/caller_in_conference.xml
+++ b/java/com/android/incallui/res/layout/caller_in_conference.xml
@@ -82,18 +82,6 @@
android:textColor="@color/conference_call_manager_secondary_text_color"
android:textSize="14sp"/>
- <!-- Number type -->
- <TextView
- android:id="@+id/conferenceCallerNumberType"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="marquee"
- android:gravity="start"
- android:singleLine="true"
- android:textAllCaps="true"
- android:textColor="@color/conference_call_manager_secondary_text_color"
- android:textSize="12sp"/>
-
</LinearLayout> <!-- End of caller number -->
</LinearLayout> <!-- End of caller information -->
@@ -110,7 +98,7 @@
android:contentDescription="@string/goPrivate"
android:scaleType="center"
android:src="@drawable/ic_call_split_white_24dp"
- android:tint="@color/conference_call_manager_icon_color"/>
+ android:tint="@color/icon_color_grey"/>
<!-- "Disconnect" button which terminates the connection with this caller. -->
<ImageButton
@@ -123,6 +111,6 @@
android:contentDescription="@string/conference_caller_disconnect_content_description"
android:scaleType="center"
android:src="@drawable/quantum_ic_call_end_white_24"
- android:tint="@color/conference_call_manager_icon_color"/>
+ android:tint="@color/icon_color_grey"/>
</LinearLayout> <!-- End of single list element -->
diff --git a/java/com/android/incallui/res/values/colors.xml b/java/com/android/incallui/res/values/colors.xml
index 4bded7855..32da57b84 100644
--- a/java/com/android/incallui/res/values/colors.xml
+++ b/java/com/android/incallui/res/values/colors.xml
@@ -17,7 +17,6 @@
<resources>
<color name="conference_call_manager_caller_name_text_color">#4d4d4d</color>
- <color name="conference_call_manager_icon_color">#999999</color>
<!-- Used with some smaller texts in manage conference screen. -->
<color name="conference_call_manager_secondary_text_color">#999999</color>
@@ -34,7 +33,6 @@
These colors are also used by InCallUIMaterialColorMapUtils to generate
primary activity colors.
-
-->
<array name="background_colors">
<item>#00796B</item>