Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add config_demoModePassword" into nyc-mr2-dev

Browse Source
This commit is contained in:
Christine Franks
2016-12-16 19:10:56 +00:00
committed by Android (Google) Code Review
parent 6ce17fb072 566525c6bb
commit ee3af13cf2
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
View File

@@ -2620,6 +2620,9 @@
<!-- Component that is the default launcher when demo mode is enabled. --> <!-- Component that is the default launcher when demo mode is enabled. -->
<string name="config_demoModeLauncherComponent">com.android.retaildemo/.DemoPlayer</string> <string name="config_demoModeLauncherComponent">com.android.retaildemo/.DemoPlayer</string>
<!-- Hashed password (SHA-256) used to restrict demo mode operation -->
<string name="config_demoModePassword" translatable="false"></string>
<!-- Flag indicating whether round icons should be parsed from the application manifest. --> <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
<bool name="config_useRoundIcon">false</bool> <bool name="config_useRoundIcon">false</bool>

1
core/res/res/values/symbols.xml
View File

@@ -1115,6 +1115,7 @@
<java-symbol type="string" name="config_ethernet_tcp_buffers" /> <java-symbol type="string" name="config_ethernet_tcp_buffers" />
<java-symbol type="string" name="config_wifi_tcp_buffers" /> <java-symbol type="string" name="config_wifi_tcp_buffers" />
<java-symbol type="string" name="config_demoModeLauncherComponent" /> <java-symbol type="string" name="config_demoModeLauncherComponent" />
<java-symbol type="string" name="config_demoModePassword" />
<java-symbol type="string" name="demo_starting_message" /> <java-symbol type="string" name="demo_starting_message" />
<java-symbol type="string" name="demo_restarting_message" /> <java-symbol type="string" name="demo_restarting_message" />
<java-symbol type="string" name="conference_call" /> <java-symbol type="string" name="conference_call" />