From e760e4204887acd9fb6e4b8b00059659a1367c3b Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Thu, 15 Mar 2018 15:56:30 -0700
Subject: Resolve all build resource conflicts.

For simplicity, instead of resolve the nui shortcut string, I
deleted it since it isn't used anymore.

Test: build log
PiperOrigin-RevId: 189260472
Change-Id: I67d5a49d78916a8960e41ad1c7b7f59efad6d718
---
 .../dialer/app/res/drawable-hdpi/ic_handle.png      | Bin 543 -> 0 bytes
 .../dialer/app/res/drawable-hdpi/old_ic_handle.png  | Bin 0 -> 543 bytes
 .../dialer/app/res/drawable-mdpi/ic_handle.png      | Bin 454 -> 0 bytes
 .../dialer/app/res/drawable-mdpi/old_ic_handle.png  | Bin 0 -> 454 bytes
 .../dialer/app/res/drawable-xhdpi/ic_handle.png     | Bin 681 -> 0 bytes
 .../dialer/app/res/drawable-xhdpi/old_ic_handle.png | Bin 0 -> 681 bytes
 .../dialer/app/res/drawable-xxhdpi/ic_handle.png    | Bin 1431 -> 0 bytes
 .../app/res/drawable-xxhdpi/old_ic_handle.png       | Bin 0 -> 1431 bytes
 .../dialer/app/res/drawable-xxxhdpi/ic_handle.png   | Bin 1687 -> 0 bytes
 .../app/res/drawable-xxxhdpi/old_ic_handle.png      | Bin 0 -> 1687 bytes
 .../app/res/drawable/ic_voicemail_seek_handle.xml   |   2 +-
 .../drawable/ic_voicemail_seek_handle_disabled.xml  |  20 --------------------
 .../old_ic_voicemail_seek_handle_disabled.xml       |  20 ++++++++++++++++++++
 java/com/android/dialer/app/res/values/strings.xml  |   4 ----
 14 files changed, 21 insertions(+), 25 deletions(-)
 delete mode 100644 java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png
 create mode 100644 java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png
 delete mode 100644 java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png
 create mode 100644 java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png
 delete mode 100644 java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png
 create mode 100644 java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png
 delete mode 100644 java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png
 create mode 100644 java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png
 delete mode 100644 java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png
 create mode 100644 java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png
 delete mode 100644 java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml
 create mode 100644 java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml

(limited to 'java/com/android/dialer/app/res')

diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png
deleted file mode 100644
index 34310aa49..000000000
Binary files a/java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png and /dev/null differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png
new file mode 100644
index 000000000..34310aa49
Binary files /dev/null and b/java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png
deleted file mode 100644
index 81a67ba6f..000000000
Binary files a/java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png and /dev/null differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png
new file mode 100644
index 000000000..81a67ba6f
Binary files /dev/null and b/java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png
deleted file mode 100644
index 0ad839286..000000000
Binary files a/java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png and /dev/null differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png
new file mode 100644
index 000000000..0ad839286
Binary files /dev/null and b/java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png
deleted file mode 100644
index d07a1d057..000000000
Binary files a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png and /dev/null differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png
new file mode 100644
index 000000000..d07a1d057
Binary files /dev/null and b/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png
deleted file mode 100644
index 72641c7ab..000000000
Binary files a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png and /dev/null differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png
new file mode 100644
index 000000000..72641c7ab
Binary files /dev/null and b/java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png differ
diff --git a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml
index 84cda0310..ffdd64edc 100644
--- a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml
+++ b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml
@@ -15,6 +15,6 @@
   ~ limitations under the License
   -->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:src="@drawable/ic_handle"
+  android:src="@drawable/old_ic_handle"
   android:tint="@color/actionbar_background_color">
 </bitmap>
\ No newline at end of file
diff --git a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml
deleted file mode 100644
index 5e974c45a..000000000
--- a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 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
-  -->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:src="@drawable/ic_handle"
-  android:tint="@color/voicemail_icon_disabled_tint">
-</bitmap>
\ No newline at end of file
diff --git a/java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml b/java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml
new file mode 100644
index 000000000..cfce81812
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 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
+  -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+  android:src="@drawable/old_ic_handle"
+  android:tint="@color/voicemail_icon_disabled_tint">
+</bitmap>
\ No newline at end of file
diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml
index 7c883299c..e5092f001 100644
--- a/java/com/android/dialer/app/res/values/strings.xml
+++ b/java/com/android/dialer/app/res/values/strings.xml
@@ -718,8 +718,4 @@
   <!-- If a user deletes a call that has attachments (photo, message, ect) bundled with it, they need
         to be told that they need to go to the SMS app to delete the attachments. [CHAR LIMIT=NONE] -->
   <string name="multiple_ec_data_deleted">Calls deleted. View and delete attachments shared during calls in Messages.</string>
-
-  <!-- Name of launcher shortcut for the new UI main activity.
-       TODO(38502365): Remove this once we're ready to launch the new UI. -->
-  <string translatable="false" name="nui_shortcut_name">Phone NUI</string>
 </resources>
-- 
cgit v1.2.3