Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't hide the mobile type id if it doesn't change" into pi-dev

Browse Source 
am: 13f92ccc96

Change-Id: Id9943b2de8dd2b588a7261c1172fb16d3776e7c1
This commit is contained in:
Evan Laird
2018-04-05 15:41:23 -07:00
committed by android-build-merger
parent d28a7f261d 13f92ccc96
commit 92a729d4da
3 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java
View File

@@ -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);

11
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java
View File

@@ -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<StatusBarIconHolder> 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:");

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java
View File

@@ -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 + ")";
}
}
}