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

Commit 61c0976a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the A11y issues in the InternetTile" into sc-dev am: 7b3170e4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13606632

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I589feedd6b2967b669d28b3687886cd1460d99cc
parents 9a5d0a52 7b3170e4

packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java

+7 −10
Original line number Diff line number Diff line
@@ -248,15 +248,13 @@ public class InternetTile extends QSTileImpl<SignalState> { 
                        + "isTransient = " + isTransient + ","

                        + "statusLabel = " + statusLabel);

            }

            // When airplane mode is enabled, we need to refresh the Internet Tile even if the WiFi

            // is not the default network.

            mWifiInfo.mEnabled = enabled;

            if (qsIcon == null) {

                return;

            }

            mWifiInfo.mConnected = qsIcon.visible;

            mWifiInfo.mWifiSignalIconId = qsIcon.icon;

            mWifiInfo.mWifiSignalContentDescription = qsIcon.contentDescription;

            mWifiInfo.mEnabled = enabled;

            mWifiInfo.mSsid = description;

            mWifiInfo.mActivityIn = activityIn;

            mWifiInfo.mActivityOut = activityOut;
@@ -465,14 +463,13 @@ public class InternetTile extends QSTileImpl<SignalState> { 
        }

        minimalContentDescription.append(

            mContext.getString(R.string.quick_settings_internet_label)).append(",");

        if (state.value) {

            if (wifiConnected) {

        if (state.value && wifiConnected) {

            minimalStateDescription.append(cb.mWifiSignalContentDescription);

            minimalContentDescription.append(removeDoubleQuotes(cb.mSsid));

        } else if (!TextUtils.isEmpty(state.secondaryLabel)) {

            minimalContentDescription.append(",").append(state.secondaryLabel);

        }

        }



        state.stateDescription = minimalStateDescription.toString();

        state.contentDescription = minimalContentDescription.toString();

        state.dualLabelContentDescription = r.getString(

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import java.util.Objects; 
public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallback,

        SecurityController.SecurityControllerCallback, Tunable {

    private static final String TAG = "StatusBarSignalPolicy";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.INFO);

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    private final String mSlotAirplane;

    private final String mSlotMobile;