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

QS: Fix datatype overlays.

Browse Source 
- And simplify demo mode wiring.

Bug:15988601
Change-Id: I6827b87700cd88394b115e5e1609520b3afa8660
This commit is contained in:
John Spurlock
2014-08-01 11:26:44 -04:00
parent 19fc117c2f
commit 41fef15495
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
View File

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

23
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

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