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

Commit 5c4f642d authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "Move util classes under common"

parents b2d263aa 5b91b551

java/src/com/android/inputmethod/latin/utils/CollectionUtils.java→common/src/com/android/inputmethod/latin/common/CollectionUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.inputmethod.latin.utils;

package com.android.inputmethod.latin.common;



import java.util.ArrayList;

import java.util.Collection;

java/src/com/android/inputmethod/latin/utils/CoordinateUtils.java→common/src/com/android/inputmethod/latin/common/CoordinateUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.inputmethod.latin.utils;

package com.android.inputmethod.latin.common;



import javax.annotation.Nonnull;

java/src/com/android/inputmethod/latin/utils/FileUtils.java→common/src/com/android/inputmethod/latin/common/FileUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * the License.

 */



package com.android.inputmethod.latin.utils;

package com.android.inputmethod.latin.common;



import java.io.File;

import java.io.FilenameFilter;

java/src/com/android/inputmethod/dictionarypack/LocaleUtils.java→common/src/com/android/inputmethod/latin/common/LocaleUtils.java

+3 −5
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ 
 * the License.

 */



package com.android.inputmethod.dictionarypack;



import android.text.TextUtils;

package com.android.inputmethod.latin.common;



import java.util.HashMap;

import java.util.Locale;
@@ -103,8 +101,8 @@ public final class LocaleUtils { 
     * @return a constant that measures how well the tested locale matches the reference locale.

     */

    public static int getMatchLevel(final String referenceLocale, final String testedLocale) {

        if (TextUtils.isEmpty(referenceLocale)) {

            return TextUtils.isEmpty(testedLocale) ? LOCALE_FULL_MATCH : LOCALE_ANY_MATCH;

        if (StringUtils.isEmpty(referenceLocale)) {

            return StringUtils.isEmpty(testedLocale) ? LOCALE_FULL_MATCH : LOCALE_ANY_MATCH;

        }

        if (null == testedLocale) return LOCALE_NO_MATCH;

        final String[] referenceParams = referenceLocale.split("_", 3);

java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityNodeProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ import android.view.inputmethod.EditorInfo; 
import com.android.inputmethod.keyboard.Key;

import com.android.inputmethod.keyboard.Keyboard;

import com.android.inputmethod.keyboard.KeyboardView;

import com.android.inputmethod.latin.common.CoordinateUtils;

import com.android.inputmethod.latin.settings.Settings;

import com.android.inputmethod.latin.settings.SettingsValues;

import com.android.inputmethod.latin.utils.CoordinateUtils;



import java.util.List;