diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-26 18:44:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-26 18:44:06 +0000 |
commit | 38fc0fa8a7b70963c64ceab6fb8657647175db8b (patch) | |
tree | 386ca1611105014f43b69c3a61c81183bd548156 | |
parent | af330f62d281b1ac616ff6897b968c9e776013e2 (diff) | |
parent | 1dfc69633b8e73db14109ecd7b414f93530508ac (diff) | |
download | muskie-38fc0fa8a7b70963c64ceab6fb8657647175db8b.tar.gz |
Rollback telephony-resources am: 1dfc69633b
Change-Id: Ifca19a6c5b278bb9b6370d4d53b28404a1f7189c
9 files changed, 0 insertions, 228 deletions
diff --git a/device-walleye.mk b/device-walleye.mk index aa0d4e0..36a5483 100644 --- a/device-walleye.mk +++ b/device-walleye.mk @@ -31,9 +31,6 @@ $(warning Overlays defined in '$(DEVICE_PACKAGE_OVERLAYS)' will override '$(PROD endif DEVICE_PACKAGE_OVERLAYS += device/google/muskie/walleye/overlay -PRODUCT_PACKAGES += \ - TelephonyOverlay2017Walleye - include device/google/muskie/device-common.mk PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/rro_overlays/TelephonyOverlay/Android.bp b/rro_overlays/TelephonyOverlay/Android.bp deleted file mode 100644 index cf148e5..0000000 --- a/rro_overlays/TelephonyOverlay/Android.bp +++ /dev/null @@ -1,26 +0,0 @@ -// -// Copyright (C) 2020 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. -// - -runtime_resource_overlay { - name: "TelephonyOverlay2017Walleye", - resource_dirs: ["Walleye/res","Common/res"], - certificate: "platform", - product_specific: true, - aaptflags: ["--auto-add-overlay"], - manifest: "AndroidManifest.xml", - theme: "TelephonyOverlay2017Walleye", -} - diff --git a/rro_overlays/TelephonyOverlay/AndroidManifest.xml b/rro_overlays/TelephonyOverlay/AndroidManifest.xml deleted file mode 100644 index e3662bc..0000000 --- a/rro_overlays/TelephonyOverlay/AndroidManifest.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2019 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. ---> -<!-- Pixel specific wifi overlays --> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.telephony.resources.pixel" - android:versionCode="1" - android:versionName="1.0"> - <application android:hasCode="false" /> - <overlay - android:targetPackage="com.android.telephony.resources" - android:targetName="TelephonyCustomization" - android:isStatic="true" - android:priority="0"/> -</manifest> - diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml deleted file mode 100644 index b940d41..0000000 --- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> - -<!-- These resources are around just to allow their values to be customized - for different hardware and product builds. --> -<resources> - - <!-- Sometimes, PDU has garbages. So, need to use valid index --> - <integer name="config_valid_wappush_index">4</integer> - -</resources> diff --git a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml deleted file mode 100644 index 41dc40a..0000000 --- a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2019 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> - <!-- Device-specific array of SIM slot indexes which are are embedded eUICCs. - e.g. If a device has two physical slots with indexes 0, 1, and slot 1 is an - eUICC, then the value of this array should be: - <integer-array name="non_removable_euicc_slots"> - <item>1</item> - </integer-array> - If a device has three physical slots and slot 1 and 2 are eUICCs, then the value of - this array should be: - <integer-array name="non_removable_euicc_slots"> - <item>1</item> - <item>2</item> - </integer-array> - This is used to differentiate between removable eUICCs and built in eUICCs, and should - be set by OEMs for devices which use eUICCs. --> - <integer-array name="non_removable_euicc_slots"> - <item>1</item> - </integer-array> -</resources> diff --git a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml deleted file mode 100644 index 6234fb4..0000000 --- a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* - * Copyright (C) 2019 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> - - <!-- Enable video pause workaround when enabling/disabling the camera. --> - <bool name="config_useVideoPauseWorkaround">true</bool> - - <!-- Use ERI text for network name on CDMA LTE --> - <bool name="config_LTE_eri_for_network_name">true</bool> - -</resources> diff --git a/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc310-mnc004/donottranslate_config.xml deleted file mode 100644 index 4e3bbd5..0000000 --- a/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc310-mnc004/donottranslate_config.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> - -<!-- These resources are around just to allow their values to be customized - for different hardware and product builds. --> -<resources> - - <!-- MMS user agent string --> - <string name="config_mms_user_agent" translatable="false">g011a</string> - <!-- MMS user agent prolfile url --> - <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/google/g011a/g011a.xml</string> - -</resources> diff --git a/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc311-mnc480/donottranslate_config.xml deleted file mode 100644 index 4e3bbd5..0000000 --- a/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc311-mnc480/donottranslate_config.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> - -<!-- These resources are around just to allow their values to be customized - for different hardware and product builds. --> -<resources> - - <!-- MMS user agent string --> - <string name="config_mms_user_agent" translatable="false">g011a</string> - <!-- MMS user agent prolfile url --> - <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/google/g011a/g011a.xml</string> - -</resources> diff --git a/rro_overlays/TelephonyOverlay/Walleye/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Walleye/res/values/donottranslate_config.xml deleted file mode 100644 index 6afad03..0000000 --- a/rro_overlays/TelephonyOverlay/Walleye/res/values/donottranslate_config.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* - * Copyright (C) 2019 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> - <!-- MMS user agent string --> - <string name="config_mms_user_agent" translatable="false">g011a</string> - <!-- MMS user agent prolfile url --> - <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G011A.xml</string> -</resources> |