Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48aa13c0 authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

am 1b5eb97a: Accessibility improvements 

* commit '1b5eb97a':
  Accessibility improvements
parents b4e3c87f 1b5eb97a

packages/SystemUI/res/layout/signal_cluster_view.xml

+3 −1
Original line number Diff line number Diff line
@@ -84,8 +84,10 @@ 
        >

    </LinearLayout>

    <FrameLayout

        android:id="@+id/no_sims_combo"

        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

            android:theme="@style/DualToneLightTheme"

            android:id="@+id/no_sims"

packages/SystemUI/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -374,6 +374,9 @@ 
    <!-- 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>



    <!-- 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] -->

    <string name="accessibility_carrier_network_change_mode">Carrier network changing.</string>
@@ -1099,4 +1102,7 @@ 
    <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->

    <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>

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

+3 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ public class SignalClusterView 
    private float mDarkIntensity;



    ViewGroup mEthernetGroup, mWifiGroup;

    View mNoSimsCombo;

    ImageView mVpn, mEthernet, mWifi, mAirplane, mNoSims, mEthernetDark, mWifiDark, mNoSimsDark;

    View mWifiAirplaneSpacer;

    View mWifiSignalSpacer;
@@ -162,6 +163,7 @@ public class SignalClusterView 
        mAirplane       = (ImageView) findViewById(R.id.airplane);

        mNoSims         = (ImageView) findViewById(R.id.no_sims);

        mNoSimsDark     = (ImageView) findViewById(R.id.no_sims_dark);

        mNoSimsCombo    =             findViewById(R.id.no_sims_combo);

        mWifiAirplaneSpacer =         findViewById(R.id.wifi_airplane_spacer);

        mWifiSignalSpacer =           findViewById(R.id.wifi_signal_spacer);

        mMobileSignalGroup = (LinearLayout) findViewById(R.id.mobile_signal_group);
@@ -416,8 +418,7 @@ public class SignalClusterView 
            mWifiSignalSpacer.setVisibility(View.GONE);

        }



        mNoSims.setVisibility(mNoSimsVisible ? View.VISIBLE : View.GONE);

        mNoSimsDark.setVisibility(mNoSimsVisible ? View.VISIBLE : View.GONE);

        mNoSimsCombo.setVisibility(mNoSimsVisible ? View.VISIBLE : View.GONE);



        boolean anythingVisible = mNoSimsVisible || mWifiVisible || mIsAirplaneMode

                || anyMobileVisible || mVpnVisible || mEthernetVisible;

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

+2 −1
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ public class PhoneStatusBarPolicy { 
        mHotspot.addCallback(mHotspotCallback);



        // 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);

    }