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
---
 java/com/android/dialer/main/impl/res/values/strings.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'java/com/android/dialer/main/impl/res/values/strings.xml')

diff --git a/java/com/android/dialer/main/impl/res/values/strings.xml b/java/com/android/dialer/main/impl/res/values/strings.xml
index 4e65432e5..121820383 100644
--- a/java/com/android/dialer/main/impl/res/values/strings.xml
+++ b/java/com/android/dialer/main/impl/res/values/strings.xml
@@ -18,10 +18,6 @@
   <!-- Name of the main activity. -->
   <string name="main_activity_label" tools:ignore="UnusedResources">Phone</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 name="nui_shortcut_name">Phone NUI</string>
-
   <!-- Title for the activity that dials the phone, when launched directly into the dialpad -->
   <string name="dialpad_activity_title">Phone Keypad</string>
 
-- 
cgit v1.2.3