Skip to content

Commit

Permalink
Remove old configuration values for demo mode
Browse files Browse the repository at this point in the history
Bug: 62712426
Test: make -j100
Change-Id: Ibe8a89208ba93d7074800f087798678371f72fb8
  • Loading branch information
christinef committed Jul 22, 2017
1 parent 5bbf44e commit dc76cf4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 22 deletions.
12 changes: 0 additions & 12 deletions core/res/res/values/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2788,18 +2788,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>
Expand Down
10 changes: 0 additions & 10 deletions core/res/res/values/symbols.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -2019,12 +2015,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" />
Expand Down

0 comments on commit dc76cf4

Please sign in to comment.