commit 2230710d319745294f44b696d09301f15f281493
author Jason Monk <jmonk@google.com> Tue Apr 12 19:07:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 12 19:07:47 2016 +0000
tree adf683c46b32950f91b0c51177ed0c1e48a58169
parent 6cd4555ac4577a025fab54a09907290398f52207
parent 7b5c4007e224a00933029f9874d7d830b8a70742

Merge "Add demo mode to dev options" into nyc-dev
am: 7b5c400

* commit '7b5c4007e224a00933029f9874d7d830b8a70742':
  Add demo mode to dev options

Change-Id: I48eefd0ae371f09f8841b1aaa113cea7e208a5a9

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d77e76e..9a934dd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7375,4 +7375,7 @@
     <!-- [CHAR LIMIT=25] Bluetooth is disabled. -->
     <string name="bluetooth_disabled">Disabled</string>
 
+    <!-- [CHAR LIMIT=60] Name of dev option called demo mode -->
+    <string name="demo_mode">Demo mode</string>
+
 </resources>

res/xml/development_prefs.xml

diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 7415464..e737ba8 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -91,6 +91,12 @@
         android:key="ota_disable_automatic_update"
         android:title="@string/ota_disable_automatic_update" />
 
+    <PreferenceScreen
+        android:key="demo_mode"
+        android:title="@string/demo_mode">
+        <intent android:action="com.android.settings.action.DEMO_MODE" />
+    </PreferenceScreen>
+
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">