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

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

Merge "Restrict bogus events hack to certain classes of tablets"

parents 257750d9 536438a4

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

+1 −7
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.animation.ObjectAnimator; 
import android.content.Context;

import android.content.Context;

import android.content.SharedPreferences;

import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.Color;
@@ -67,7 +66,6 @@ import com.android.inputmethod.latin.SuggestedWords; 
import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.latin.utils.CollectionUtils;

import com.android.inputmethod.latin.utils.CollectionUtils;

import com.android.inputmethod.latin.utils.CoordinateUtils;

import com.android.inputmethod.latin.utils.CoordinateUtils;

import com.android.inputmethod.latin.utils.ResourceUtils;

import com.android.inputmethod.latin.utils.StaticInnerHandlerWrapper;

import com.android.inputmethod.latin.utils.StaticInnerHandlerWrapper;

import com.android.inputmethod.latin.utils.StringUtils;

import com.android.inputmethod.latin.utils.StringUtils;

import com.android.inputmethod.latin.utils.TypefaceUtils;

import com.android.inputmethod.latin.utils.TypefaceUtils;
@@ -487,11 +485,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
        final boolean hasDistinctMultitouch = context.getPackageManager()

        final boolean hasDistinctMultitouch = context.getPackageManager()

                .hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT);

                .hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT);

        mHasDistinctMultitouch = hasDistinctMultitouch && !forceNonDistinctMultitouch;

        mHasDistinctMultitouch = hasDistinctMultitouch && !forceNonDistinctMultitouch;

        final Resources res = getResources();

        PointerTracker.init(getResources());

        final boolean needsPhantomSuddenMoveEventHack = Boolean.parseBoolean(

                ResourceUtils.getDeviceOverrideValue(

                        res, R.array.phantom_sudden_move_event_device_list));

        PointerTracker.init(needsPhantomSuddenMoveEventHack);

        mPreviewPlacerView = new PreviewPlacerView(context, attrs);

        mPreviewPlacerView = new PreviewPlacerView(context, attrs);





        final TypedArray mainKeyboardViewAttr = context.obtainStyledAttributes(

        final TypedArray mainKeyboardViewAttr = context.obtainStyledAttributes(

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

+34 −4
Original line number Original line Diff line number Diff line
@@ -16,8 +16,10 @@ 




package com.android.inputmethod.keyboard;

package com.android.inputmethod.keyboard;





import android.content.res.Resources;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.os.SystemClock;

import android.os.SystemClock;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.Log;

import android.view.MotionEvent;

import android.view.MotionEvent;
@@ -34,6 +36,7 @@ import com.android.inputmethod.latin.R; 
import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.latin.utils.CollectionUtils;

import com.android.inputmethod.latin.utils.CollectionUtils;

import com.android.inputmethod.latin.utils.CoordinateUtils;

import com.android.inputmethod.latin.utils.CoordinateUtils;

import com.android.inputmethod.latin.utils.ResourceUtils;

import com.android.inputmethod.research.ResearchLogger;

import com.android.inputmethod.research.ResearchLogger;





import java.util.ArrayList;

import java.util.ArrayList;
@@ -164,8 +167,9 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 
    // Move this threshold to resource.

    // Move this threshold to resource.

    // TODO: Device specific parameter would be better for device specific hack?

    // TODO: Device specific parameter would be better for device specific hack?

    private static final float PHANTOM_SUDDEN_MOVE_THRESHOLD = 0.25f; // in keyWidth

    private static final float PHANTOM_SUDDEN_MOVE_THRESHOLD = 0.25f; // in keyWidth

    // This hack might be device specific.

    // This hack is applied to certain classes of tablets.

    private static final boolean sNeedsProximateBogusDownMoveUpEventHack = true;

    // See {@link #needsProximateBogusDownMoveUpEventHack(Resources)}.

    private static boolean sNeedsProximateBogusDownMoveUpEventHack;





    private static final ArrayList<PointerTracker> sTrackers = CollectionUtils.newArrayList();

    private static final ArrayList<PointerTracker> sTrackers = CollectionUtils.newArrayList();

    private static final PointerTrackerQueue sPointerTrackerQueue = new PointerTrackerQueue();

    private static final PointerTrackerQueue sPointerTrackerQueue = new PointerTrackerQueue();
@@ -334,8 +338,34 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 




    private final GestureStrokeWithPreviewPoints mGestureStrokeWithPreviewPoints;

    private final GestureStrokeWithPreviewPoints mGestureStrokeWithPreviewPoints;





    public static void init(final boolean needsPhantomSuddenMoveEventHack) {

    private static final int SMALL_TABLET_SMALLEST_WIDTH = 600; // dp

        sNeedsPhantomSuddenMoveEventHack = needsPhantomSuddenMoveEventHack;

    private static final int LARGE_TABLET_SMALLEST_WIDTH = 768; // dp



    private static boolean needsProximateBogusDownMoveUpEventHack(final Resources res) {

        // The proximate bogus down move up event hack is needed for a device such like,

        // 1) is large tablet, or 2) is small tablet and the screen density is less than hdpi.

        // Though it seems odd to use screen density as criteria of the quality of the touch

        // screen, the small table that has a less density screen than hdpi most likely has been

        // made with the touch screen that needs the hack.

        final int sw = res.getConfiguration().smallestScreenWidthDp;

        final boolean isLargeTablet = (sw >= LARGE_TABLET_SMALLEST_WIDTH);

        final boolean isSmallTablet =

                (sw >= SMALL_TABLET_SMALLEST_WIDTH && sw < LARGE_TABLET_SMALLEST_WIDTH);

        final int densityDpi = res.getDisplayMetrics().densityDpi;

        final boolean hasLowDensityScreen = (densityDpi < DisplayMetrics.DENSITY_HIGH);

        final boolean needsTheHack = isLargeTablet || (isSmallTablet && hasLowDensityScreen);

        if (DEBUG_MODE) {

            Log.d(TAG, "needsProximateBogusDownMoveUpEventHack=" + needsTheHack

                    + " smallestScreenWidthDp=" + sw + " densityDpi=" + densityDpi);

        }

        return needsTheHack;

    }



    public static void init(final Resources res) {

        sNeedsPhantomSuddenMoveEventHack = Boolean.parseBoolean(

                ResourceUtils.getDeviceOverrideValue(

                        res, R.array.phantom_sudden_move_event_device_list));

        sNeedsProximateBogusDownMoveUpEventHack = needsProximateBogusDownMoveUpEventHack(res);

        sParams = PointerTrackerParams.DEFAULT;

        sParams = PointerTrackerParams.DEFAULT;

        sGestureStrokeParams = GestureStrokeParams.DEFAULT;

        sGestureStrokeParams = GestureStrokeParams.DEFAULT;

        sGesturePreviewParams = GestureStrokePreviewParams.DEFAULT;

        sGesturePreviewParams = GestureStrokePreviewParams.DEFAULT;