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

2 files changed, 0 insertions, 104 deletions

diff --git a/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml
deleted file mode 100644
index d78d193fd..000000000
--- a/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical">
-
-  <ScrollView
-    android:id="@+id/voicemail_tos_message"
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:orientation="vertical">
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingLeft="16dp"
-      android:paddingRight="16dp"
-      android:paddingTop="32dp"
-      android:orientation="vertical">
-      <ImageView
-        android:id="@+id/voicemail_image"
-        android:layout_width="@dimen/voicemail_tos_image_size"
-        android:layout_height="@dimen/voicemail_tos_image_size"
-        android:layout_gravity="center"
-        android:paddingBottom="32dp"
-        android:importantForAccessibility="no"/>
-      <TextView
-        android:id="@+id/tos_message_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal|top"
-        android:minHeight="20dp"
-        android:text="@string/verizon_terms_and_conditions_title"
-        style="@style/TosTitleStyle"/>
-      <TextView
-        android:id="@+id/tos_message_details"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
-        android:text="@string/verizon_terms_and_conditions_1.1_english"
-        style="@style/TosTextStyle"/>
-    </LinearLayout>
-  </ScrollView>
-
-  <View
-    android:layout_width="match_parent"
-    android:layout_height="0.5dp"
-    android:elevation="1dp"
-    android:background="@drawable/shadow"/>
-
-  <LinearLayout
-    android:id="@+id/voicemail_tos_button"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="56dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp"
-    android:background="#ffffffff"
-    android:orientation="horizontal">
-    <Button
-        android:id="@+id/voicemail_tos_button_decline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/verizon_terms_and_conditions_decline_english"
-        android:textColor="#757575"
-        style="@style/TosButtonStyle"/>
-
-    <android.support.v4.widget.Space
-      android:layout_width="8dp"
-      android:layout_height="match_parent"
-      android:layout_weight="1"/>
-
-
-    <Button
-        android:id="@+id/voicemail_tos_button_accept"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/verizon_terms_and_conditions_accept_english"
-        android:textColor="@color/dialer_theme_color"
-        style="@style/TosButtonStyle"/>
-
-  </LinearLayout>
-
-</LinearLayout>
diff --git a/java/com/android/dialer/voicemail/listui/res/values/strings.xml b/java/com/android/dialer/voicemail/listui/res/values/strings.xml
index 322912eb2..dc54daa19 100644
--- a/java/com/android/dialer/voicemail/listui/res/values/strings.xml
+++ b/java/com/android/dialer/voicemail/listui/res/values/strings.xml
@@ -35,8 +35,6 @@
   <!-- Header in voicemail tab to group calls from before yesterday.  [CHAR LIMIT=30] -->
   <string name="new_voicemail_header_older">Older</string>
 
-  <string name="verizon_terms_and_conditions_title" translatable="false">Turn on visual voicemail</string>
-
   <string translatable="false" name="verizon_terms_and_conditions_1.1_english">
 Visual Voice Mail (VVM) is a service that provides access to voice mail messages directly on the device, without the need to call *86. This service requires traditional Voice Mail but does not support all traditional Voice Mail features, which you can access by dialing *86 from your handset. Use of this feature will be billed on a per-megabyte basis, or according to any data package you have. Mobile to mobile minutes do not apply. Standard rates apply to any calls, emails or messages initiated from Visual Voice Mail.\n
 \n