From d2d0ed65d6c7bc611fd8a78e447356481320caa4 Mon Sep 17 00:00:00 2001
From: Nikita Glazkov <biggemott@gmail.com>
Date: Thu, 8 Mar 2018 05:41:34 +0300
Subject: [PATCH] Different app label for debug builds (#545)

* Different app label for debug builds

* Remove underscores from app labels
---
 app/src/debug/res/values/strings.xml | 7 +++++++
 app/src/main/res/values/strings.xml  | 3 +++
 app/src/nonRoot/AndroidManifest.xml  | 2 +-
 app/src/root/AndroidManifest.xml     | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 app/src/debug/res/values/strings.xml

diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 00000000..f21feccd
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_label" translatable="false">Moonlight (Debug)</string>
+    <string name="app_label_root" translatable="false">Moonlight (Root Debug)</string>
+
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9a80f4e0..9096266b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_label" translatable="false">Moonlight</string>
+    <string name="app_label_root" translatable="false">Moonlight (Root)</string>
+
     <!-- Shortcut strings -->
     <string name="scut_deleted_pc">PC deleted</string>
     <string name="scut_not_paired">PC not paired</string>
diff --git a/app/src/nonRoot/AndroidManifest.xml b/app/src/nonRoot/AndroidManifest.xml
index 5ac367ce..815895ec 100644
--- a/app/src/nonRoot/AndroidManifest.xml
+++ b/app/src/nonRoot/AndroidManifest.xml
@@ -3,5 +3,5 @@
 
     <!-- Non-root application name -->
     <!-- FIXME: We should set extractNativeLibs=false but this breaks installation on the Fire TV 3 -->
-    <application android:label="Moonlight" />
+    <application android:label="@string/app_label" />
 </manifest>
diff --git a/app/src/root/AndroidManifest.xml b/app/src/root/AndroidManifest.xml
index f0cd52e1..1622746b 100644
--- a/app/src/root/AndroidManifest.xml
+++ b/app/src/root/AndroidManifest.xml
@@ -5,6 +5,6 @@
     <!-- Ensure native libraries are always extracted for root builds,
          since we must invoke the evdev_reader binary ourselves -->
     <application
-        android:label="Moonlight (Root)"
+        android:label="@string/app_label_root"
         android:extractNativeLibs="true" />
 </manifest>