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

Commit a7c41996 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Preventing infinite call of dismissMoreKeysPanel" into ics-mr1

parents ba1c5d44 0cf7a45a

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

+8 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.inputmethod.keyboard.PointerTracker.DrawingProxy; 
import com.android.inputmethod.keyboard.PointerTracker.TimerProxy;

import com.android.inputmethod.latin.R;





/**

 * A view that renders a virtual {@link MiniKeyboard}. It handles rendering of keys and detecting

 * key presses and touch movements.
@@ -174,9 +173,15 @@ public class MiniKeyboardView extends KeyboardView implements MoreKeysPanel { 
        return x;

    }



    private boolean mIsDismissing;



    @Override

    public boolean dismissMoreKeysPanel() {

        return mController.dismissMoreKeysPanel();

        if (mIsDismissing) return false;

        mIsDismissing = true;

        final boolean dismissed = mController.dismissMoreKeysPanel();

        mIsDismissing = false;

        return dismissed;

    }



    @Override

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

+8 −4
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.inputmethod.keyboard.PointerTracker.DrawingProxy; 
import com.android.inputmethod.keyboard.PointerTracker.KeyEventHandler;

import com.android.inputmethod.keyboard.PointerTracker.TimerProxy;





/**

 * A view that renders a virtual {@link MoreSuggestions}. It handles rendering of keys and detecting

 * key presses and touch movements.
@@ -180,10 +179,15 @@ public class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel { 
        return x;

    }



    private boolean mIsDismissing;



    @Override

    public boolean dismissMoreKeysPanel() {

        if (mController == null) return false;

        return mController.dismissMoreKeysPanel();

        if (mIsDismissing) return false;

        mIsDismissing = true;

        final boolean dismissed = mController.dismissMoreKeysPanel();

        mIsDismissing = false;

        return dismissed;

    }



    @Override