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

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

Merge "Move Key class out of internal package"

parents 75d7fb66 e7759091

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

+1 −1
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ import android.view.accessibility.AccessibilityEvent; 


import com.android.inputmethod.compat.AccessibilityEventCompatUtils;

import com.android.inputmethod.compat.MotionEventCompatUtils;

import com.android.inputmethod.keyboard.Key;

import com.android.inputmethod.keyboard.KeyDetector;

import com.android.inputmethod.keyboard.KeyboardView;

import com.android.inputmethod.keyboard.PointerTracker;

import com.android.inputmethod.keyboard.internal.Key;



public class AccessibleKeyboardViewProxy {

    private static final String TAG = AccessibleKeyboardViewProxy.class.getSimpleName();

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

+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ import android.content.Context; 
import android.content.SharedPreferences;

import android.text.TextUtils;



import com.android.inputmethod.keyboard.Key;

import com.android.inputmethod.keyboard.Keyboard;

import com.android.inputmethod.keyboard.KeyboardId;

import com.android.inputmethod.keyboard.internal.Key;

import com.android.inputmethod.latin.R;



import java.util.HashMap;

java/src/com/android/inputmethod/keyboard/internal/Key.java→java/src/com/android/inputmethod/keyboard/Key.java

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

 */



package com.android.inputmethod.keyboard.internal;

package com.android.inputmethod.keyboard;



import android.content.res.Resources;

import android.content.res.TypedArray;
@@ -23,7 +23,11 @@ import android.graphics.drawable.Drawable; 
import android.text.TextUtils;

import android.util.Xml;



import com.android.inputmethod.keyboard.Keyboard;

import com.android.inputmethod.keyboard.internal.KeyStyles;

import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;

import com.android.inputmethod.keyboard.internal.KeyboardParser;

import com.android.inputmethod.keyboard.internal.PopupCharactersParser;

import com.android.inputmethod.keyboard.internal.Row;

import com.android.inputmethod.keyboard.internal.KeyStyles.KeyStyle;

import com.android.inputmethod.keyboard.internal.KeyboardParser.ParseException;

import com.android.inputmethod.latin.R;
@@ -97,11 +101,11 @@ public class Key { 
    private final Keyboard mKeyboard;



    /** The current pressed state of this key */

    public boolean mPressed;

    private boolean mPressed;

    /** If this is a sticky key, is its highlight on? */

    public boolean mHighlightOn;

    private boolean mHighlightOn;

    /** Key is enabled and responds on press */

    public boolean mEnabled = true;

    private boolean mEnabled = true;



    // keyWidth constants

    private static final int KEYWIDTH_FILL_RIGHT = 0;
@@ -377,6 +381,18 @@ public class Key { 
        mPressed = false;

    }



    public void setHighlightOn(boolean highlightOn) {

        mHighlightOn = highlightOn;

    }



    public boolean isEnabled() {

        return mEnabled;

    }



    public void setEnabled(boolean enabled) {

        mEnabled = enabled;

    }



    /**

     * Detects if a point falls on this key.

     * @param x the x-coordinate of the point

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

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.inputmethod.keyboard; 


import android.util.Log;



import com.android.inputmethod.keyboard.internal.Key;



import java.util.Arrays;

import java.util.List;

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

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.res.Resources; 
import android.graphics.drawable.Drawable;

import android.util.Log;



import com.android.inputmethod.keyboard.internal.Key;

import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;

import com.android.inputmethod.keyboard.internal.KeyboardParser;

import com.android.inputmethod.keyboard.internal.KeyboardShiftState;
@@ -297,7 +296,7 @@ public class Keyboard { 
    public boolean setShiftLocked(boolean newShiftLockState) {

        final Map<Key, Drawable> shiftedIcons = getShiftedIcons();

        for (final Key key : getShiftKeys()) {

            key.mHighlightOn = newShiftLockState;

            key.setHighlightOn(newShiftLockState);

            key.setIcon(newShiftLockState ? shiftedIcons.get(key) : mNormalShiftIcons.get(key));

        }

        mShiftState.setShiftLocked(newShiftLockState);