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

Commit 99c07af2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Allow for HTML styling in mobile data type content... 

Merge "DO NOT MERGE Allow for HTML styling in mobile data type content descriptions" into qt-qpr1-dev
parents 5061c99b 83c87e50

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -440,6 +440,9 @@ 
    <!-- Content description of the data connection type 5Ge. [CHAR LIMIT=NONE] -->

    <!-- Content description of the data connection type 5Ge. [CHAR LIMIT=NONE] -->

    <string name="data_connection_5ge" translate="false">5Ge</string>

    <string name="data_connection_5ge" translate="false">5Ge</string>





    <!-- Content description of the data connection type 5Ge with HTML styling. DO NOT TRANSLATE [CHAR LIMIT=NONE] -->

    <string name="data_connection_5ge_html" translate="false"> &lt;i>5G &lt;small>E&lt;/small>&lt;/i> </string>



    <!-- Content description of the data connection type 5G. [CHAR LIMIT=NONE] -->

    <!-- Content description of the data connection type 5G. [CHAR LIMIT=NONE] -->

    <string name="data_connection_5g" translate="false">5G</string>

    <string name="data_connection_5g" translate="false">5G</string>

packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroup.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -207,8 +207,9 @@ public class QSCarrierGroup extends LinearLayout implements 
    public void setMobileDataIndicators(NetworkController.IconState statusIcon,

    public void setMobileDataIndicators(NetworkController.IconState statusIcon,

            NetworkController.IconState qsIcon, int statusType,

            NetworkController.IconState qsIcon, int statusType,

            int qsType, boolean activityIn, boolean activityOut,

            int qsType, boolean activityIn, boolean activityOut,

            String typeContentDescription,

            CharSequence typeContentDescription,

            String description, boolean isWide, int subId, boolean roaming) {

            CharSequence typeContentDescriptionHtml, CharSequence description,

            boolean isWide, int subId, boolean roaming) {

        int slotIndex = getSlotIndex(subId);

        int slotIndex = getSlotIndex(subId);

        if (slotIndex >= SIM_SLOTS) {

        if (slotIndex >= SIM_SLOTS) {

            Log.w(TAG, "setMobileDataIndicators - slot: " + slotIndex);

            Log.w(TAG, "setMobileDataIndicators - slot: " + slotIndex);
@@ -221,7 +222,7 @@ public class QSCarrierGroup extends LinearLayout implements 
        mInfos[slotIndex].visible = statusIcon.visible;

        mInfos[slotIndex].visible = statusIcon.visible;

        mInfos[slotIndex].mobileSignalIconId = statusIcon.icon;

        mInfos[slotIndex].mobileSignalIconId = statusIcon.icon;

        mInfos[slotIndex].contentDescription = statusIcon.contentDescription;

        mInfos[slotIndex].contentDescription = statusIcon.contentDescription;

        mInfos[slotIndex].typeContentDescription = typeContentDescription;

        mInfos[slotIndex].typeContentDescription = typeContentDescription.toString();

        mInfos[slotIndex].roaming = roaming;

        mInfos[slotIndex].roaming = roaming;

        handleUpdateState();

        handleUpdateState();

    }

    }

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

+11 −6
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.res.Resources; 
import android.provider.Settings;

import android.provider.Settings;

import android.service.quicksettings.Tile;

import android.service.quicksettings.Tile;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager;

import android.text.Html;

import android.text.TextUtils;

import android.text.TextUtils;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View;
@@ -206,12 +207,13 @@ public class CellularTile extends QSTileImpl<SignalState> { 




    private CharSequence appendMobileDataType(CharSequence current, CharSequence dataType) {

    private CharSequence appendMobileDataType(CharSequence current, CharSequence dataType) {

        if (TextUtils.isEmpty(dataType)) {

        if (TextUtils.isEmpty(dataType)) {

            return current;

            return Html.fromHtml(current.toString(), 0);

        }

        }

        if (TextUtils.isEmpty(current)) {

        if (TextUtils.isEmpty(current)) {

            return dataType;

            return Html.fromHtml(dataType.toString(), 0);

        }

        }

        return mContext.getString(R.string.mobile_carrier_text_format, current, dataType);

        String concat = mContext.getString(R.string.mobile_carrier_text_format, current, dataType);

        return Html.fromHtml(concat, 0);

    }

    }





    private CharSequence getMobileDataContentName(CallbackInfo cb) {

    private CharSequence getMobileDataContentName(CallbackInfo cb) {
@@ -252,14 +254,17 @@ public class CellularTile extends QSTileImpl<SignalState> { 




        @Override

        @Override

        public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType,

        public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType,

                int qsType, boolean activityIn, boolean activityOut, String typeContentDescription,

                int qsType, boolean activityIn, boolean activityOut,

                String description, boolean isWide, int subId, boolean roaming) {

                CharSequence typeContentDescription,

                CharSequence typeContentDescriptionHtml, CharSequence description,

                boolean isWide, int subId, boolean roaming) {

            if (qsIcon == null) {

            if (qsIcon == null) {

                // Not data sim, don't display.

                // Not data sim, don't display.

                return;

                return;

            }

            }

            mInfo.dataSubscriptionName = mController.getMobileDataNetworkName();

            mInfo.dataSubscriptionName = mController.getMobileDataNetworkName();

            mInfo.dataContentDescription = (description != null) ? typeContentDescription : null;

            mInfo.dataContentDescription =

                    (description != null) ? typeContentDescriptionHtml : null;

            mInfo.activityIn = activityIn;

            mInfo.activityIn = activityIn;

            mInfo.activityOut = activityOut;

            mInfo.activityOut = activityOut;

            mInfo.roaming = roaming;

            mInfo.roaming = roaming;

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -177,8 +177,10 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba 




    @Override

    @Override

    public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType,

    public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType,

            int qsType, boolean activityIn, boolean activityOut, String typeContentDescription,

            int qsType, boolean activityIn, boolean activityOut,

            String description, boolean isWide, int subId, boolean roaming) {

            CharSequence typeContentDescription,

            CharSequence typeContentDescriptionHtml, CharSequence description,

            boolean isWide, int subId, boolean roaming) {

        MobileIconState state = getState(subId);

        MobileIconState state = getState(subId);

        if (state == null) {

        if (state == null) {

            return;

            return;
@@ -387,7 +389,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba 
        public int typeId;

        public int typeId;

        public boolean roaming;

        public boolean roaming;

        public boolean needsLeadingPadding;

        public boolean needsLeadingPadding;

        public String typeContentDescription;

        public CharSequence typeContentDescription;





        private MobileIconState(int subId) {

        private MobileIconState(int subId) {

            super();

            super();

packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java

+13 −18
Original line number Original line Diff line number Diff line
@@ -111,30 +111,25 @@ public class CallbackHandler extends Handler implements EmergencyListener, Signa 
    public void setWifiIndicators(final boolean enabled, final IconState statusIcon,

    public void setWifiIndicators(final boolean enabled, final IconState statusIcon,

            final IconState qsIcon, final boolean activityIn, final boolean activityOut,

            final IconState qsIcon, final boolean activityIn, final boolean activityOut,

            final String description, boolean isTransient, String secondaryLabel) {

            final String description, boolean isTransient, String secondaryLabel) {

        post(new Runnable() {

        post(() -> {

            @Override

            public void run() {

            for (SignalCallback callback : mSignalCallbacks) {

            for (SignalCallback callback : mSignalCallbacks) {

                callback.setWifiIndicators(enabled, statusIcon, qsIcon, activityIn, activityOut,

                callback.setWifiIndicators(enabled, statusIcon, qsIcon, activityIn, activityOut,

                        description, isTransient, secondaryLabel);

                        description, isTransient, secondaryLabel);

            }

            }

            }

        });

        });

    }

    }





    @Override

    @Override

    public void setMobileDataIndicators(final IconState statusIcon, final IconState qsIcon,

    public void setMobileDataIndicators(final IconState statusIcon, final IconState qsIcon,

            final int statusType, final int qsType, final boolean activityIn,

            final int statusType, final int qsType, final boolean activityIn,

            final boolean activityOut, final String typeContentDescription,

            final boolean activityOut, final CharSequence typeContentDescription,

            final String description, final boolean isWide, final int subId, boolean roaming) {

            CharSequence typeContentDescriptionHtml, final CharSequence description,

        post(new Runnable() {

            final boolean isWide, final int subId, boolean roaming) {

            @Override

        post(() -> {

            public void run() {

            for (SignalCallback signalCluster : mSignalCallbacks) {

            for (SignalCallback signalCluster : mSignalCallbacks) {

                signalCluster.setMobileDataIndicators(statusIcon, qsIcon, statusType, qsType,

                signalCluster.setMobileDataIndicators(statusIcon, qsIcon, statusType, qsType,

                            activityIn, activityOut, typeContentDescription, description, isWide,

                        activityIn, activityOut, typeContentDescription,

                            subId, roaming);

                        typeContentDescriptionHtml, description, isWide, subId, roaming);

                }

            }

            }

        });

        });

    }

    }