diff options
| author | Jason Monk <jmonk@google.com> | 2015-01-13 09:15:17 -0500 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-01-13 09:15:17 -0500 |
| commit | 49accefb6f42f0aac7fa64faea7dd8856f16171c (patch) | |
| tree | 837fc2fb621bbbc215fce3ce386f0e429c5c63ab /packages/SystemUI/src | |
| parent | 8d2e8e2bf7341aa8d4b5c0ea5ce038e745275324 (diff) | |
| parent | afeefb63c60313cfe82fd8581d01c54969d2cffa (diff) | |
| download | frameworks_base-49accefb6f42f0aac7fa64faea7dd8856f16171c.zip frameworks_base-49accefb6f42f0aac7fa64faea7dd8856f16171c.tar.gz frameworks_base-49accefb6f42f0aac7fa64faea7dd8856f16171c.tar.bz2 | |
resolve merge conflicts of afeefb6 to master.
Change-Id: I754a8439f77e4f9e2f636c5b7a04280a01721c95
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java | 2 |
2 files changed, 6 insertions, 1 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 f2ebcf6..ddb96a2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -184,6 +184,11 @@ public class CellularTile extends QSTile<QSTile.SignalState> { // Make sure signal gets cleared out when no sims. mInfo.mobileSignalIconId = 0; mInfo.dataTypeIconId = 0; + // Show a No SIMs description to avoid emergency calls message. + mInfo.enabled = true; + mInfo.enabledDesc = mContext.getString( + R.string.keyguard_missing_sim_message_short); + mInfo.signalContentDescription = mInfo.enabledDesc; } refreshState(mInfo); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index 45b1e24..ac5602c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -246,7 +246,7 @@ public class MobileSignalController extends SignalController< int length = mSignalsChangedCallbacks.size(); for (int i = 0; i < length; i++) { mSignalsChangedCallbacks.get(i).onMobileDataSignalChanged(mCurrentState.enabled - && !mCurrentState.isEmergency && !mCurrentState.airplaneMode, + && !mCurrentState.isEmergency, getQsCurrentIconId(), contentDescription, qsTypeIcon, mCurrentState.dataConnected && mCurrentState.activityIn, |