diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-27 16:24:32 -0800 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2015-01-27 16:24:32 -0800 |
| commit | 5c7daaf7763f4c1fc3eb44430d1b2e5bf11130e1 (patch) | |
| tree | f0a61955dac8044d003f066ca4efee5ea09d3c04 /packages/SystemUI/src/com/android/systemui/qs | |
| parent | b032cd1f52835134e142b19f73648442237cd0d1 (diff) | |
| parent | b9470f3a238d67eb3a84ec5325d35757f298d644 (diff) | |
| download | frameworks_base-5c7daaf7763f4c1fc3eb44430d1b2e5bf11130e1.zip frameworks_base-5c7daaf7763f4c1fc3eb44430d1b2e5bf11130e1.tar.gz frameworks_base-5c7daaf7763f4c1fc3eb44430d1b2e5bf11130e1.tar.bz2 | |
resolved conflicts for merge of b9470f3a to master
Change-Id: I85a975253b0b18b8c9e6d069c88fc12c93ed82ad
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index ddb96a2..30f92b9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -97,9 +97,7 @@ public class CellularTile extends QSTile<QSTile.SignalState> { state.icon = ResourceIcon.get(iconId); state.isOverlayIconWide = cb.isDataTypeIconWide; state.autoMirrorDrawable = !cb.noSim; - state.overlayIconId = cb.enabled && (cb.dataTypeIconId > 0) && !cb.wifiConnected - ? cb.dataTypeIconId - : 0; + state.overlayIconId = cb.enabled && (cb.dataTypeIconId > 0) ? cb.dataTypeIconId : 0; state.filter = iconId != R.drawable.ic_qs_no_sim; state.activityIn = cb.enabled && cb.activityIn; state.activityOut = cb.enabled && cb.activityOut; |