diff options
| author | Android Dialer <noreply@google.com> | 2018-06-27 13:13:29 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-27 13:13:29 -0700 |
| commit | 95194792e7f479979bef3290165952480a97af58 (patch) | |
| tree | 3a32e17e1d9c79e8306119d817fd7964fbef82d1 /java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml | |
| parent | 9f15322971cf09dfed32517a575db887ca180f02 (diff) | |
| parent | cd5228be7f4f00d3972343c5c30ca6faebf86986 (diff) | |
Merge changes I0f1ed20a,Ia68d3b13,I72047d59,Ieff3c7fb,I53c3896a, ... am: 1b4ec7b954
am: cd5228be7f
Change-Id: I47f0dcffa5d58cf182bfd59a01ef8baac9e69204
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.xml | 7 |
1 files changed, 2 insertions, 5 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 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" |