From cb39795cb8b91df33f304d8155f277f968036b5a Mon Sep 17 00:00:00 2001 From: linyuh Date: Fri, 6 Apr 2018 16:33:57 -0700 Subject: Resolve resource conflicts. Bug: 77710848 Test: None PiperOrigin-RevId: 191957734 Change-Id: I0b2674298722a405f4f2e970e877671cff37e60f --- java/com/android/dialer/widget/res/layout/fragment_message.xml | 2 +- java/com/android/dialer/widget/res/layout/selectable_text_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'java/com/android/dialer/widget/res/layout') diff --git a/java/com/android/dialer/widget/res/layout/fragment_message.xml b/java/com/android/dialer/widget/res/layout/fragment_message.xml index bdb85fa81..ac62dd91b 100644 --- a/java/com/android/dialer/widget/res/layout/fragment_message.xml +++ b/java/com/android/dialer/widget/res/layout/fragment_message.xml @@ -55,7 +55,7 @@ android:textColor="@color/dialer_primary_text_color" android:textColorHint="@color/dialer_edit_text_hint_color" android:background="@color/background_dialer_white" - android:textCursorDrawable="@drawable/searchedittext_custom_cursor" + android:textCursorDrawable="@drawable/edittext_custom_cursor" android:layout_toStartOf="@+id/count_and_send_container" android:inputType="textShortMessage|textCapSentences" android:imeOptions="flagNoExtractUi|actionSend"/> diff --git a/java/com/android/dialer/widget/res/layout/selectable_text_view.xml b/java/com/android/dialer/widget/res/layout/selectable_text_view.xml index 3d120d13d..9cdb162b6 100644 --- a/java/com/android/dialer/widget/res/layout/selectable_text_view.xml +++ b/java/com/android/dialer/widget/res/layout/selectable_text_view.xml @@ -22,4 +22,4 @@ android:textSize="16sp" android:textColor="@color/dialer_primary_text_color" android:padding="16dp" - android:background="@drawable/item_background_material_light"/> \ No newline at end of file + android:background="@drawable/ripple_material_light"/> \ No newline at end of file -- cgit v1.2.3