From b59509818552cd3ee461e935eb34c485444a3670 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Tue, 24 Jan 2017 15:53:53 -0500 Subject: [PATCH] Fixes for new QS A bunch of small cleanup for the new QS. Change-Id: If0a5efe67366a4288f72cb91d32f5e20a4d4d6ca Test: visual Fixes: 34665057 Fixes: 34658107 Fixes: 34644473 --- packages/SystemUI/res/drawable/ic_qs_data_disabled.xml | 4 ++-- .../SystemUI/res/drawable/stat_sys_data_disabled.xml | 5 +++-- .../res/layout/quick_status_bar_expanded_header.xml | 2 +- .../android/systemui/statusbar/phone/PhoneStatusBar.java | 3 ++- .../systemui/statusbar/phone/QuickStatusBarHeader.java | 2 +- .../systemui/statusbar/policy/NetworkControllerImpl.java | 9 +++++++-- .../systemui/statusbar/policy/TelephonyIcons.java | 2 +- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/packages/SystemUI/res/drawable/ic_qs_data_disabled.xml b/packages/SystemUI/res/drawable/ic_qs_data_disabled.xml index 439ee3bc60d02..6264484a74d88 100644 --- a/packages/SystemUI/res/drawable/ic_qs_data_disabled.xml +++ b/packages/SystemUI/res/drawable/ic_qs_data_disabled.xml @@ -16,8 +16,8 @@ + android:viewportWidth="24.0" + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/stat_sys_data_disabled.xml b/packages/SystemUI/res/drawable/stat_sys_data_disabled.xml index 694019e988678..ea794d47312ff 100644 --- a/packages/SystemUI/res/drawable/stat_sys_data_disabled.xml +++ b/packages/SystemUI/res/drawable/stat_sys_data_disabled.xml @@ -14,9 +14,10 @@ limitations under the License. --> { mLeaveOpenOnKeyguardHide = true; - executeRunnableDismissingKeyguard(runnable, null, false, false, false); + executeRunnableDismissingKeyguard(() -> mHandler.post(runnable), null, false, false, + false); }); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java index 9e9380295f0c6..a7064081753c1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java @@ -157,7 +157,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements // Set the light/dark theming on the header status UI to match the current theme. SignalClusterView cluster = (SignalClusterView) findViewById(R.id.signal_cluster); int colorForeground = Utils.getColorAttr(getContext(), android.R.attr.colorForeground); - float intensity = colorForeground / (float) Color.WHITE; + float intensity = colorForeground == Color.WHITE ? 0 : 1; cluster.setIconTint(colorForeground, intensity, new Rect(0, 0, 0, 0)); BatteryMeterView battery = (BatteryMeterView) findViewById(R.id.battery); int colorSecondary = Utils.getColorAttr(getContext(), android.R.attr.textColorSecondary); 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 edf2c8a93650e..bceee2e29c80f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -799,6 +799,8 @@ public class NetworkControllerImpl extends BroadcastReceiver MobileSignalController controller = mMobileSignalControllers .values().toArray(new MobileSignalController[0])[slot]; controller.getState().dataSim = datatype != null; + controller.getState().isDefault = datatype != null; + controller.getState().dataConnected = datatype != null; if (datatype != null) { controller.getState().iconGroup = datatype.equals("1x") ? TelephonyIcons.ONE_X : @@ -811,6 +813,7 @@ public class NetworkControllerImpl extends BroadcastReceiver datatype.equals("lte") ? TelephonyIcons.LTE : datatype.equals("lte+") ? TelephonyIcons.LTE_PLUS : datatype.equals("roam") ? TelephonyIcons.ROAMING : + datatype.equals("dis") ? TelephonyIcons.DATA_DISABLED : TelephonyIcons.UNKNOWN; } int[][] icons = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH; @@ -836,9 +839,11 @@ public class NetworkControllerImpl extends BroadcastReceiver private SubscriptionInfo addSignalController(int id, int simSlotIndex) { SubscriptionInfo info = new SubscriptionInfo(id, "", simSlotIndex, "", "", 0, 0, "", 0, null, 0, 0, ""); - mMobileSignalControllers.put(id, new MobileSignalController(mContext, + MobileSignalController controller = new MobileSignalController(mContext, mConfig, mHasMobileDataFeature, mPhone, mCallbackHandler, this, info, - mSubDefaults, mReceiverHandler.getLooper())); + mSubDefaults, mReceiverHandler.getLooper()); + mMobileSignalControllers.put(id, controller); + controller.getState().userSetup = true; return info; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java index b59cf68622926..ed8c7ff96aac8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java @@ -224,7 +224,7 @@ class TelephonyIcons { static final int ICON_CARRIER_NETWORK_CHANGE = R.drawable.stat_sys_signal_carrier_network_change_animation; - static final int ICON_DATA_DISABLED = R.drawable.ic_qs_data_disabled; + static final int ICON_DATA_DISABLED = R.drawable.stat_sys_data_disabled; static final int QS_ICON_LTE = R.drawable.ic_qs_signal_lte; static final int QS_ICON_3G = R.drawable.ic_qs_signal_3g;