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

am 295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev

Browse Source 
* commit '295eddb92fd6e137ae352ea8dace2ecd18bf0a8a':
  Don't show emergency calls label unless it's a phone.
This commit is contained in:
Daniel Sandler
2013-05-28 21:37:59 -07:00
committed by Android Git Automerger
parent 466ceb463f 295eddb92f
commit a1f49d8bb7
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -496,17 +496,21 @@ public class PhoneStatusBar extends BaseStatusBar {
mNetworkController.addSignalCluster(signalCluster); mNetworkController.addSignalCluster(signalCluster);
signalCluster.setNetworkController(mNetworkController); signalCluster.setNetworkController(mNetworkController);
mEmergencyCallLabel = (TextView)mStatusBarWindow.findViewById(R.id.emergency_calls_only); final boolean isAPhone = mNetworkController.hasVoiceCallingFeature();
if (mEmergencyCallLabel != null) { if (isAPhone) {
mNetworkController.addEmergencyLabelView(mEmergencyCallLabel); mEmergencyCallLabel =
mEmergencyCallLabel.setOnClickListener(new View.OnClickListener() { (TextView) mStatusBarWindow.findViewById(R.id.emergency_calls_only);
public void onClick(View v) { }}); if (mEmergencyCallLabel != null) {
mEmergencyCallLabel.addOnLayoutChangeListener(new View.OnLayoutChangeListener() { mNetworkController.addEmergencyLabelView(mEmergencyCallLabel);
@Override mEmergencyCallLabel.setOnClickListener(new View.OnClickListener() {
public void onLayoutChange(View v, int left, int top, int right, int bottom, public void onClick(View v) { }});
int oldLeft, int oldTop, int oldRight, int oldBottom) { mEmergencyCallLabel.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
updateCarrierLabelVisibility(false); @Override
}}); public void onLayoutChange(View v, int left, int top, int right, int bottom,
int oldLeft, int oldTop, int oldRight, int oldBottom) {
updateCarrierLabelVisibility(false);
}});
}
} }
mCarrierLabel = (TextView)mStatusBarWindow.findViewById(R.id.carrier_label); mCarrierLabel = (TextView)mStatusBarWindow.findViewById(R.id.carrier_label);

6
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
View File

@@ -263,6 +263,10 @@ public class NetworkController extends BroadcastReceiver {
return mHasMobileDataFeature; return mHasMobileDataFeature;
} }
public boolean hasVoiceCallingFeature() {
return mPhone.getPhoneType() != TelephonyManager.PHONE_TYPE_NONE;
}
public boolean isEmergencyOnly() { public boolean isEmergencyOnly() {
return (mServiceState != null && mServiceState.isEmergencyOnly()); return (mServiceState != null && mServiceState.isEmergencyOnly());
} }
@@ -1377,6 +1381,8 @@ public class NetworkController extends BroadcastReceiver {
mConnected?"CONNECTED":"DISCONNECTED", mConnected?"CONNECTED":"DISCONNECTED",
mConnectedNetworkType, mConnectedNetworkTypeName)); mConnectedNetworkType, mConnectedNetworkTypeName));
pw.println(" - telephony ------"); pw.println(" - telephony ------");
pw.print(" hasVoiceCallingFeature()=");
pw.println(hasVoiceCallingFeature());
pw.print(" hasService()="); pw.print(" hasService()=");
pw.println(hasService()); pw.println(hasService());
pw.print(" mHspaDataDistinguishable="); pw.print(" mHspaDataDistinguishable=");