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

Commit 2a4057d2 authored by Winson Chung's avatar Winson Chung
Browse files

Updating IME tile with proper subtype name. 

Change-Id: Ie7fed20873f51e3b2b4def14532df00d71762418
parent 5efc533b

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ 
    <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->

    <string name="quick_settings_brightness_label">Brightness</string>

    <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->

    <string name="quick_settings_ime_label">IME</string>

    <string name="quick_settings_ime_label">Input Method</string>

    <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->

    <string name="quick_settings_location_label">Location in use</string>

    <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->

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

+4 −0
Original line number Diff line number Diff line
@@ -411,6 +411,10 @@ class QuickSettings { 
        mModel.addImeTile(imeTile, new QuickSettingsModel.RefreshCallback() {

            @Override

            public void refreshView(QuickSettingsTileView view, State state) {

                TextView tv = (TextView) view.findViewById(R.id.ime_textview);

                if (state.label != null) {

                    tv.setText(state.label);

                }

                view.setVisibility(state.enabled ? View.VISIBLE : View.GONE);

            }

        });

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

+30 −0
Original line number Diff line number Diff line
@@ -29,13 +29,19 @@ import android.database.ContentObserver; 
import android.hardware.display.WifiDisplayStatus;

import android.os.Handler;

import android.provider.Settings;

import android.text.TextUtils;

import android.view.View;

import android.view.inputmethod.InputMethodInfo;

import android.view.inputmethod.InputMethodManager;

import android.view.inputmethod.InputMethodSubtype;



import com.android.systemui.R;

import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChangeCallback;

import com.android.systemui.statusbar.policy.LocationController.LocationGpsStateChangeCallback;

import com.android.systemui.statusbar.policy.NetworkController.NetworkSignalChangedCallback;



import java.util.List;





class QuickSettingsModel implements BluetoothStateChangeCallback,

        NetworkSignalChangedCallback,
@@ -338,8 +344,32 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, 
        mImeCallback.refreshView(mImeTile, mImeState);

    }

    void onImeWindowStatusChanged(boolean visible) {

        InputMethodManager imm =

                (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE);

        List<InputMethodInfo> imis = imm.getInputMethodList();



        mImeState.enabled = visible;

        mImeState.label = getCurrentInputMethodName(mContext, mContext.getContentResolver(),

                imm, imis, mContext.getPackageManager());

        mImeCallback.refreshView(mImeTile, mImeState);

    }

    private static String getCurrentInputMethodName(Context context, ContentResolver resolver,

            InputMethodManager imm, List<InputMethodInfo> imis, PackageManager pm) {

        if (resolver == null || imis == null) return null;

        final String currentInputMethodId = Settings.Secure.getString(resolver,

                Settings.Secure.DEFAULT_INPUT_METHOD);

        if (TextUtils.isEmpty(currentInputMethodId)) return null;

        for (InputMethodInfo imi : imis) {

            if (currentInputMethodId.equals(imi.getId())) {

                final InputMethodSubtype subtype = imm.getCurrentInputMethodSubtype();

                final CharSequence summary = subtype != null

                        ? subtype.getDisplayName(context, imi.getPackageName(),

                                imi.getServiceInfo().applicationInfo)

                        : context.getString(R.string.quick_settings_ime_label);

                return summary.toString();

            }

        }

        return null;

    }



}
 
 No newline at end of file