diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java | 23 |
2 files changed, 9 insertions, 16 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java index 669775134502..1a555f1e435d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java @@ -57,7 +57,7 @@ public final class SignalTileView extends QSTileView { mSignal = new ImageView(mContext); mIconFrame.addView(mSignal); mOverlay = new ImageView(mContext); - mIconFrame.addView(mOverlay); + mIconFrame.addView(mOverlay, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); return mIconFrame; } 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 70fe85fdb0ba..dbf0c32ad5c6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -595,12 +595,6 @@ public class NetworkControllerImpl extends BroadcastReceiver private final void updateTelephonySignalStrength() { Rlog.d(TAG, "updateTelephonySignalStrength: hasService=" + hasService() + " ss=" + mSignalStrength); - if (mDemoMode) { - mQSPhoneSignalIconId = mDemoMobileLevel < 0 ? R.drawable.ic_qs_signal_no_signal : - TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[mDemoInetCondition][mDemoMobileLevel]; - mQSDataTypeIconId = mDemoQSDataTypeIconId; - return; - } if (!hasService()) { if (true/*CHATTY*/) Log.d(TAG, "updateTelephonySignalStrength: !hasService()"); mPhoneSignalIconId = R.drawable.stat_sys_signal_null; @@ -950,11 +944,6 @@ public class NetworkControllerImpl extends BroadcastReceiver } private void updateWifiIcons() { - if (mDemoMode) { - mQSWifiIconId = mDemoWifiLevel < 0 ? R.drawable.ic_qs_wifi_no_network - : WifiIcons.QS_WIFI_SIGNAL_STRENGTH[mDemoInetCondition][mDemoWifiLevel]; - return; - } if (mWifiConnected) { mWifiIconId = WifiIcons.WIFI_SIGNAL_STRENGTH[mInetCondition][mWifiLevel]; mQSWifiIconId = WifiIcons.QS_WIFI_SIGNAL_STRENGTH[mInetCondition][mWifiLevel]; @@ -1209,6 +1198,14 @@ public class NetworkControllerImpl extends BroadcastReceiver } } + if (mDemoMode) { + mQSWifiIconId = mDemoWifiLevel < 0 ? R.drawable.ic_qs_wifi_no_network + : WifiIcons.QS_WIFI_SIGNAL_STRENGTH[mDemoInetCondition][mDemoWifiLevel]; + mQSPhoneSignalIconId = mDemoMobileLevel < 0 ? R.drawable.ic_qs_signal_no_signal : + TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[mDemoInetCondition][mDemoMobileLevel]; + mQSDataTypeIconId = mDemoQSDataTypeIconId; + } + if (DEBUG) { Log.d(TAG, "refreshViews connected={" + (mWifiConnected?" wifi":"") @@ -1497,8 +1494,6 @@ public class NetworkControllerImpl extends BroadcastReceiver for (SignalCluster cluster : mSignalClusters) { refreshSignalCluster(cluster); } - updateWifiIcons(); - updateTelephonySignalStrength(); refreshViews(); } else if (mDemoMode && command.equals(COMMAND_NETWORK)) { String airplane = args.getString("airplane"); @@ -1528,7 +1523,6 @@ public class NetworkControllerImpl extends BroadcastReceiver iconId, "Demo"); } - updateWifiIcons(); refreshViews(); } String mobile = args.getString("mobile"); @@ -1574,7 +1568,6 @@ public class NetworkControllerImpl extends BroadcastReceiver "Demo", "Demo"); } - updateTelephonySignalStrength(); refreshViews(); } } |