Merge "Accessibility enhancements within quick settings and notification shade." into jb-mr1-dev (62f1722d) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/strings.xml

+60 −5

Original line number	Diff line number	Diff line
		@@ -256,16 +256,18 @@
		<!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_signal_full">Data signal full.</string>

		<!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_wifi_off">Wifi off.</string>
		<!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_no_wifi">No Wi-Fi.</string>
		<string name="accessibility_no_wifi">Wifi disconnected.</string>
		<!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_wifi_one_bar">Wi-Fi one bar.</string>
		<string name="accessibility_wifi_one_bar">Wifi one bar.</string>
		<!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_wifi_two_bars">Wi-Fi two bars.</string>
		<string name="accessibility_wifi_two_bars">Wifi two bars.</string>
		<!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_wifi_three_bars">Wi-Fi three bars.</string>
		<string name="accessibility_wifi_three_bars">Wifi three bars.</string>
		<!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_wifi_signal_full">Wi-Fi signal full.</string>
		<string name="accessibility_wifi_signal_full">Wifi signal full.</string>

		<!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_no_wimax">No WiMAX.</string>
		@@ -278,9 +280,37 @@
		<!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_wimax_signal_full">WiMAX signal full.</string>

		<!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_no_signal">No signal.</string>
		<!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
		<string name="accessibility_not_connected">Not connected.</string>
		<!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_zero_bars">Zero bars.</string>
		<!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_one_bar">One bar.</string>
		<!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_two_bars">Two bars.</string>
		<!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_three_bars">Three bars.</string>
		<!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_signal_full">Signal full.</string>

		<!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_desc_on">On.</string>
		<!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_desc_off">Off.</string>
		<!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_desc_connected">Connected.</string>

		<!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_gprs">GPRS</string>

		<!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_1x">1 X</string>

		<!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_hspa">HSPA</string>

		<!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_3g">3G</string>

		@@ -293,6 +323,9 @@
		<!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_cdma">CDMA</string>

		<!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_roaming">Roaming</string>

		<!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_data_connection_edge">Edge</string>

		@@ -337,6 +370,28 @@

		<!-- Content description to tell the user an application has been removed from recents -->
		<string name="accessibility_recents_item_dismissed"><xliff:g id="app" example="Calendar">%s</xliff:g> dismissed.</string>
		<!-- Content description to tell the user a notification has been removed from the notification shade -->
		<string name="accessibility_notification_dismissed">Notification dismissed.</string>

		<!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_desc_notification_shade">Notification shade.</string>
		<!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_desc_quick_settings">Quick settings.</string>

		<!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_user">User <xliff:g id="user" example="John Doe">%s</xliff:g>.</string>
		<!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_wifi"><xliff:g id="signal" example="Three bars">%1$s</xliff:g>. <xliff:g id="network" example="MyWifiNetwork">%2$s</xliff:g></string>
		<!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_mobile">Mobile <xliff:g id="signal" example="Three bars">%1$s</xliff:g>. <xliff:g id="type" example="4G">%2$s</xliff:g>. <xliff:g id="network" example="T-Mobile">%3$s</xliff:g>.</string>
		<!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_battery">Battery <xliff:g id="state" example="50% charging">%s</xliff:g>.</string>
		<!-- Content description of the airplane mode tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_airplane">Airplane Mode <xliff:g id="state" example="Off">%s</xliff:g>.</string>
		<!-- Content description of the bluetooth tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_bluetooth">Bluetooth <xliff:g id="state" example="Off">%s</xliff:g>.</string>
		<!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_alarm">Alarm set for <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string>

		<!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
		<string name="data_usage_disabled_dialog_3g_title">2G-3G data disabled</string>

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -301,8 +301,12 @@ public abstract class BaseStatusBar extends SystemUI implements
		final int _id = n.id;
		vetoButton.setOnClickListener(new View.OnClickListener() {
		public void onClick(View v) {
		// Accessibility feedback
		v.announceForAccessibility(
		mContext.getString(R.string.accessibility_notification_dismissed));
		try {
		mBarService.onNotificationClear(_pkg, _tag, _id);

		} catch (RemoteException ex) {
		// system process is dead if we're here.
		}
		@@ -312,6 +316,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		} else {
		vetoButton.setVisibility(View.GONE);
		}
		vetoButton.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
		return vetoButton;
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,8 @@ public class NotificationPanelView extends PanelView {
		mHandleBar = resources.getDrawable(R.drawable.status_bar_close);
		mHandleBarHeight = resources.getDimension(R.dimen.close_handle_height);
		mHandleView = findViewById(R.id.handle);

		setContentDescription(resources.getString(R.string.accessibility_desc_notification_shade));
		}

		@Override

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ public class PhoneStatusBarView extends PanelBar {

		boolean mFullWidthNotifications;
		PanelView mFadingPanel = null;
		PanelView mLastFullyOpenedPanel = null;
		PanelView mNotificationPanel, mSettingsPanel;
		private boolean mShouldFade;

		@@ -145,12 +146,17 @@ public class PhoneStatusBarView extends PanelBar {
		super.onAllPanelsCollapsed();
		mBar.makeExpandedInvisible();
		mFadingPanel = null;
		mLastFullyOpenedPanel = null;
		}

		@Override
		public void onPanelFullyOpened(PanelView openPanel) {
		super.onPanelFullyOpened(openPanel);
		if (openPanel != mLastFullyOpenedPanel) {
		openPanel.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
		}
		mFadingPanel = openPanel;
		mLastFullyOpenedPanel = openPanel;
		mShouldFade = true; // now you own the fade, mister
		}

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

+36 −6

Original line number	Diff line number	Diff line
		@@ -19,9 +19,12 @@ package com.android.systemui.statusbar.phone;
		import com.android.internal.view.RotationPolicy;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.systemui.R;

		import com.android.systemui.statusbar.phone.QuickSettingsModel.BluetoothState;
		import com.android.systemui.statusbar.phone.QuickSettingsModel.RSSIState;
		import com.android.systemui.statusbar.phone.QuickSettingsModel.State;
		import com.android.systemui.statusbar.phone.QuickSettingsModel.UserState;
		import com.android.systemui.statusbar.phone.QuickSettingsModel.WifiState;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.BluetoothController;
		import com.android.systemui.statusbar.policy.BrightnessController;
		@@ -90,7 +93,7 @@ class QuickSettings {
		private DisplayManager mDisplayManager;
		private WifiDisplayStatus mWifiDisplayStatus;
		private PhoneStatusBar mStatusBarService;
		private QuickSettingsModel.BluetoothState mBluetoothState;
		private BluetoothState mBluetoothState;

		private BrightnessController mBrightnessController;
		private BluetoothController mBluetoothController;
		@@ -305,6 +308,8 @@ class QuickSettings {
		if (us.avatar != null) {
		iv.setImageDrawable(us.avatar);
		}
		view.setContentDescription(mContext.getString(
		R.string.accessibility_quick_settings_user, state.label));
		}
		});
		parent.addView(userTile);
		@@ -363,9 +368,14 @@ class QuickSettings {
		mModel.addWifiTile(wifiTile, new QuickSettingsModel.RefreshCallback() {
		@Override
		public void refreshView(QuickSettingsTileView view, State state) {
		WifiState wifiState = (WifiState) state;
		TextView tv = (TextView) view.findViewById(R.id.wifi_textview);
		tv.setCompoundDrawablesWithIntrinsicBounds(0, state.iconId, 0, 0);
		tv.setText(state.label);
		tv.setCompoundDrawablesWithIntrinsicBounds(0, wifiState.iconId, 0, 0);
		tv.setText(wifiState.label);
		view.setContentDescription(mContext.getString(
		R.string.accessibility_quick_settings_wifi,
		wifiState.signalContentDescription,
		(wifiState.connected) ? wifiState.label : ""));
		}
		});
		parent.addView(wifiTile);
		@@ -393,12 +403,17 @@ class QuickSettings {
		ImageView iov = (ImageView) view.findViewById(R.id.rssi_overlay_image);
		TextView tv = (TextView) view.findViewById(R.id.rssi_textview);
		iv.setImageResource(rssiState.signalIconId);

		if (rssiState.dataTypeIconId > 0) {
		iov.setImageResource(rssiState.dataTypeIconId);
		} else {
		iov.setImageDrawable(null);
		}
		tv.setText(state.label);
		view.setContentDescription(mContext.getResources().getString(
		R.string.accessibility_quick_settings_mobile,
		rssiState.signalContentDescription, rssiState.dataContentDescription,
		state.label));
		}
		});
		parent.addView(rssiTile);
		@@ -460,6 +475,8 @@ class QuickSettings {
		iv.setImageDrawable(d);
		iv.setImageLevel(batteryState.batteryLevel);
		tv.setText(t);
		view.setContentDescription(
		mContext.getString(R.string.accessibility_quick_settings_battery, t));
		}
		});
		parent.addView(batteryTile);
		@@ -473,6 +490,12 @@ class QuickSettings {
		public void refreshView(QuickSettingsTileView view, State state) {
		TextView tv = (TextView) view.findViewById(R.id.airplane_mode_textview);
		tv.setCompoundDrawablesWithIntrinsicBounds(0, state.iconId, 0, 0);

		String airplaneState = mContext.getString(
		(state.enabled) ? R.string.accessibility_desc_on
		: R.string.accessibility_desc_off);
		view.setContentDescription(
		mContext.getString(R.string.accessibility_quick_settings_airplane, airplaneState));
		tv.setText(state.label);
		}
		});
		@@ -492,6 +515,7 @@ class QuickSettings {
		mModel.addBluetoothTile(bluetoothTile, new QuickSettingsModel.RefreshCallback() {
		@Override
		public void refreshView(QuickSettingsTileView view, State state) {
		BluetoothState bluetoothState = (BluetoothState) state;
		TextView tv = (TextView) view.findViewById(R.id.bluetooth_textview);
		tv.setCompoundDrawablesWithIntrinsicBounds(0, state.iconId, 0, 0);

		@@ -510,6 +534,9 @@ class QuickSettings {
		btDevices.size());
		}
		*/
		view.setContentDescription(mContext.getString(
		R.string.accessibility_quick_settings_bluetooth,
		bluetoothState.stateContentDescription));
		tv.setText(label);
		}
		});
		@@ -561,6 +588,8 @@ class QuickSettings {
		TextView tv = (TextView) view.findViewById(R.id.alarm_textview);
		tv.setText(alarmState.label);
		view.setVisibility(alarmState.enabled ? View.VISIBLE : View.GONE);
		view.setContentDescription(mContext.getString(
		R.string.accessibility_quick_settings_alarm, alarmState.label));
		}
		});
		parent.addView(alarmTile);
		@@ -831,6 +860,7 @@ class QuickSettings {
		Log.e(TAG, "Couldn't get current user id for profile change", e);
		}
		}

		}
		};
		}