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

Commit 536438a4 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Restrict bogus events hack to certain classes of tablets 

Bug: 9061320
Change-Id: Ib8c6a5e6db5da99c447bc00867fed51ca959cc3a
parent cc54032b

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

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

import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Canvas;

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.utils.CollectionUtils;

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.StringUtils;

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

                .hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT);

        mHasDistinctMultitouch = hasDistinctMultitouch && !forceNonDistinctMultitouch;

        final Resources res = getResources();

        final boolean needsPhantomSuddenMoveEventHack = Boolean.parseBoolean(

                ResourceUtils.getDeviceOverrideValue(

                        res, R.array.phantom_sudden_move_event_device_list));

        PointerTracker.init(needsPhantomSuddenMoveEventHack);

        PointerTracker.init(getResources());

        mPreviewPlacerView = new PreviewPlacerView(context, attrs);



        final TypedArray mainKeyboardViewAttr = context.obtainStyledAttributes(

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

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


package com.android.inputmethod.keyboard;



import android.content.res.Resources;

import android.content.res.TypedArray;

import android.os.SystemClock;

import android.util.DisplayMetrics;

import android.util.Log;

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.utils.CollectionUtils;

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

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

import com.android.inputmethod.research.ResearchLogger;



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

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

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

    // This hack might be device specific.

    private static final boolean sNeedsProximateBogusDownMoveUpEventHack = true;

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

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

    private static boolean sNeedsProximateBogusDownMoveUpEventHack;



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

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


    private final GestureStrokeWithPreviewPoints mGestureStrokeWithPreviewPoints;



    public static void init(final boolean needsPhantomSuddenMoveEventHack) {

        sNeedsPhantomSuddenMoveEventHack = needsPhantomSuddenMoveEventHack;

    private static final int SMALL_TABLET_SMALLEST_WIDTH = 600; // dp

    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;

        sGestureStrokeParams = GestureStrokeParams.DEFAULT;

        sGesturePreviewParams = GestureStrokePreviewParams.DEFAULT;