Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bfc4f08 authored by Christine Franks's avatar Christine Franks Committed by android-build-merger
Browse files

Merge "Remove old configuration values for demo mode" into oc-dr1-dev am: e1132b4a 

am: f9cce805

Change-Id: I6c687f7bcb08a67c11d9180daa60db01adbb6806
parents 374c7bb0 f9cce805

core/res/res/values/config.xml

+0 −12
Original line number Diff line number Diff line
@@ -2807,18 +2807,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>

core/res/res/values/symbols.xml

+0 −10
Original line number Diff line number Diff line
@@ -1153,10 +1153,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" />
@@ -2004,12 +2000,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" />