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

Commit b5845790 authored by Jorge Ruesga's avatar Jorge Ruesga Committed by codeworkx
Browse files

QuickSettings: Honors config_show_cmIMESwitcher setting (1/2) 

Change-Id: Ia93945cda1a7e491dd3f52c61623b3064624e575
parent 976bc185

core/java/com/android/internal/util/cm/QSUtils.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ import android.bluetooth.BluetoothAdapter; 
import android.content.ContentResolver;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManager;

import android.hardware.display.WifiDisplayStatus;

import android.hardware.display.WifiDisplayStatus;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager;
@@ -14,6 +15,11 @@ import android.telephony.TelephonyManager; 
import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneConstants;





public class QSUtils {

public class QSUtils {

        public static boolean deviceSupportsImeSwitcher(Context ctx) {

            Resources res = ctx.getResources();

            return res.getBoolean(com.android.internal.R.bool.config_show_cmIMESwitcher);

        }



        public static boolean deviceSupportsUsbTether(Context ctx) {

        public static boolean deviceSupportsUsbTether(Context ctx) {

            ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);

            ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);

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

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

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ 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.QSConstants.TILE_WIFIAP;

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

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

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

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

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

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

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

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

import static com.android.internal.util.cm.QSUtils.systemProfilesEnabled;
@@ -231,7 +232,7 @@ public class QuickSettingsController { 
            qs.setupQuickSettingsTile();

            qs.setupQuickSettingsTile();

            mQuickSettingsTiles.add(qs);

            mQuickSettingsTiles.add(qs);

        }

        }

        if (Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_IME, 1) == 1) {

        if (deviceSupportsImeSwitcher(mContext) && Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_IME, 1) == 1) {

            mIMETile = new InputMethodTile(mContext, inflater, mContainerView, this);

            mIMETile = new InputMethodTile(mContext, inflater, mContainerView, this);

            mIMETile.setupQuickSettingsTile();

            mIMETile.setupQuickSettingsTile();

            mQuickSettingsTiles.add(mIMETile);

            mQuickSettingsTiles.add(mIMETile);