diff options
| author | 2017-07-25 01:23:24 +0000 | |
|---|---|---|
| committer | 2017-07-25 01:23:24 +0000 | |
| commit | e1132b4a39dc8952ca7d93086cc57f55ba342e84 (patch) | |
| tree | 1f89e0c6b20090ea5902eeb9402d0cd9ad98f7ed | |
| parent | 76303759c4476e46972e73703d4ccd9fb14c940a (diff) | |
| parent | dc76cf4f1f9e84e1b6372d0c6fe87f3693bb0098 (diff) | |
Merge "Remove old configuration values for demo mode" into oc-dr1-dev
| -rw-r--r-- | core/res/res/values/config.xml | 12 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 10 |
2 files changed, 0 insertions, 22 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f56abc3e13bd..8c18dd6e7f30 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2780,18 +2780,6 @@ <!-- 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> - - <!-- Hashed password (SHA-256) used to restrict carrier demo mode operation. --> - <string name="config_carrierDemoModePassword" translatable="false"></string> - - <!-- Secure setting used to activate carrier demo mode. --> - <string name="config_carrierDemoModeSetting" translatable="false"></string> - - <!-- List of packages to enable in carrier demo mode (comma separated). --> - <string name="config_carrierDemoModePackages" translatable="false"></string> - <!-- Number of days preloaded file cache should be preserved on a device before it can be deleted --> <integer name="config_keepPreloadsMinDays">7</integer> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index a3b7ee890246..8fa22690990f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1167,10 +1167,6 @@ <java-symbol type="string" name="config_ethernet_tcp_buffers" /> <java-symbol type="string" name="config_wifi_tcp_buffers" /> <java-symbol type="string" name="config_demoModePackage" /> - <java-symbol type="string" name="config_demoModeLauncherComponent" /> - <java-symbol type="string" name="config_carrierDemoModePassword" /> - <java-symbol type="string" name="config_carrierDemoModeSetting" /> - <java-symbol type="string" name="config_carrierDemoModePackages" /> <java-symbol type="string" name="demo_starting_message" /> <java-symbol type="string" name="demo_restarting_message" /> <java-symbol type="string" name="conference_call" /> @@ -2018,12 +2014,6 @@ <java-symbol type="string" name="config_customVpnConfirmDialogComponent" /> <java-symbol type="string" name="config_defaultNetworkScorerPackageName" /> <java-symbol type="string" name="config_persistentDataPackageName" /> - <java-symbol type="string" name="reset_retail_demo_mode_title" /> - <java-symbol type="string" name="reset_retail_demo_mode_text" /> - <java-symbol type="string" name="demo_user_inactivity_timeout_title" /> - <java-symbol type="string" name="demo_user_inactivity_timeout_countdown" /> - <java-symbol type="string" name="demo_user_inactivity_timeout_left_button" /> - <java-symbol type="string" name="demo_user_inactivity_timeout_right_button" /> <java-symbol type="layout" name="resolver_list" /> <java-symbol type="id" name="resolver_list" /> |