From c026de3dbf9c26e9f5ea942280191083cfec9314 Mon Sep 17 00:00:00 2001 From: Antony Sargent Date: Tue, 21 May 2019 16:29:04 -0700 Subject: [PATCH] Move config for inflateSignalStrength This moves the config files for determining the inflateSignalStrength boolean into frameworks/base/core/res, and adds a utility method in SettingsLib for retrieving it. This is needed so we can display per-subscription signal strength icons in the DSDS header on the Settings Network & internet page that match what SysUI shows. Bug: 128855095 Test: manual, existing tests should pass Change-Id: I57032f022439b2de3f7bf57757b2a49dc7eccfe1 --- .../res}/res/values-mcc310-mnc030/config.xml | 0 .../res}/res/values-mcc310-mnc070/config.xml | 0 .../res}/res/values-mcc310-mnc170/config.xml | 0 .../res}/res/values-mcc310-mnc280/config.xml | 0 .../res}/res/values-mcc310-mnc380/config.xml | 0 core/res/res/values-mcc310-mnc410/config.xml | 4 +++ .../res/res/values-mcc310-mnc560}/config.xml | 0 .../res/res/values-mcc310-mnc950}/config.xml | 0 .../res/res/values-mcc311-mnc180}/config.xml | 0 core/res/res/values-mcc311-mnc480/config.xml | 3 ++ core/res/res/values/config.xml | 5 +++ core/res/res/values/symbols.xml | 1 + .../settingslib/net/SignalStrengthUtil.java | 34 +++++++++++++++++++ .../res/values-mcc311-mnc180/config.xml | 26 -------------- .../res/values-mcc311-mnc480/config.xml | 26 -------------- packages/SystemUI/res/values/config.xml | 4 --- .../policy/MobileSignalController.java | 6 ++-- .../policy/NetworkControllerImpl.java | 3 +- 18 files changed, 52 insertions(+), 60 deletions(-) rename {packages/SystemUI => core/res}/res/values-mcc310-mnc030/config.xml (100%) rename {packages/SystemUI => core/res}/res/values-mcc310-mnc070/config.xml (100%) rename {packages/SystemUI => core/res}/res/values-mcc310-mnc170/config.xml (100%) rename {packages/SystemUI => core/res}/res/values-mcc310-mnc280/config.xml (100%) rename {packages/SystemUI => core/res}/res/values-mcc310-mnc380/config.xml (100%) rename {packages/SystemUI/res/values-mcc310-mnc410 => core/res/res/values-mcc310-mnc560}/config.xml (100%) rename {packages/SystemUI/res/values-mcc310-mnc560 => core/res/res/values-mcc310-mnc950}/config.xml (100%) rename {packages/SystemUI/res/values-mcc310-mnc950 => core/res/res/values-mcc311-mnc180}/config.xml (100%) create mode 100644 packages/SettingsLib/src/com/android/settingslib/net/SignalStrengthUtil.java delete mode 100644 packages/SystemUI/res/values-mcc311-mnc180/config.xml delete mode 100644 packages/SystemUI/res/values-mcc311-mnc480/config.xml diff --git a/packages/SystemUI/res/values-mcc310-mnc030/config.xml b/core/res/res/values-mcc310-mnc030/config.xml similarity index 100% rename from packages/SystemUI/res/values-mcc310-mnc030/config.xml rename to core/res/res/values-mcc310-mnc030/config.xml diff --git a/packages/SystemUI/res/values-mcc310-mnc070/config.xml b/core/res/res/values-mcc310-mnc070/config.xml similarity index 100% rename from packages/SystemUI/res/values-mcc310-mnc070/config.xml rename to core/res/res/values-mcc310-mnc070/config.xml diff --git a/packages/SystemUI/res/values-mcc310-mnc170/config.xml b/core/res/res/values-mcc310-mnc170/config.xml similarity index 100% rename from packages/SystemUI/res/values-mcc310-mnc170/config.xml rename to core/res/res/values-mcc310-mnc170/config.xml diff --git a/packages/SystemUI/res/values-mcc310-mnc280/config.xml b/core/res/res/values-mcc310-mnc280/config.xml similarity index 100% rename from packages/SystemUI/res/values-mcc310-mnc280/config.xml rename to core/res/res/values-mcc310-mnc280/config.xml diff --git a/packages/SystemUI/res/values-mcc310-mnc380/config.xml b/core/res/res/values-mcc310-mnc380/config.xml similarity index 100% rename from packages/SystemUI/res/values-mcc310-mnc380/config.xml rename to core/res/res/values-mcc310-mnc380/config.xml diff --git a/core/res/res/values-mcc310-mnc410/config.xml b/core/res/res/values-mcc310-mnc410/config.xml index 00ab7127c331e..3fb3f0f7e9ff0 100644 --- a/core/res/res/values-mcc310-mnc410/config.xml +++ b/core/res/res/values-mcc310-mnc410/config.xml @@ -48,4 +48,8 @@ "#8" "#9" + + + true + diff --git a/packages/SystemUI/res/values-mcc310-mnc410/config.xml b/core/res/res/values-mcc310-mnc560/config.xml similarity index 100% rename from packages/SystemUI/res/values-mcc310-mnc410/config.xml rename to core/res/res/values-mcc310-mnc560/config.xml diff --git a/packages/SystemUI/res/values-mcc310-mnc560/config.xml b/core/res/res/values-mcc310-mnc950/config.xml similarity index 100% rename from packages/SystemUI/res/values-mcc310-mnc560/config.xml rename to core/res/res/values-mcc310-mnc950/config.xml diff --git a/packages/SystemUI/res/values-mcc310-mnc950/config.xml b/core/res/res/values-mcc311-mnc180/config.xml similarity index 100% rename from packages/SystemUI/res/values-mcc310-mnc950/config.xml rename to core/res/res/values-mcc311-mnc180/config.xml diff --git a/core/res/res/values-mcc311-mnc480/config.xml b/core/res/res/values-mcc311-mnc480/config.xml index db2f8d01f93a9..336e30e45b006 100755 --- a/core/res/res/values-mcc311-mnc480/config.xml +++ b/core/res/res/values-mcc311-mnc480/config.xml @@ -40,4 +40,7 @@ true + + true + diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 2de539721195c..fb585693c8a5f 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4121,4 +4121,9 @@ even after user setup is complete. The defined component should be used for supervision purposes only. The component must be part of a system app. --> + + + false + diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 3a348f05de48b..d3d0aa1185ef7 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3796,4 +3796,5 @@ + diff --git a/packages/SettingsLib/src/com/android/settingslib/net/SignalStrengthUtil.java b/packages/SettingsLib/src/com/android/settingslib/net/SignalStrengthUtil.java new file mode 100644 index 0000000000000..246f2ceac87c9 --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/net/SignalStrengthUtil.java @@ -0,0 +1,34 @@ +/* + * 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. + */ + +package com.android.settingslib.net; + +import android.content.Context; +import android.telephony.SubscriptionManager; + +/** + * Utilities for dealing with signal strength. + */ +public class SignalStrengthUtil { + /** + * @return whether we should artificially inflate the signal strength and number of levels by 1 + * bar for the subscription with the given id + */ + public static boolean shouldInflateSignalStrength(Context context, int subscriptionId) { + return SubscriptionManager.getResourcesForSubId(context, subscriptionId) + .getBoolean(com.android.internal.R.bool.config_inflateSignalStrength); + } +} diff --git a/packages/SystemUI/res/values-mcc311-mnc180/config.xml b/packages/SystemUI/res/values-mcc311-mnc180/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/packages/SystemUI/res/values-mcc311-mnc180/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/packages/SystemUI/res/values-mcc311-mnc480/config.xml b/packages/SystemUI/res/values-mcc311-mnc480/config.xml deleted file mode 100644 index 7dadae7f9107a..0000000000000 --- a/packages/SystemUI/res/values-mcc311-mnc480/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index d774c551b5475..2875a644cad30 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -417,10 +417,6 @@ it has been expanded to reveal its children. --> false - - false - false diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index c08390fa53a20..2afe485eff8e0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -38,6 +38,7 @@ import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.cdma.EriInfo; import com.android.settingslib.Utils; import com.android.settingslib.graph.SignalDrawable; +import com.android.settingslib.net.SignalStrengthUtil; import com.android.systemui.R; import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; @@ -248,9 +249,8 @@ public class MobileSignalController extends SignalController< } private void updateInflateSignalStrength() { - mInflateSignalStrengths = SubscriptionManager.getResourcesForSubId(mContext, - mSubscriptionInfo.getSubscriptionId()) - .getBoolean(R.bool.config_inflateSignalStrength); + mInflateSignalStrengths = SignalStrengthUtil.shouldInflateSignalStrength(mContext, + mSubscriptionInfo.getSubscriptionId()); } private int getNumLevels() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index b8a14efa49357..b2972fcd1286d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -1140,7 +1140,8 @@ public class NetworkControllerImpl extends BroadcastReceiver res.getBoolean(com.android.internal.R.bool.config_alwaysUseCdmaRssi); config.hspaDataDistinguishable = res.getBoolean(R.bool.config_hspa_data_distinguishable); - config.inflateSignalStrengths = res.getBoolean(R.bool.config_inflateSignalStrength); + config.inflateSignalStrengths = res.getBoolean( + com.android.internal.R.bool.config_inflateSignalStrength); CarrierConfigManager configMgr = (CarrierConfigManager) context.getSystemService(Context.CARRIER_CONFIG_SERVICE);