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

Commit 67f59560 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "QS/PW: Check for mobile data instead of telephony permissions (2/2)" into cm-10.1

parents ec8357a0 3ed641a0

src/com/android/settings/cyanogenmod/PowerWidget.java

+3 −2
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ import com.android.internal.telephony.Phone; 
import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;



import static com.android.internal.util.cm.QSUtils.deviceSupportsMobileData;



public class PowerWidget extends SettingsPreferenceFragment implements

        Preference.OnPreferenceChangeListener {

    private static final String TAG = "PowerWidget";
@@ -244,8 +246,7 @@ public class PowerWidget extends SettingsPreferenceFragment implements 
            }



            // Don't show mobile data options if not supported

            boolean isMobileData = pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY);

            if (!isMobileData) {

            if (!deviceSupportsMobileData(getActivity())) {

                PowerWidgetUtil.BUTTONS.remove(PowerWidgetUtil.BUTTON_MOBILEDATA);

                PowerWidgetUtil.BUTTONS.remove(PowerWidgetUtil.BUTTON_NETWORKMODE);

                PowerWidgetUtil.BUTTONS.remove(PowerWidgetUtil.BUTTON_WIFIAP);

src/com/android/settings/cyanogenmod/QuickSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static com.android.internal.util.cm.QSUtils.deviceSupportsBluetooth; 
import static com.android.internal.util.cm.QSUtils.deviceSupportsDockBattery;

import static com.android.internal.util.cm.QSUtils.deviceSupportsImeSwitcher;

import static com.android.internal.util.cm.QSUtils.deviceSupportsLte;

import static com.android.internal.util.cm.QSUtils.deviceSupportsMobileData;

import static com.android.internal.util.cm.QSUtils.deviceSupportsNfc;

import static com.android.internal.util.cm.QSUtils.deviceSupportsUsbTether;

import static com.android.internal.util.cm.QSUtils.deviceSupportsWifiDisplay;
@@ -192,8 +193,7 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
        }



        // Don't show mobile data options if not supported

        boolean isMobileData = pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY);

        if (!isMobileData) {

        if (!deviceSupportsMobileData(getActivity())) {

            QuickSettingsUtil.TILES.remove(TILE_MOBILEDATA);

            QuickSettingsUtil.TILES.remove(TILE_WIFIAP);

            QuickSettingsUtil.TILES.remove(TILE_NETWORKMODE);

src/com/android/settings/cyanogenmod/QuickSettingsUtil.java

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import static com.android.internal.util.cm.QSConstants.TILE_VOLUME; 
import static com.android.internal.util.cm.QSConstants.TILE_WIFI;

import static com.android.internal.util.cm.QSConstants.TILE_WIFIAP;

import static com.android.internal.util.cm.QSUtils.deviceSupportsBluetooth;

import static com.android.internal.util.cm.QSUtils.deviceSupportsTelephony;

import static com.android.internal.util.cm.QSUtils.deviceSupportsMobileData;



import java.util.ArrayList;

import java.util.Arrays;
@@ -197,13 +197,13 @@ public class QuickSettingsUtil { 
    public static String getDefaultTiles(Context context) {

        // Filter items not compatible with device

        boolean bluetoothSupported = deviceSupportsBluetooth();

        boolean telephonySupported = deviceSupportsTelephony(context);

        boolean mobileDataSupported = deviceSupportsMobileData(context);



        if (!bluetoothSupported) {

            TILES_DEFAULT.remove(TILE_BLUETOOTH);

        }



        if (!telephonySupported) {

        if (!mobileDataSupported) {

            TILES_DEFAULT.remove(TILE_MOBILEDATA);

        }