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

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

Merge "Hide arrows in QS tile if mobile data is disabled."

parents 1dbac1a5 0a8155e0

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -168,12 +168,12 @@ public class CellularTile extends QSTileImpl<SignalState> { 
        }

        }





        final Resources r = mContext.getResources();

        final Resources r = mContext.getResources();

        state.activityIn = cb.enabled && cb.activityIn;

        state.activityOut = cb.enabled && cb.activityOut;

        state.label = r.getString(R.string.mobile_data);

        state.label = r.getString(R.string.mobile_data);

        boolean mobileDataEnabled = mDataController.isMobileDataSupported()

        boolean mobileDataEnabled = mDataController.isMobileDataSupported()

                && mDataController.isMobileDataEnabled();

                && mDataController.isMobileDataEnabled();

        state.value = mobileDataEnabled;

        state.value = mobileDataEnabled;

        state.activityIn = mobileDataEnabled && cb.activityIn;

        state.activityOut = mobileDataEnabled && cb.activityOut;

        state.expandedAccessibilityClassName = Switch.class.getName();

        state.expandedAccessibilityClassName = Switch.class.getName();

        if (cb.noSim) {

        if (cb.noSim) {

            state.icon = ResourceIcon.get(R.drawable.ic_qs_no_sim);

            state.icon = ResourceIcon.get(R.drawable.ic_qs_no_sim);
@@ -231,7 +231,6 @@ public class CellularTile extends QSTileImpl<SignalState> { 
    }

    }





    private static final class CallbackInfo {

    private static final class CallbackInfo {

        boolean enabled;

        boolean airplaneModeEnabled;

        boolean airplaneModeEnabled;

        String dataContentDescription;

        String dataContentDescription;

        boolean activityIn;

        boolean activityIn;
@@ -251,7 +250,6 @@ public class CellularTile extends QSTileImpl<SignalState> { 
                // Not data sim, don't display.

                // Not data sim, don't display.

                return;

                return;

            }

            }

            mInfo.enabled = qsIcon.visible;

            mInfo.dataContentDescription = typeContentDescription;

            mInfo.dataContentDescription = typeContentDescription;

            mInfo.activityIn = activityIn;

            mInfo.activityIn = activityIn;

            mInfo.activityOut = activityOut;

            mInfo.activityOut = activityOut;