From f0f919590334ee4ed21caa92bf21f098f66e3c15 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Mon, 21 Aug 2017 11:41:07 -0300
Subject: [PATCH] Include title and description for Android AppConfig (#859)

* Include title and description for Android AppConfig

* Update strings.xml

Fix descriptions
---
 android/app/src/main/res/values/strings.xml    | 18 ++++++++++++++++--
 .../app/src/main/res/xml/app_restrictions.xml  | 16 ++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 840999c66..c45f3c9fe 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0"?>
 <resources>
-
-
     <string name="app_name">Mattermost Beta</string>
+    <string name="inAppPinCode_title">in-App Pincode</string>
+    <string name="inAppPinCode_description">Require users to authenticate as the owner of the phone before using the app. Prompts for fingerprint or passcode when the app first opens and when the app has been in the background for more than 5 minutes.</string>
+    <string name="blurApplicationScreen_title">Blur Application Screen</string>
+    <string name="blurApplicationScreen_description">Blur the app when it’s set to background to protect any confidential on-screen information, it also prevents taking screenshots of the app.</string>
+    <string name="jailbreakProtection_title">Jailbreak &#x2F; Root Detection</string>
+    <string name="jailbreakProtection_description">Disable app launch on Jailbroken or rooted devices.</string>
+    <string name="copyAndPasteProtection_title">Copy&amp;Paste Protection</string>
+    <string name="copyAndPasteProtection_description">Disable the ability to copy from or paste into any text inputs in the app.</string>
+    <string name="serverUrl_title">Mattermost Server URL</string>
+    <string name="serverUrl_description">Set a default Mattermost server URL.</string>
+    <string name="allowOtherServers_title">Allow Other Servers</string>
+    <string name="allowOtherServers_description">Allow the user to change the above server URL.</string>
+    <string name="username_title">Default Username</string>
+    <string name="username_description">Set the username or email address to use to authenticate against the Mattermost Server.</string>
+    <string name="vendor_title">EMM Vendor or Company Name</string>
+    <string name="vendor_description">Name of the EMM vendor or company deploying the app. Used in help text when prompting for passcodes so users are aware why the app is being protected.</string>
 </resources>
diff --git a/android/app/src/main/res/xml/app_restrictions.xml b/android/app/src/main/res/xml/app_restrictions.xml
index 608e8a56d..fda826002 100644
--- a/android/app/src/main/res/xml/app_restrictions.xml
+++ b/android/app/src/main/res/xml/app_restrictions.xml
@@ -3,34 +3,50 @@
 
     <restriction
             android:key="inAppPinCode"
+            android:title="@string/inAppPinCode_title"
+            android:description="@string/inAppPinCode_description"
             android:restrictionType="string"
             android:defaultValue="false" />
     <restriction
             android:key="blurApplicationScreen"
+            android:title="@string/blurApplicationScreen_title"
+            android:description="@string/blurApplicationScreen_description"
             android:restrictionType="string"
             android:defaultValue="false" />
     <restriction
             android:key="jailbreakProtection"
+            android:title="@string/jailbreakProtection_title"
+            android:description="@string/jailbreakProtection_description"
             android:restrictionType="string"
             android:defaultValue="false" />
     <restriction
             android:key="copyAndPasteProtection"
+            android:title="@string/copyAndPasteProtection_title"
+            android:description="@string/copyAndPasteProtection_description"
             android:restrictionType="string"
             android:defaultValue="false" />
     <restriction
             android:key="serverUrl"
+            android:title="@string/serverUrl_title"
+            android:description="@string/serverUrl_description"
             android:restrictionType="string"
             android:defaultValue="" />
     <restriction
             android:key="allowOtherServers"
+            android:title="@string/allowOtherServers_title"
+            android:description="@string/allowOtherServers_description"
             android:restrictionType="string"
             android:defaultValue="true" />
     <restriction
             android:key="username"
+            android:title="@string/username_title"
+            android:description="@string/username_description"
             android:restrictionType="string"
             android:defaultValue="" />
     <restriction
             android:key="vendor"
+            android:title="@string/vendor_title"
+            android:description="@string/vendor_description"
             android:restrictionType="string"
             android:defaultValue="" />