From 112ce42926c2b7d9c8a0e9ef4fee869ab7f72cc7 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 22 Aug 2016 16:45:29 -0700
Subject: [PATCH] Adding a resource pointer to the app name so that derived
 projects can easily modify app name

Change-Id: I3f301e1b2ba38d0a45d220bb628dcfdf3906246c
---
 AndroidManifest-common.xml              | 2 +-
 res/values/config.xml                   | 4 ++++
 src/com/android/launcher3/Launcher.java | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 3da35354fc..bbe1f4a88d 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -50,7 +50,7 @@
         android:fullBackupContent="@xml/backupscheme"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher_home"
-        android:label="@string/app_name"
+        android:label="@string/derived_app_name"
         android:largeHeap="@bool/config_largeHeap"
         android:restoreAnyVersion="true"
         android:supportsRtl="true" >
diff --git a/res/values/config.xml b/res/values/config.xml
index 94f02f9420..2347f661b8 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -9,6 +9,10 @@
     <bool name="is_large_tablet">false</bool>
     <bool name="allow_rotation">false</bool>
 
+    <!-- A string pointer to the original app name string. This allows derived projects to
+     easily override the app name without providing all translations -->
+    <string name="derived_app_name" translatable="false">@string/app_name</string>
+
 <!-- DragController -->
     <item type="id" name="drag_event_parity" />
 
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 92aaaf7264..e309c85561 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -883,7 +883,7 @@ public class Launcher extends Activity
             } else {
                 // TODO: Show a snack bar with link to settings
                 Toast.makeText(this, getString(R.string.msg_no_phone_permission,
-                        getString(R.string.app_name)), Toast.LENGTH_SHORT).show();
+                        getString(R.string.derived_app_name)), Toast.LENGTH_SHORT).show();
             }
         }
         if (mLauncherCallbacks != null) {