From 6dedbe6a4de6a0fe2045f60d90da5e1a41d3156f Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Thu, 5 Apr 2018 16:22:36 -0400 Subject: [PATCH] Don't hide the mobile type id if it doesn't change _Someone_ thought it would be a good idea to hide the mobile type indicator if it hadn't changed from the last state. Better to not do that. Also removed an unused method in StatusBarIconControllerImpl. Test: Reboot device with wifi off; data type indicator should show up eventually; i.e., visual Fixes: 77581445 Change-Id: I47a0c868b0e332c11e206b8c043a532bcbf10130 --- .../systemui/statusbar/StatusBarMobileView.java | 14 ++++++++------ .../phone/StatusBarIconControllerImpl.java | 11 ----------- .../statusbar/phone/StatusBarSignalPolicy.java | 2 +- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java index f81671b2f3b57..51b42395e369a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java @@ -142,12 +142,14 @@ public class StatusBarMobileView extends AlphaOptimizedLinearLayout implements D if (mState.strengthId != state.strengthId) { mMobileDrawable.setLevel(state.strengthId); } - if (mState.typeId != state.typeId && state.typeId != 0) { - mMobileType.setContentDescription(state.typeContentDescription); - mMobileType.setImageResource(state.typeId); - mMobileType.setVisibility(View.VISIBLE); - } else { - mMobileType.setVisibility(View.GONE); + if (mState.typeId != state.typeId) { + if (state.typeId != 0) { + mMobileType.setContentDescription(state.typeContentDescription); + mMobileType.setImageResource(state.typeId); + mMobileType.setVisibility(View.VISIBLE); + } else { + mMobileType.setVisibility(View.GONE); + } } mMobileRoaming.setVisibility(state.roaming ? View.VISIBLE : View.GONE); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java index 510af03e6f283..b4e7575d14809 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java @@ -306,17 +306,6 @@ public class StatusBarIconControllerImpl extends StatusBarIconList implements Tu mIconGroups.forEach(l -> l.onSetIconHolder(viewIndex, holder)); } - /** - * For mobile essentially (an array of holders in one slot) - */ - private void handleSet(int slotIndex, List holders) { - for (StatusBarIconHolder holder : holders) { - int viewIndex = getViewIndex(slotIndex, holder.getTag()); - mIconLogger.onIconVisibility(getSlotName(slotIndex), holder.isVisible()); - mIconGroups.forEach(l -> l.onSetIconHolder(viewIndex, holder)); - } - } - @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println(TAG + " state:"); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java index c5a3a0d33cd32..94ac4f6286a24 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java @@ -414,7 +414,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba @Override public String toString() { return "MobileIconState(subId=" + subId + ", strengthId=" + strengthId + ", roaming=" - + roaming + ", visible=" + visible + ")"; + + roaming + ", typeId=" + typeId + ", visible=" + visible + ")"; } } }