summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2018-06-26 16:04:53 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-06-26 16:04:53 -0700
commitbfd105673cd6eb21a1c207d24169ad9bfe645539 (patch)
tree198fcf37848a75c8d68f74679a56fd9dc0f4891b /java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
parentee0371753257a3db0cce37f5dffae7ac6ebf34b2 (diff)
parentf9d508090cbf3b9f85b72241c77f625c152448bc (diff)
Merge changes I45374e61,I265dcc61,Id4622886,I09d0df69,I3ea0fb46 am: 2f6900466e am: e6262b0bce
am: f9d508090c Change-Id: I329713a5083f5ccd632b536e41f466eaef9dc4e2
Diffstat (limited to 'java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml')
-rw-r--r--java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml9
1 files changed, 3 insertions, 6 deletions
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 1672bf984..3a68bd4f6 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
@@ -121,19 +121,16 @@
<!-- TODO(a bug): textColorPrimary or textColorPrimaryInverse? -->
<TextView
android:id="@+id/incall_important_call_badge"
- android:textStyle="bold"
android:layout_width="wrap_content"
- android:layout_height="48dp"
+ android:layout_height="32dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="@dimen/answer_importance_margin_bottom"
android:background="@drawable/urgent_call_background"
- android:elevation="@dimen/answer_data_elevation"
android:gravity="center"
android:maxLines="1"
android:text="@string/call_incoming_important"
- android:textAllCaps="true"
- android:textColor="?android:attr/colorBackground"
- android:textSize="14sp"/>
+ style="@style/Dialer.TextAppearance.SubHeader"
+ android:textColor="?android:attr/colorBackground"/>
<FrameLayout
android:id="@+id/incall_location_holder"