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

am 1b5eb97a: Accessibility improvements

Browse Source 
* commit '1b5eb97ae651cd1e70009d3f9bbe91da804a457a':
  Accessibility improvements
This commit is contained in:
Adrian Roos
2015-06-12 01:47:58 +00:00
committed by Android Git Automerger
parent b4e3c87f1a 1b5eb97ae6
commit 48aa13c096
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/signal_cluster_view.xml
View File

@@ -84,8 +84,10 @@
> >
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/no_sims_combo"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content"> android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_no_sims">
<com.android.systemui.statusbar.AlphaOptimizedImageView <com.android.systemui.statusbar.AlphaOptimizedImageView
android:theme="@style/DualToneLightTheme" android:theme="@style/DualToneLightTheme"
android:id="@+id/no_sims" android:id="@+id/no_sims"

6
packages/SystemUI/res/values/strings.xml
View File

@@ -374,6 +374,9 @@
<!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_airplane_mode">Airplane mode.</string> <string name="accessibility_airplane_mode">Airplane mode.</string>
<!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_no_sims">No SIM card.</string>
<!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_carrier_network_change_mode">Carrier network changing.</string> <string name="accessibility_carrier_network_change_mode">Carrier network changing.</string>
@@ -1099,4 +1102,7 @@
<!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] --> <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
<string name="accessibility_status_bar_hotspot">Hotspot</string> <string name="accessibility_status_bar_hotspot">Hotspot</string>
<!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
<string name="accessibility_managed_profile">Work profile</string>
</resources> </resources>

5
packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
View File

@@ -80,6 +80,7 @@ public class SignalClusterView
private float mDarkIntensity; private float mDarkIntensity;
ViewGroup mEthernetGroup, mWifiGroup; ViewGroup mEthernetGroup, mWifiGroup;
View mNoSimsCombo;
ImageView mVpn, mEthernet, mWifi, mAirplane, mNoSims, mEthernetDark, mWifiDark, mNoSimsDark; ImageView mVpn, mEthernet, mWifi, mAirplane, mNoSims, mEthernetDark, mWifiDark, mNoSimsDark;
View mWifiAirplaneSpacer; View mWifiAirplaneSpacer;
View mWifiSignalSpacer; View mWifiSignalSpacer;
@@ -162,6 +163,7 @@ public class SignalClusterView
mAirplane = (ImageView) findViewById(R.id.airplane); mAirplane = (ImageView) findViewById(R.id.airplane);
mNoSims = (ImageView) findViewById(R.id.no_sims); mNoSims = (ImageView) findViewById(R.id.no_sims);
mNoSimsDark = (ImageView) findViewById(R.id.no_sims_dark); mNoSimsDark = (ImageView) findViewById(R.id.no_sims_dark);
mNoSimsCombo = findViewById(R.id.no_sims_combo);
mWifiAirplaneSpacer = findViewById(R.id.wifi_airplane_spacer); mWifiAirplaneSpacer = findViewById(R.id.wifi_airplane_spacer);
mWifiSignalSpacer = findViewById(R.id.wifi_signal_spacer); mWifiSignalSpacer = findViewById(R.id.wifi_signal_spacer);
mMobileSignalGroup = (LinearLayout) findViewById(R.id.mobile_signal_group); mMobileSignalGroup = (LinearLayout) findViewById(R.id.mobile_signal_group);
@@ -416,8 +418,7 @@ public class SignalClusterView
mWifiSignalSpacer.setVisibility(View.GONE); mWifiSignalSpacer.setVisibility(View.GONE);
} }
mNoSims.setVisibility(mNoSimsVisible ? View.VISIBLE : View.GONE); mNoSimsCombo.setVisibility(mNoSimsVisible ? View.VISIBLE : View.GONE);
mNoSimsDark.setVisibility(mNoSimsVisible ? View.VISIBLE : View.GONE);
boolean anythingVisible = mNoSimsVisible || mWifiVisible || mIsAirplaneMode boolean anythingVisible = mNoSimsVisible || mWifiVisible || mIsAirplaneMode
|| anyMobileVisible || mVpnVisible || mEthernetVisible; || anyMobileVisible || mVpnVisible || mEthernetVisible;

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
View File

@@ -168,7 +168,8 @@ public class PhoneStatusBarPolicy {
mHotspot.addCallback(mHotspotCallback); mHotspot.addCallback(mHotspotCallback);
// managed profile // managed profile
mService.setIcon(SLOT_MANAGED_PROFILE, R.drawable.stat_sys_managed_profile_status, 0, null); mService.setIcon(SLOT_MANAGED_PROFILE, R.drawable.stat_sys_managed_profile_status, 0,
mContext.getString(R.string.accessibility_managed_profile));
mService.setIconVisibility(SLOT_MANAGED_PROFILE, false); mService.setIconVisibility(SLOT_MANAGED_PROFILE, false);
} }