From cb39795cb8b91df33f304d8155f277f968036b5a Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Fri, 6 Apr 2018 16:33:57 -0700
Subject: Resolve resource conflicts.

Bug: 77710848
Test: None
PiperOrigin-RevId: 191957734
Change-Id: I0b2674298722a405f4f2e970e877671cff37e60f
---
 .../widget/res/drawable/edittext_custom_cursor.xml | 21 +++++++++++++++++++
 .../drawable/item_background_material_light.xml    | 24 ----------------------
 .../widget/res/drawable/ripple_material_light.xml  | 23 +++++++++++++++++++++
 .../res/drawable/searchedittext_custom_cursor.xml  | 21 -------------------
 .../dialer/widget/res/layout/fragment_message.xml  |  2 +-
 .../widget/res/layout/selectable_text_view.xml     |  2 +-
 6 files changed, 46 insertions(+), 47 deletions(-)
 create mode 100644 java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml
 delete mode 100644 java/com/android/dialer/widget/res/drawable/item_background_material_light.xml
 create mode 100644 java/com/android/dialer/widget/res/drawable/ripple_material_light.xml
 delete mode 100644 java/com/android/dialer/widget/res/drawable/searchedittext_custom_cursor.xml

(limited to 'java/com/android/dialer/widget')

diff --git a/java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml b/java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml
new file mode 100644
index 000000000..2f01628aa
--- /dev/null
+++ b/java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2014 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+  <size android:width="2dp"/>
+  <solid android:color="@color/dialtacts_theme_color"/>
+</shape>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/drawable/item_background_material_light.xml b/java/com/android/dialer/widget/res/drawable/item_background_material_light.xml
deleted file mode 100644
index 6e524ac81..000000000
--- a/java/com/android/dialer/widget/res/drawable/item_background_material_light.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<!-- Based on the Theme.Material's default selectableItemBackground -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="@color/dialer_ripple_material_light">
-  <item android:id="@android:id/mask">
-    <color android:color="@android:color/white"/>
-  </item>
-</ripple>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/drawable/ripple_material_light.xml b/java/com/android/dialer/widget/res/drawable/ripple_material_light.xml
new file mode 100644
index 000000000..175624c8b
--- /dev/null
+++ b/java/com/android/dialer/widget/res/drawable/ripple_material_light.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2014 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/dialer_ripple_material_light">
+  <item android:id="@android:id/mask">
+    <color android:color="@android:color/white"/>
+  </item>
+</ripple>
diff --git a/java/com/android/dialer/widget/res/drawable/searchedittext_custom_cursor.xml b/java/com/android/dialer/widget/res/drawable/searchedittext_custom_cursor.xml
deleted file mode 100644
index 2f01628aa..000000000
--- a/java/com/android/dialer/widget/res/drawable/searchedittext_custom_cursor.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-  <size android:width="2dp"/>
-  <solid android:color="@color/dialtacts_theme_color"/>
-</shape>
\ No newline at end of file
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