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

Commit b5e1f489 authored by Jean Chalard's avatar Jean Chalard
Browse files

Remove the now useless Flag class.

Change-Id: Ibe45189b73e2606cf77e30da166dd0d45ae47c5c
parent 338d3ec7
Loading
Loading
Loading
Loading
+0 −24
Original line number Diff line number Diff line
@@ -56,30 +56,6 @@ public class BinaryDictionary extends Dictionary {
    private final int[] mScores = new int[MAX_WORDS];
    private final int[] mBigramScores = new int[MAX_BIGRAMS];

    public static final Flag FLAG_REQUIRES_GERMAN_UMLAUT_PROCESSING =
            new Flag(R.bool.config_require_umlaut_processing, 0x1);
    public static final Flag FLAG_REQUIRES_FRENCH_LIGATURES_PROCESSING =
            new Flag(R.bool.config_require_ligatures_processing, 0x4);

    // Can create a new flag from extravalue :
    // public static final Flag FLAG_MYFLAG =
    //         new Flag("my_flag", 0x02);

    // ALL_CONFIG_FLAGS is a collection of flags that enable reading all flags from configuration.
    // This is but a mask - it does not mean the flags will be on, only that the configuration
    // will be read for this particular flag.
    public static final Flag[] ALL_CONFIG_FLAGS = {
        // Here should reside all flags that trigger some special processing
        // These *must* match the definition in UnigramDictionary enum in
        // unigram_dictionary.h so please update both at the same time.
        // Please note that flags created with a resource are of type CONFIG while flags
        // created with a string are of type EXTRAVALUE. These behave like masks, and the
        // actual value will be read from the configuration/extra value at run time for
        // the configuration at dictionary creation time.
        FLAG_REQUIRES_GERMAN_UMLAUT_PROCESSING,
        FLAG_REQUIRES_FRENCH_LIGATURES_PROCESSING,
    };

    private final boolean mUseFullEditDistance;

    /**
+0 −75
Original line number Diff line number Diff line
/*
 * Copyright (C) 2011 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */

package com.android.inputmethod.latin;

import android.content.Context;
import android.content.res.Resources;

public class Flag {
    public final String mName;
    public final int mResource;
    public final int mMask;
    public final int mSource;

    private static final int SOURCE_CONFIG = 1;
    private static final int SOURCE_EXTRAVALUE = 2;
    private static final int SOURCE_PARAM = 3;

    public Flag(int resourceId, int mask) {
        mName = null;
        mResource = resourceId;
        mSource = SOURCE_CONFIG;
        mMask = mask;
    }

    public Flag(String name, int mask) {
        mName = name;
        mResource = 0;
        mSource = SOURCE_EXTRAVALUE;
        mMask = mask;
    }

    public Flag(int mask) {
        mName = null;
        mResource = 0;
        mSource = SOURCE_PARAM;
        mMask = mask;
    }

    // If context/switcher are null, set all related flags in flagArray to on.
    public static int initFlags(Flag[] flagArray, Context context, SubtypeSwitcher switcher) {
        int flags = 0;
        final Resources res = null == context ? null : context.getResources();
        for (Flag entry : flagArray) {
            switch (entry.mSource) {
                case Flag.SOURCE_CONFIG:
                    if (res == null || res.getBoolean(entry.mResource))
                        flags |= entry.mMask;
                    break;
                case Flag.SOURCE_EXTRAVALUE:
                    if (switcher == null ||
                            switcher.currentSubtypeContainsExtraValueKey(entry.mName))
                        flags |= entry.mMask;
                    break;
                case Flag.SOURCE_PARAM:
                    flags |= entry.mMask;
                    break;
            }
        }
        return flags;
    }
}
+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import com.android.inputmethod.latin.Dictionary;
import com.android.inputmethod.latin.Dictionary.WordCallback;
import com.android.inputmethod.latin.DictionaryCollection;
import com.android.inputmethod.latin.DictionaryFactory;
import com.android.inputmethod.latin.Flag;
import com.android.inputmethod.latin.LocaleUtils;
import com.android.inputmethod.latin.R;
import com.android.inputmethod.latin.StringUtils;