diff options
Diffstat (limited to 'packages/SystemUI/src/com/android')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java | 11 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java | 24 |
2 files changed, 25 insertions, 10 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 59b09d4..744a46b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -44,6 +44,7 @@ public class SignalClusterView private boolean mMobileVisible = false; private int mMobileStrengthId = 0, mMobileActivityId = 0, mMobileTypeId = 0; private boolean mIsAirplaneMode = false; + private String mWifiDescription, mMobileDescription, mMobileTypeDescription; ViewGroup mWifiGroup, mMobileGroup; ImageView mWifi, mMobile, mWifiActivity, mMobileActivity, mMobileType; @@ -95,20 +96,24 @@ public class SignalClusterView super.onDetachedFromWindow(); } - public void setWifiIndicators(boolean visible, int strengthIcon, int activityIcon) { + public void setWifiIndicators(boolean visible, int strengthIcon, int activityIcon, + String contentDescription) { mWifiVisible = visible; mWifiStrengthId = strengthIcon; mWifiActivityId = activityIcon; + mWifiDescription = contentDescription; apply(); } public void setMobileDataIndicators(boolean visible, int strengthIcon, int activityIcon, - int typeIcon) { + int typeIcon, String contentDescription, String typeContentDescription) { mMobileVisible = visible; mMobileStrengthId = strengthIcon; mMobileActivityId = activityIcon; mMobileTypeId = typeIcon; + mMobileDescription = contentDescription; + mMobileTypeDescription = typeContentDescription; apply(); } @@ -125,6 +130,7 @@ public class SignalClusterView mWifiGroup.setVisibility(View.VISIBLE); mWifi.setImageResource(mWifiStrengthId); mWifiActivity.setImageResource(mWifiActivityId); + mWifiGroup.setContentDescription(mWifiDescription); } else { mWifiGroup.setVisibility(View.GONE); } @@ -139,6 +145,7 @@ public class SignalClusterView mMobile.setImageResource(mMobileStrengthId); mMobileActivity.setImageResource(mMobileActivityId); mMobileType.setImageResource(mMobileTypeId); + mMobileGroup.setContentDescription(mMobileTypeDescription + " " + mMobileDescription); } else { mMobileGroup.setVisibility(View.GONE); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index c83c470..ae5175f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -139,9 +139,10 @@ public class NetworkController extends BroadcastReceiver { IBatteryStats mBatteryStats; public interface SignalCluster { - void setWifiIndicators(boolean visible, int strengthIcon, int activityIcon); + void setWifiIndicators(boolean visible, int strengthIcon, int activityIcon, + String contentDescription); void setMobileDataIndicators(boolean visible, int strengthIcon, int activityIcon, - int typeIcon); + int typeIcon, String contentDescription, String typeContentDescription); void setIsAirplaneMode(boolean is); } @@ -235,12 +236,16 @@ public class NetworkController extends BroadcastReceiver { cluster.setWifiIndicators( mWifiConnected, // only show wifi in the cluster if connected mWifiIconId, - mWifiActivityIconId); + mWifiActivityIconId, + mContentDescriptionWifi); cluster.setMobileDataIndicators( mHasMobileDataFeature, mPhoneSignalIconId, mMobileActivityIconId, - mDataTypeIconId); + mDataTypeIconId, + mContentDescriptionPhoneSignal, + mContentDescriptionDataType); + } public void setStackedMode(boolean stacked) { @@ -806,8 +811,8 @@ public class NetworkController extends BroadcastReceiver { (mServiceState == null || (!hasService() && !mServiceState.isEmergencyOnly()))) { // Only display the flight-mode icon if not in "emergency calls only" mode. label = context.getString(R.string.status_bar_settings_signal_meter_disconnected); - mContentDescriptionCombinedSignal = mContext.getString( - R.string.accessibility_airplane_mode); + mContentDescriptionCombinedSignal = mContentDescriptionPhoneSignal + = mContext.getString(R.string.accessibility_airplane_mode); // look again; your radios are now airplanes mPhoneSignalIconId = mDataSignalIconId = R.drawable.stat_sys_signal_flightmode; @@ -862,12 +867,15 @@ public class NetworkController extends BroadcastReceiver { cluster.setWifiIndicators( mWifiConnected, // only show wifi in the cluster if connected mWifiIconId, - mWifiActivityIconId); + mWifiActivityIconId, + mContentDescriptionWifi); cluster.setMobileDataIndicators( mHasMobileDataFeature, mPhoneSignalIconId, mMobileActivityIconId, - mDataTypeIconId); + mDataTypeIconId, + mContentDescriptionPhoneSignal, + mContentDescriptionDataType); cluster.setIsAirplaneMode(mAirplaneMode); } } |