summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-01-12 14:01:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-12 14:01:04 +0000
commitd74a331ae16b17cf1967186b5392676d2e3c427c (patch)
treeeecb510d961c9068ea20e977a1a627743b4c6709 /packages/SystemUI/src
parent1691881763295cc254ea618958bdcee83ebeccd8 (diff)
parentb36becff0831e48e208495a2c4ccf1a7330aeb58 (diff)
downloadframeworks_base-d74a331ae16b17cf1967186b5392676d2e3c427c.zip
frameworks_base-d74a331ae16b17cf1967186b5392676d2e3c427c.tar.gz
frameworks_base-d74a331ae16b17cf1967186b5392676d2e3c427c.tar.bz2
Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev
Diffstat (limited to 'packages/SystemUI/src')
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java5
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java2
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/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
index b289155..3cd0e64 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -1194,7 +1194,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
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,