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

Commit 0a856c2d authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am 52876bbe: Remove unnecessary setLayerType() calls 

* commit '52876bbe':
  Remove unnecessary setLayerType() calls
parents eba1ad95 52876bbe

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

+1 −4
Original line number Diff line number Diff line
@@ -314,10 +314,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { 
                R.layout.input_view, null);



        mKeyboardView = (MainKeyboardView) mCurrentInputView.findViewById(R.id.keyboard_view);

        if (isHardwareAcceleratedDrawingEnabled) {

            mKeyboardView.setLayerType(View.LAYER_TYPE_HARDWARE, null);

            // TODO: Should use LAYER_TYPE_SOFTWARE when hardware acceleration is off?

        }

        mKeyboardView.setHardwareAcceleratedDrawingEnabled(isHardwareAcceleratedDrawingEnabled);

        mKeyboardView.setKeyboardActionListener(mLatinIME);



        // This always needs to be set since the accessibility state can

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

+6 −0
Original line number Diff line number Diff line
@@ -154,6 +154,12 @@ public class KeyboardView extends View { 
                Color.red(color), Color.green(color), Color.blue(color));

    }



    public void setHardwareAcceleratedDrawingEnabled(final boolean enabled) {

        if (!enabled) return;

        // TODO: Should use LAYER_TYPE_SOFTWARE when hardware acceleration is off?

        setLayerType(View.LAYER_TYPE_HARDWARE, null);

    }



    /**

     * Attaches a keyboard to this view. The keyboard can be switched at any time and the

     * view will re-layout itself to accommodate the keyboard.

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

+6 −0
Original line number Diff line number Diff line
@@ -512,6 +512,12 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
        mKeyboardActionListener = KeyboardActionListener.EMPTY_LISTENER;

    }



    @Override

    public void setHardwareAcceleratedDrawingEnabled(final boolean enabled) {

        super.setHardwareAcceleratedDrawingEnabled(enabled);

        mPreviewPlacerView.setHardwareAcceleratedDrawingEnabled(enabled);

    }



    private ObjectAnimator loadObjectAnimator(final int resId, final Object target) {

        if (resId == 0) {

            // TODO: Stop returning null.

java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java

+3 −0
Original line number Diff line number Diff line
@@ -37,7 +37,10 @@ public final class PreviewPlacerView extends RelativeLayout { 
    public PreviewPlacerView(final Context context, final AttributeSet attrs) {

        super(context, attrs);

        setWillNotDraw(false);

    }



    public void setHardwareAcceleratedDrawingEnabled(final boolean enabled) {

        if (!enabled) return;

        final Paint layerPaint = new Paint();

        layerPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER));

        setLayerType(LAYER_TYPE_HARDWARE, layerPaint);