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

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

Merge "Quick Settings - adjust dynamic tile display" into cm-10.1

parents 0df215bb 7cecd170

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

+18 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.hardware.display.DisplayManager;

import android.hardware.display.WifiDisplayStatus;

import android.net.ConnectivityManager;

import android.nfc.NfcAdapter;

import android.os.Bundle;
@@ -63,6 +65,7 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
    private static final String COLLAPSE_PANEL = "collapse_panel";

    private static final String GENERAL_SETTINGS = "pref_general_settings";

    private static final String STATIC_TILES = "static_tiles";

    private static final String DYNAMIC_TILES = "pref_dynamic_tiles";



    MultiSelectListPreference mRingMode;

    ListPreference mNetworkMode;
@@ -76,6 +79,7 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
    ListPreference mQuickPulldown;

    PreferenceCategory mGeneralSettings;

    PreferenceCategory mStaticTiles;

    PreferenceCategory mDynamicTiles;



    @Override

    public void onCreate(Bundle savedInstanceState) {
@@ -92,6 +96,7 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
        ContentResolver resolver = getActivity().getContentResolver();

        mGeneralSettings = (PreferenceCategory) prefSet.findPreference(GENERAL_SETTINGS);

        mStaticTiles = (PreferenceCategory) prefSet.findPreference(STATIC_TILES);

        mDynamicTiles = (PreferenceCategory) prefSet.findPreference(DYNAMIC_TILES);

        mQuickPulldown = (ListPreference) prefSet.findPreference(QUICK_PULLDOWN);

        if (!Utils.isPhone(getActivity())) {

            if(mQuickPulldown != null)
@@ -141,6 +146,14 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
        mDynamicWifi = (CheckBoxPreference) prefSet.findPreference(DYNAMIC_WIFI);

        mDynamicWifi.setChecked(Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_WIFI, 1) == 1);



        if (!deviceSupportsUsbTether()) {

            mDynamicTiles.removePreference(mDynamicUsbTether);

        }



        if (!deviceSupportsWifiDisplay()) {

            mDynamicTiles.removePreference(mDynamicWifi);

        }



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

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

        if (!isMobileData) {
@@ -321,4 +334,9 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
        ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);

        return (cm.getTetherableUsbRegexs().length != 0);

    }



    private boolean deviceSupportsWifiDisplay() {

        DisplayManager dm = (DisplayManager)getActivity().getSystemService(Context.DISPLAY_SERVICE);

        return (dm.getWifiDisplayStatus().getFeatureState() != WifiDisplayStatus.FEATURE_STATE_UNAVAILABLE);

    }

}