From: Pengquan Meng <mpq@google.com>
Date: Thu, 8 Nov 2018 21:31:57 +0000 (+0000)
Subject: Merge "Replace some configs with CarrierConfig"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=92e8a5d8daaf2260d1463145a208b4cfe3d65c86;p=android-x86%2Fpackages-apps-Settings.git

Merge "Replace some configs with CarrierConfig"
---

92e8a5d8daaf2260d1463145a208b4cfe3d65c86
diff --cc res/values/config.xml
index c357207d80,b9a69f105e..3d85c6bd6c
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@@ -134,20 -134,6 +134,12 @@@
           have distinct intensity levels -->
      <bool name="config_vibration_supports_multiple_intensities">false</bool>
  
 +    <!--
 +        Whether or not the homepage should be powered by legacy suggestion (versus contextual cards)
 +        Default to true as not all devices support contextual cards.
 +    -->
 +    <bool name="config_use_legacy_suggestion">true</bool>
 +
      <!-- Whether or not TopLevelSettings should force rounded icon for injected tiles -->
      <bool name="config_force_rounded_icon_TopLevelSettings">true</bool>
- 
-     <!-- TODO(b/115429501): move those 3 configs to framework-->
-     <!-- Show enabled lte option for lte device -->
-     <bool name="config_enabled_lte" translatable="false">false</bool>
-     <!-- Show enabled tdscdma option for device -->
-     <bool name="config_support_tdscdma" translatable="false">false</bool>
-     <!-- Show enabled tdscdma option for device when connect roaming network -->
-     <string-array name="config_support_tdscdma_roaming_on_networks" translatable="false"></string-array>
  </resources>