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

Commit 5254c01d authored by Dan Zivkovic's avatar Dan Zivkovic
Browse files

Fix master build. 

For some reason, we can't import android.os package in our Constants.

Change-Id: I357ed72d13c5039a83c6e2489cdf5ef74d0ffea8
parent 12d80ebe

common/src/com/android/inputmethod/latin/common/Constants.java

+0 −8
Original line number Diff line number Diff line
@@ -16,20 +16,12 @@ 


package com.android.inputmethod.latin.common;



import android.os.Build;



import com.android.inputmethod.annotations.UsedForTesting;



import javax.annotation.Nonnull;



public final class Constants {



    public static final boolean JELLY_BEAN_OR_HIGHER =

            Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;



    public static final boolean JELLY_BEAN_MR1_OR_HIGHER =

            Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1;



    public static final class Color {

        /**

         * The alpha value for fully opaque.

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

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.view.inputmethod.EditorInfo; 
import com.android.inputmethod.compat.SettingsSecureCompatUtils;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.SuggestedWords;

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

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



public final class AccessibilityUtils {
@@ -222,7 +221,7 @@ public final class AccessibilityUtils { 


        // Platforms starting at SDK version 16 (Build.VERSION_CODES.JELLY_BEAN) should use

        // announce events.

        if (Constants.JELLY_BEAN_OR_HIGHER) {

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {

            event.setEventType(AccessibilityEventCompat.TYPE_ANNOUNCEMENT);

        } else {

            event.setEventType(AccessibilityEvent.TYPE_VIEW_FOCUSED);

java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatUtils.java

+3 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public final class InputMethodSubtypeCompatUtils { 
                    int.class, int.class, String.class, String.class, String.class, boolean.class,

                    boolean.class, int.class);

    static {

        if (Constants.JELLY_BEAN_MR1_OR_HIGHER) {

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {

            if (CONSTRUCTOR_INPUT_METHOD_SUBTYPE == null) {

                android.util.Log.w(TAG, "Warning!!! Constructor is not defined.");

            }
@@ -59,7 +59,8 @@ public final class InputMethodSubtypeCompatUtils { 
    public static InputMethodSubtype newInputMethodSubtype(int nameId, int iconId, String locale,

            String mode, String extraValue, boolean isAuxiliary,

            boolean overridesImplicitlyEnabledSubtype, int id) {

        if (CONSTRUCTOR_INPUT_METHOD_SUBTYPE == null || !Constants.JELLY_BEAN_MR1_OR_HIGHER) {

        if (CONSTRUCTOR_INPUT_METHOD_SUBTYPE == null

                || Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {

            return new InputMethodSubtype(nameId, iconId, locale, mode, extraValue, isAuxiliary,

                    overridesImplicitlyEnabledSubtype);

        }

java/src/com/android/inputmethod/compat/NotificationCompatUtils.java

+2 −3
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
package com.android.inputmethod.compat;



import android.app.Notification;



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

import android.os.Build;



import java.lang.reflect.Field;

import java.lang.reflect.Method;
@@ -74,7 +73,7 @@ public class NotificationCompatUtils { 


    @SuppressWarnings("deprecation")

    public static Notification build(final Notification.Builder builder) {

        if (Constants.JELLY_BEAN_OR_HIGHER) {

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {

            // #build was added in API level 16, JELLY_BEAN

            return (Notification) CompatUtils.invoke(builder, null, METHOD_build);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -899,7 +899,7 @@ public final class RichInputConnection implements PrivateCommandPerformer { 
     * On platforms on which this method is not present, this is a no-op.

     */

    public void maybeMoveTheCursorAroundAndRestoreToWorkaroundABug() {

        if (!Constants.JELLY_BEAN_OR_HIGHER) {

        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {

            if (mExpectedSelStart > 0) {

                mIC.setSelection(mExpectedSelStart - 1, mExpectedSelStart - 1);

            } else {