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

Commit 1cb08aca authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Add Constants class to hold public constants 

This change also gets rid of compiler warnings about "deprecations".

Change-Id: Id9b83483c453a81ebac34b684656db05e3599657
parent c27fe625

java/src/com/android/inputmethod/keyboard/KeyboardId.java

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.inputmethod.keyboard;



import static com.android.inputmethod.latin.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;



import android.text.InputType;

import android.text.TextUtils;

import android.view.inputmethod.EditorInfo;
@@ -23,7 +25,6 @@ import android.view.inputmethod.InputMethodSubtype; 


import com.android.inputmethod.compat.EditorInfoCompatUtils;

import com.android.inputmethod.latin.InputTypeUtils;

import com.android.inputmethod.latin.LatinIME;

import com.android.inputmethod.latin.SubtypeLocale;



import java.util.Arrays;
@@ -184,7 +185,7 @@ public class KeyboardId { 
        return String.format("[%s %s:%s %s%d %s %s %s%s%s%s%s%s%s%s]",

                elementIdToName(mElementId),

                mLocale,

                mSubtype.getExtraValueOf(LatinIME.SUBTYPE_EXTRA_VALUE_KEYBOARD_LAYOUT_SET),

                mSubtype.getExtraValueOf(KEYBOARD_LAYOUT_SET),

                (mOrientation == 1 ? "port" : "land"), mWidth,

                modeName(mMode),

                imeAction(),

java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java

+12 −7
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 


package com.android.inputmethod.keyboard;



import static com.android.inputmethod.latin.Constants.ImeOption.FORCE_ASCII;

import static com.android.inputmethod.latin.Constants.ImeOption.NO_MICROPHONE;

import static com.android.inputmethod.latin.Constants.ImeOption.NO_MICROPHONE_COMPAT;

import static com.android.inputmethod.latin.Constants.ImeOption.NO_SETTINGS_KEY;

import static com.android.inputmethod.latin.Constants.Subtype.ExtraValue.ASCII_CAPABLE;



import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Resources;
@@ -31,7 +37,6 @@ import com.android.inputmethod.compat.EditorInfoCompatUtils; 
import com.android.inputmethod.keyboard.KeyboardLayoutSet.Params.ElementParams;

import com.android.inputmethod.latin.InputAttributes;

import com.android.inputmethod.latin.InputTypeUtils;

import com.android.inputmethod.latin.LatinIME;

import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.SubtypeLocale;
@@ -230,7 +235,7 @@ public class KeyboardLayoutSet { 
            params.mMode = getKeyboardMode(editorInfo);

            params.mEditorInfo = (editorInfo != null) ? editorInfo : EMPTY_EDITOR_INFO;

            params.mNoSettingsKey = InputAttributes.inPrivateImeOptions(

                    mPackageName, LatinIME.IME_OPTION_NO_SETTINGS_KEY, mEditorInfo);

                    mPackageName, NO_SETTINGS_KEY, mEditorInfo);

        }



        public Builder setScreenGeometry(int orientation, int widthPixels) {
@@ -240,10 +245,10 @@ public class KeyboardLayoutSet { 
        }



        public Builder setSubtype(InputMethodSubtype subtype) {

            final boolean asciiCapable = subtype.containsExtraValueKey(

                    LatinIME.SUBTYPE_EXTRA_VALUE_ASCII_CAPABLE);

            final boolean asciiCapable = subtype.containsExtraValueKey(ASCII_CAPABLE);

            @SuppressWarnings("deprecation")

            final boolean deprecatedForceAscii = InputAttributes.inPrivateImeOptions(

                    mPackageName, LatinIME.IME_OPTION_FORCE_ASCII, mEditorInfo);

                    mPackageName, FORCE_ASCII, mEditorInfo);

            final boolean forceAscii = EditorInfoCompatUtils.hasFlagForceAscii(

                    mParams.mEditorInfo.imeOptions)

                    || deprecatedForceAscii;
@@ -260,9 +265,9 @@ public class KeyboardLayoutSet { 
                boolean languageSwitchKeyEnabled) {

            @SuppressWarnings("deprecation")

            final boolean deprecatedNoMicrophone = InputAttributes.inPrivateImeOptions(

                    null, LatinIME.IME_OPTION_NO_MICROPHONE_COMPAT, mEditorInfo);

                    null, NO_MICROPHONE_COMPAT, mEditorInfo);

            final boolean noMicrophone = InputAttributes.inPrivateImeOptions(

                    mPackageName, LatinIME.IME_OPTION_NO_MICROPHONE, mEditorInfo)

                    mPackageName, NO_MICROPHONE, mEditorInfo)

                    || deprecatedNoMicrophone;

            mParams.mVoiceKeyEnabled = voiceKeyEnabled && !noMicrophone;

            mParams.mVoiceKeyOnMain = voiceKeyOnMain;

java/src/com/android/inputmethod/keyboard/internal/KeySpecParser.java

+3 −3
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public class KeySpecParser { 
        return parseEscape(moreKeySpec.substring(end + /* LABEL_END */1));

    }



    private static String getOutputText(String moreKeySpec) {

    static String getOutputText(String moreKeySpec) {

        if (hasCode(moreKeySpec)) {

            return null;

        }
@@ -183,7 +183,7 @@ public class KeySpecParser { 
        return (StringUtils.codePointCount(label) == 1) ? null : label;

    }



    private static int getCode(String moreKeySpec, KeyboardCodesSet codesSet) {

    static int getCode(String moreKeySpec, KeyboardCodesSet codesSet) {

        if (hasCode(moreKeySpec)) {

            final int end = indexOfLabelEnd(moreKeySpec, 0);

            if (indexOfLabelEnd(moreKeySpec, end + 1) >= 0) {
@@ -219,7 +219,7 @@ public class KeySpecParser { 
        }

    }



    private static int getIconId(String moreKeySpec) {

    static int getIconId(String moreKeySpec) {

        if (hasIcon(moreKeySpec)) {

            final int end = moreKeySpec.indexOf(LABEL_END, PREFIX_ICON.length());

            final String name = moreKeySpec.substring(PREFIX_ICON.length(), end);

java/src/com/android/inputmethod/latin/AdditionalSubtype.java

+10 −12
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.inputmethod.latin;



import static com.android.inputmethod.latin.Constants.Subtype.KEYBOARD_MODE;

import static com.android.inputmethod.latin.Constants.Subtype.ExtraValue.IS_ADDITIONAL_SUBTYPE;

import static com.android.inputmethod.latin.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;



import android.view.inputmethod.InputMethodSubtype;



import java.util.HashMap;
@@ -30,9 +34,6 @@ public class AdditionalSubtype { 
        AZERTY

    };



    private static final String SUBTYPE_MODE_KEYBOARD = "keyboard";

    private static final String SUBTYPE_EXTRA_VALUE_IS_ADDITIONAL_SUBTYPE = "isAdditionalSubtype";



    // Keyboard layout to subtype name resource id map.

    private static final HashMap<String, Integer> sKeyboardLayoutToNameIdsMap =

            new HashMap<String, Integer>();
@@ -48,7 +49,7 @@ public class AdditionalSubtype { 
    }



    public static boolean isAdditionalSubtype(InputMethodSubtype subtype) {

        return subtype.containsExtraValueKey(SUBTYPE_EXTRA_VALUE_IS_ADDITIONAL_SUBTYPE);

        return subtype.containsExtraValueKey(IS_ADDITIONAL_SUBTYPE);

    }



    private static final String LOCALE_AND_LAYOUT_SEPARATOR = ":";
@@ -56,25 +57,22 @@ public class AdditionalSubtype { 


    public static InputMethodSubtype createAdditionalSubtype(

            String localeString, String keyboardLayoutSetName, String extraValue) {

        final String layoutExtraValue = LatinIME.SUBTYPE_EXTRA_VALUE_KEYBOARD_LAYOUT_SET + "="

                + keyboardLayoutSetName;

        final String layoutExtraValue = KEYBOARD_LAYOUT_SET + "=" + keyboardLayoutSetName;

        final String filteredExtraValue = StringUtils.appendToCsvIfNotExists(

                SUBTYPE_EXTRA_VALUE_IS_ADDITIONAL_SUBTYPE, extraValue);

                IS_ADDITIONAL_SUBTYPE, extraValue);

        Integer nameId = sKeyboardLayoutToNameIdsMap.get(keyboardLayoutSetName);

        if (nameId == null) nameId = R.string.subtype_generic;

        return new InputMethodSubtype(nameId, R.drawable.ic_subtype_keyboard,

                localeString, SUBTYPE_MODE_KEYBOARD,

                localeString, KEYBOARD_MODE,

                layoutExtraValue + "," + filteredExtraValue, false, false);

    }



    public static String getPrefSubtype(InputMethodSubtype subtype) {

        final String localeString = subtype.getLocale();

        final String keyboardLayoutSetName = SubtypeLocale.getKeyboardLayoutSetName(subtype);

        final String layoutExtraValue = LatinIME.SUBTYPE_EXTRA_VALUE_KEYBOARD_LAYOUT_SET + "="

                + keyboardLayoutSetName;

        final String layoutExtraValue = KEYBOARD_LAYOUT_SET + "=" + keyboardLayoutSetName;

        final String extraValue = StringUtils.removeFromCsvIfExists(layoutExtraValue,

                StringUtils.removeFromCsvIfExists(SUBTYPE_EXTRA_VALUE_IS_ADDITIONAL_SUBTYPE,

                        subtype.getExtraValue()));

                StringUtils.removeFromCsvIfExists(IS_ADDITIONAL_SUBTYPE, subtype.getExtraValue()));

        final String basePrefSubtype = localeString + LOCALE_AND_LAYOUT_SEPARATOR

                + keyboardLayoutSetName;

        return extraValue.isEmpty() ? basePrefSubtype

java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.inputmethod.latin;



import static com.android.inputmethod.latin.Constants.Subtype.ExtraValue.ASCII_CAPABLE;



import android.app.AlertDialog;

import android.content.Context;

import android.content.DialogInterface;
@@ -88,7 +90,7 @@ public class AdditionalSubtypeSettings extends PreferenceFragment { 
            final int count = imi.getSubtypeCount();

            for (int i = 0; i < count; i++) {

                final InputMethodSubtype subtype = imi.getSubtypeAt(i);

                if (subtype.containsExtraValueKey(LatinIME.SUBTYPE_EXTRA_VALUE_ASCII_CAPABLE)) {

                if (subtype.containsExtraValueKey(ASCII_CAPABLE)) {

                    items.add(createItem(context, subtype.getLocale()));

                }

            }
@@ -223,7 +225,7 @@ public class AdditionalSubtypeSettings extends PreferenceFragment { 
                final KeyboardLayoutSetItem layout =

                        (KeyboardLayoutSetItem) mKeyboardLayoutSetSpinner.getSelectedItem();

                final InputMethodSubtype subtype = AdditionalSubtype.createAdditionalSubtype(

                        locale.first, layout.first, LatinIME.SUBTYPE_EXTRA_VALUE_ASCII_CAPABLE);

                        locale.first, layout.first, ASCII_CAPABLE);

                setSubtype(subtype);

                notifyChanged();

                break;