diff options
Diffstat (limited to 'java/com/android/incallui/res/layout')
-rw-r--r-- | java/com/android/incallui/res/layout/caller_in_conference.xml | 12 | ||||
-rw-r--r-- | java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml | 2 |
2 files changed, 7 insertions, 7 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 23bb28512..3f660c5b5 100644 --- a/java/com/android/incallui/res/layout/caller_in_conference.xml +++ b/java/com/android/incallui/res/layout/caller_in_conference.xml @@ -67,8 +67,8 @@ android:id="@+id/conferenceCallerStatus" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/SecondaryText" - android:textColor="@color/dialer_disabled_text_color" + style="@style/Dialer.TextAppearance.Secondary" + android:enabled="false" android:visibility="gone"/> <!-- Number --> @@ -93,12 +93,12 @@ android:id="@+id/conferenceCallerSeparate" android:layout_width="@dimen/conference_call_manager_button_dimension" android:layout_height="@dimen/conference_call_manager_button_dimension" - android:background="?android:selectableItemBackgroundBorderless" + android:background="?android:attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="@string/goPrivate" android:scaleType="center" android:src="@drawable/ic_call_split_white_24dp" - android:tint="@color/icon_color_grey"/> + android:tint="?colorIcon"/> <!-- "Disconnect" button which terminates the connection with this caller. --> <ImageButton @@ -106,11 +106,11 @@ android:layout_width="@dimen/conference_call_manager_button_dimension" android:layout_height="@dimen/conference_call_manager_button_dimension" android:layout_marginStart="8dp" - android:background="?android:selectableItemBackgroundBorderless" + android:background="?android:attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="@string/conference_caller_disconnect_content_description" android:scaleType="center" android:src="@drawable/quantum_ic_call_end_white_24" - android:tint="@color/icon_color_grey"/> + android:tint="?colorIcon"/> </LinearLayout> <!-- End of single list element --> diff --git a/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml b/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml index ab743eb89..2e40cabd3 100644 --- a/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml +++ b/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml @@ -70,7 +70,7 @@ android:layout_gravity="end" android:paddingStart="16dp" android:paddingEnd="16dp" - android:backgroundTint="@color/dialer_theme_color" + android:backgroundTint="?android:attr/colorPrimary" android:fontFamily="sans-serif-medium" android:stateListAnimator="@null" android:text="@string/rtt_button_accept_request" |