Skip to content

Commit 5052805

Browse files
committed
Show mobile data RSSI for devices that support it.
The new test is more general, allowing mobile RSSI to be shown on devices without voice telephony. Bug: 7490266 Change-Id: Ib5b243c0d92e74fe4385989c3a6c16edd00a9ec9
1 parent 2656abe commit 5052805

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ public void refreshView(QuickSettingsTileView view, State state) {
415415
});
416416
parent.addView(wifiTile);
417417

418-
if (mModel.deviceSupportsTelephony()) {
418+
if (mModel.deviceHasMobileData()) {
419419
// RSSI
420420
QuickSettingsTileView rssiTile = (QuickSettingsTileView)
421421
inflater.inflate(R.layout.quick_settings_tile, parent, false);

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import android.database.ContentObserver;
3030
import android.graphics.drawable.Drawable;
3131
import android.hardware.display.WifiDisplayStatus;
32+
import android.net.ConnectivityManager;
3233
import android.os.Handler;
3334
import android.os.UserHandle;
3435
import android.provider.Settings;
@@ -171,6 +172,8 @@ public void startObserving() {
171172
private final BugreportObserver mBugreportObserver;
172173
private final BrightnessObserver mBrightnessObserver;
173174

175+
private final boolean mHasMobileData;
176+
174177
private QuickSettingsTileView mUserTile;
175178
private RefreshCallback mUserCallback;
176179
private UserState mUserState = new UserState();
@@ -249,6 +252,10 @@ public void onReceive(Context context, Intent intent) {
249252
mBrightnessObserver = new BrightnessObserver(mHandler);
250253
mBrightnessObserver.startObserving();
251254

255+
ConnectivityManager cm = (ConnectivityManager)
256+
context.getSystemService(Context.CONNECTIVITY_SERVICE);
257+
mHasMobileData = cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
258+
252259
IntentFilter alarmIntentFilter = new IntentFilter();
253260
alarmIntentFilter.addAction(Intent.ACTION_ALARM_CHANGED);
254261
context.registerReceiver(mAlarmIntentReceiver, alarmIntentFilter);
@@ -403,22 +410,22 @@ public void onWifiSignalChanged(boolean enabled, int wifiSignalIconId,
403410
mWifiCallback.refreshView(mWifiTile, mWifiState);
404411
}
405412

413+
boolean deviceHasMobileData() {
414+
return mHasMobileData;
415+
}
416+
406417
// RSSI
407418
void addRSSITile(QuickSettingsTileView view, RefreshCallback cb) {
408419
mRSSITile = view;
409420
mRSSICallback = cb;
410421
mRSSICallback.refreshView(mRSSITile, mRSSIState);
411422
}
412-
boolean deviceSupportsTelephony() {
413-
PackageManager pm = mContext.getPackageManager();
414-
return pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY);
415-
}
416423
// NetworkSignalChanged callback
417424
@Override
418425
public void onMobileDataSignalChanged(
419426
boolean enabled, int mobileSignalIconId, String signalContentDescription,
420427
int dataTypeIconId, String dataContentDescription, String enabledDesc) {
421-
if (deviceSupportsTelephony()) {
428+
if (deviceHasMobileData()) {
422429
// TODO: If view is in awaiting state, disable
423430
Resources r = mContext.getResources();
424431
mRSSIState.signalIconId = enabled && (mobileSignalIconId > 0)

0 commit comments

Comments
 (0)