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

Commit 666f1b38 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Revert "[HW7.5] Introduce the @Nonnull annotation"" into lmp-dev

parents bcb61da5 8aa74da9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ LOCAL_CERTIFICATE := shared

LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime

LOCAL_STATIC_JAVA_LIBRARIES := android-common inputmethod-common android-support-v4 jsr305
LOCAL_STATIC_JAVA_LIBRARIES := android-common inputmethod-common android-support-v4

# Do not compress dictionary files to mmap dict data runtime
LOCAL_AAPT_FLAGS := -0 .dict
+0 −3
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.inputmethod.event;

import java.util.ArrayList;

import javax.annotation.Nonnull;

/**
 * A generic interface for combiners. Combiners are objects that transform chains of input events
 * into committable strings and manage feedback to show to the user on the combining state.
@@ -35,7 +33,6 @@ public interface Combiner {
     * @param event the event to combine with the existing state.
     * @return the resulting event.
     */
    @Nonnull
    Event processEvent(ArrayList<Event> previousEvents, Event event);

    /**
+4 −3
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import com.android.inputmethod.latin.Constants;
import java.util.ArrayList;
import java.util.HashMap;

import javax.annotation.Nonnull;

/**
 * This class implements the logic chain between receiving events and generating code points.
 *
@@ -89,7 +87,6 @@ public class CombinerChain {
     * @return the processed event. It may be the same event, or a consumed event, or a completely
     *   new event. However it may never be null.
     */
    @Nonnull
    public Event processEvent(final ArrayList<Event> previousEvents, final Event newEvent) {
        final ArrayList<Event> modifiablePreviousEvents = new ArrayList<>(previousEvents);
        Event event = newEvent;
@@ -97,6 +94,10 @@ public class CombinerChain {
            // A combiner can never return more than one event; it can return several
            // code points, but they should be encapsulated within one event.
            event = combiner.processEvent(modifiablePreviousEvents, event);
            if (null == event) {
                // Combiners return null if they eat the event.
                break;
            }
        }
        return event;
    }
+0 −3
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import com.android.inputmethod.latin.Constants;

import java.util.ArrayList;

import javax.annotation.Nonnull;

/**
 * A combiner that handles dead keys.
 */
@@ -33,7 +31,6 @@ public class DeadKeyCombiner implements Combiner {
    final StringBuilder mDeadSequence = new StringBuilder();

    @Override
    @Nonnull
    public Event processEvent(final ArrayList<Event> previousEvents, final Event event) {
        if (TextUtils.isEmpty(mDeadSequence)) {
            if (event.isDead()) {
+0 −3
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import com.android.inputmethod.latin.Constants;
import java.util.ArrayList;
import java.util.Arrays;

import javax.annotation.Nonnull;

/**
 * A combiner that reorders input for Myanmar.
 */
@@ -130,7 +128,6 @@ public class MyanmarReordering implements Combiner {
                : Event.createSoftwareTextEvent(combinedText, Event.NOT_A_KEY_CODE);
    }

    @Nonnull
    @Override
    public Event processEvent(ArrayList<Event> previousEvents, Event newEvent) {
        final int codePoint = newEvent.mCodePoint;
Loading