PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 2230710

* commit '2230710d319745294f44b696d09301f15f281493':
  Add demo mode to dev options

Change-Id: I54c5a963461127e04f7169ecc90ba367f4883dd1
This commit is contained in:
Jason Monk
2016-04-12 19:14:37 +00:00
committed by android-build-merger
parent ed277a1005 2230710d31
commit f96916606d
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -7377,4 +7377,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>

6
res/xml/development_prefs.xml
View File

@@ -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">