Separate package name for debug builds

diff --git a/app/build.gradle b/app/build.gradle
index 9105a47..4803e8e 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,10 +29,16 @@ android {
     }
 
     buildTypes {
+        debug {
+            applicationIdSuffix ".debug"
+            manifestPlaceholders = [appName: "@string/app_name_debug"]
+        }
+
         release {
             minifyEnabled true
             shrinkResources true
             proguardFiles 'proguard-android.txt', 'proguard-rules.pro'
+            manifestPlaceholders = [appName: "@string/app_name"]
         }
     }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7954280..beebff4 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,12 +46,12 @@
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="${appName}"
         android:theme="@style/AppTheme" >
 
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
+            android:label="${appName}"
             android:launchMode="singleTask" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -75,7 +75,7 @@
             android:theme="@style/AppTheme.InvisibleActivity"/>
         <activity
             android:name=".activity.HomeActivity"
-            android:label="@string/app_name"
+            android:label="${appName}"
             android:launchMode="singleTask"
             android:enabled="false"
             android:theme="@style/AppTheme.HomeActivity">
@@ -88,7 +88,7 @@
         </activity>
         <activity
             android:name=".activity.KeyboardShortcutActivity"
-            android:label="@string/app_name"
+            android:label="${appName}"
             android:documentLaunchMode="always"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
@@ -244,7 +244,7 @@
             </intent-filter>
         </receiver>
         <receiver android:name=".receiver.LockDeviceReceiver"
-                  android:label="@string/app_name"
+                  android:label="${appName}"
                   android:enabled="false"
                   android:exported="true"
                   android:description="@string/device_admin_description_short"

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 07df489..06a7228 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -17,6 +17,7 @@
 <resources>
 
     <string name="app_name">Taskbar</string>
+    <string name="app_name_debug">Taskbar (Debug)</string>
 
     <string name="taskbar_is_active">Taskbar はアクティブです</string>
     <string name="click_to_open_settings">クリックすると設定を開きます</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9145dfd..c514693 100644 (file)
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -17,6 +17,7 @@
 <resources>
 
     <string name="app_name">Taskbar</string>
+    <string name="app_name_debug">Taskbar (Debug)</string>
 
     <string name="taskbar_is_active">Taskbar запущен</string>
     <string name="click_to_open_settings">Нажмите для запуска настроек</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7cbeb31..174cbd9 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
 <resources>
 
     <string name="app_name">Taskbar</string>
+    <string name="app_name_debug">Taskbar (Debug)</string>
 
     <string name="taskbar_is_active">Taskbar is active</string>
     <string name="click_to_open_settings">Click to open settings</string>