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

Commit 4f1fdc30 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Small clean up of KeyboardView.onMeasure 

Change-Id: I46830f8482b46c6999b80793c8b4ae860b46e429
parent 96b444d4

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

+6 −5
Original line number Diff line number Diff line
@@ -196,13 +196,14 @@ public class KeyboardView extends View { 


    @Override

    protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {

        if (mKeyboard != null) {

            // The main keyboard expands to the display width.

            final int height = mKeyboard.mOccupiedHeight + getPaddingTop() + getPaddingBottom();

            setMeasuredDimension(widthMeasureSpec, height);

        } else {

        if (mKeyboard == null) {

            super.onMeasure(widthMeasureSpec, heightMeasureSpec);

            return;

        }

        // The main keyboard expands to the entire this {@link KeyboardView}.

        final int width = mKeyboard.mOccupiedWidth + getPaddingLeft() + getPaddingRight();

        final int height = mKeyboard.mOccupiedHeight + getPaddingTop() + getPaddingBottom();

        setMeasuredDimension(width, height);

    }



    @Override