summaryrefslogtreecommitdiffstats
path: root/overlay
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2018-10-18 14:48:54 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-18 14:48:54 -0700
commit66a9e43ecec6e21f0f5a3175d7deeb8a8e6dc179 (patch)
tree0d32b1404b8dfca47d14c2454148f0d660bdca5f /overlay
parent0da919ddadd0930f9145fdbe2bc58ae74655fc1e (diff)
parentdb19283ccb01bd8a596fb3c90b545649043d79ef (diff)
downloaddevice_generic_goldfish-66a9e43ecec6e21f0f5a3175d7deeb8a8e6dc179.tar.gz
device_generic_goldfish-66a9e43ecec6e21f0f5a3175d7deeb8a8e6dc179.tar.bz2
device_generic_goldfish-66a9e43ecec6e21f0f5a3175d7deeb8a8e6dc179.zip
Merge "Move 4G/LTE/LTE+ resources to CarrierConfig"
am: db19283ccb Change-Id: Ibcb14560d8c57e4ce8a3994a8265df9f82296342
Diffstat (limited to 'overlay')
-rw-r--r--overlay/frameworks/base/packages/SystemUI/res/values/config.xml24
-rw-r--r--overlay/packages/apps/CarrierConfig/res/xml/vendor.xml1
2 files changed, 1 insertions, 24 deletions
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
deleted file mode 100644
index 044c383a..00000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<resources>
- <!-- Should "4G" be shown instead of "LTE" when the network is NETWORK_TYPE_LTE? -->
- <!-- No, in the Emulator, show "LTE" for LTE -->
- <bool name="config_show4GForLTE">false</bool>
-</resources>
diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
index f5034ed8..5cf52b94 100644
--- a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
+++ b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
@@ -7,5 +7,6 @@
<carrier_config_list>
<carrier_config>
<boolean name="enabledMMS" value="false"/>
+<boolean name="show_4g_for_lte_data_icon_bool" value="false"/>
</carrier_config>
</carrier_config_list>