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

Commit bc1eadf5 authored by Jorge Ruesga's avatar Jorge Ruesga
Browse files

QuickSettings: Honors config_show_cmIMESwitcher setting (2/2) 

Change-Id: If1900d35e562c27822322551343c4556539c4f4e
Required: http://review.cyanogenmod.org/#/c/33184


Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>
parent b83899ef

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

+10 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.internal.util.cm.QSConstants.TILE_PROFILE; 
import static com.android.internal.util.cm.QSConstants.TILE_WIFIAP;

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

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

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.deviceSupportsNfc;

import static com.android.internal.util.cm.QSUtils.deviceSupportsUsbTether;
@@ -148,9 +149,15 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
        mDynamicBugReport = (CheckBoxPreference) prefSet.findPreference(DYNAMIC_BUGREPORT);

        mDynamicBugReport.setChecked(Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_BUGREPORT, 1) == 1);

        mDynamicIme = (CheckBoxPreference) prefSet.findPreference(DYNAMIC_IME);

        if (mDynamicIme != null) {

            if (deviceSupportsImeSwitcher(getActivity())) {

                mDynamicIme.setChecked(Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_IME, 1) == 1);

            } else {

                mDynamicTiles.removePreference(mDynamicIme);

                mDynamicIme = null;

            }

        }

        mDynamicUsbTether = (CheckBoxPreference) prefSet.findPreference(DYNAMIC_USBTETHER);



        if (mDynamicUsbTether != null) {

            if (deviceSupportsUsbTether(getActivity())) {

                mDynamicUsbTether.setChecked(Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_USBTETHER, 1) == 1);
@@ -235,7 +242,7 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
            Settings.System.putInt(resolver, Settings.System.QS_DYNAMIC_BUGREPORT,

                    mDynamicBugReport.isChecked() ? 1 : 0);

            return true;

        } else if (preference == mDynamicIme) {

        } else if (mDynamicIme != null && preference == mDynamicIme) {

            Settings.System.putInt(resolver, Settings.System.QS_DYNAMIC_IME,

                    mDynamicIme.isChecked() ? 1 : 0);

            return true;