commit a9f592fc4da56044b83a431a273a66428b191049
author Christine Franks <christyfranks@google.com> Wed Jul 19 14:11:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 19 14:11:38 2017 +0000
tree f8fc65850cea56fb021fa342903cc38beaaf49a7
parent 74a77919c897a029d54ebc9a0eaf90801efb3213
parent 3f52f6344a54caf1c84fced96232e701edb72ff3

Merge "Add new configuration values for demo mode" into oc-dr1-dev am: f2dc5c69a4
am: 3f52f6344a

Change-Id: I6bda3fb8b8eee7f19d40eb57a00f2df0106f3a17

core/res/res/values/config.xml

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index be1c4b8..7a19c3d 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2802,6 +2802,9 @@
     <!-- True if camera app should be pinned via Pinner Service -->
     <bool name="config_pinnerCameraApp">false</bool>
 
+    <!-- Component that runs demo mode when it is enabled. -->
+    <string name="config_demoModePackage" translatable="false"></string>
+
     <!-- Component that is the default launcher when demo mode is enabled. -->
     <string name="config_demoModeLauncherComponent">com.android.retaildemo/.DemoPlayer</string>