Initial work on common-izing overlays.HEADlp5.0

4 files changed, 7 insertions, 67 deletions

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index d042663..04f5875 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -56,7 +56,4 @@
         <!--  /dev/bus/usb/001 is used for the LTE modem -->
         <item>/dev/bus/usb/001</item>
     </string-array>
-
-    <!-- Set to true to add links to Cell Broadcast app from Settings and MMS app. -->
-    <bool name="config_cellBroadcastAppLinks">true</bool>
 </resources>
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 442f25f..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2013, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-
-    <!-- Even though this is an LTE device, we have always shown "4G", so let's keep it that way -->
-    <bool name="config_show4GForLTE">true</bool>
-
-</resources>
-
diff --git a/overlay/packages/apps/InCallUI/res/values/strings.xml b/overlay/packages/apps/InCallUI/res/values/strings.xml
deleted file mode 100644
index 0386229..0000000
--- a/overlay/packages/apps/InCallUI/res/values/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Bug in RIL. It believes 7 is CDMA/LTE/EVDO even though that contradicts ril.h -->
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" translatable="false">Preferred network mode: 4G / LTE</string>
-
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>4G/LTE</item>
-        <item>3G/CDMA</item>
-    </string-array>
-    <string-array name="preferred_network_mode_values" translatable="false">
-        <item>"7"</item>
-        <item>"4"</item>
-    </string-array>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values/strings.xml b/overlay/packages/services/Telephony/res/values/strings.xml
index 013ef57..03f9027 100644
--- a/overlay/packages/services/Telephony/res/values/strings.xml
+++ b/overlay/packages/services/Telephony/res/values/strings.xml
@@ -19,9 +19,12 @@
     <!-- Bug in RIL. It believes 7 is CDMA/LTE/EVDO even though that contradicts ril.h -->
     <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" translatable="false">Preferred network mode: 4G / LTE</string>
 
+    <string name="network_lte" translatable="false">4G/LTE</string>
+    <string name="network_3G" translatable="false">3G/CDMA</string>
+
     <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>4G/LTE</item>
-        <item>3G/CDMA</item>
+        <item>@string/network_lte</item>
+        <item>@string/network_3G</item>
     </string-array>
     <string-array name="preferred_network_mode_values" translatable="false">
         <item>"7"</item>
@@ -29,14 +32,11 @@
     </string-array>
 
     <string-array name="enabled_networks_cdma_choices" translatable="false">
-        <item>4G/LTE</item>
-        <item>3G/CDMA</item>
+        <item>@string/network_lte</item>
+        <item>@string/network_3G</item>
     </string-array>
     <string-array name="enabled_networks_cdma_values" translatable="false">
         <item>"7"</item>
         <item>"4"</item>
     </string-array>
-
-    <string name="network_lte" translatable="false">4G/LTE</string>
-    <string name="network_3G" translatable="false">3G/CDMA</string>
 </resources>