Merge "Revert "Migrate usages of ViewConfiguration static methods"" into main (6621950c) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/KeyboardView.java

+3 −10

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.inputmethodservice;

		import android.companion.virtualdevice.flags.Flags;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.content.res.TypedArray;
		@@ -221,7 +220,6 @@ public class KeyboardView extends View implements View.OnClickListener {
		private SwipeTracker mSwipeTracker = new SwipeTracker();
		private int mSwipeThreshold;
		private boolean mDisambiguateSwipe;
		private final int mLongPressTimeoutMillis;

		// Variables for dealing with multiple pointers
		private int mOldPointerCount = 1;
		@@ -233,6 +231,7 @@ public class KeyboardView extends View implements View.OnClickListener {

		private static final int REPEAT_INTERVAL = 50; // ~20 keys per second
		private static final int REPEAT_START_DELAY = 400;
		private static final int LONGPRESS_TIMEOUT = ViewConfiguration.getLongPressTimeout();

		private static int MAX_NEARBY_KEYS = 12;
		private int[] mDistances = new int[MAX_NEARBY_KEYS];
		@@ -369,12 +368,6 @@ public class KeyboardView extends View implements View.OnClickListener {
		mAccessibilityManager = AccessibilityManager.getInstance(context);
		mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);

		if (Flags.viewconfigurationApis()) {
		mLongPressTimeoutMillis = ViewConfiguration.get(context).getLongPressTimeoutMillis();
		} else {
		mLongPressTimeoutMillis = ViewConfiguration.getLongPressTimeout();
		}

		resetMultiTap();
		}

		@@ -1299,7 +1292,7 @@ public class KeyboardView extends View implements View.OnClickListener {
		}
		if (mCurrentKey != NOT_A_KEY) {
		Message msg = mHandler.obtainMessage(MSG_LONGPRESS, me);
		mHandler.sendMessageDelayed(msg, mLongPressTimeoutMillis);
		mHandler.sendMessageDelayed(msg, LONGPRESS_TIMEOUT);
		}
		showPreview(keyIndex);
		break;
		@@ -1332,7 +1325,7 @@ public class KeyboardView extends View implements View.OnClickListener {
		// Start new longpress if key has changed
		if (keyIndex != NOT_A_KEY) {
		Message msg = mHandler.obtainMessage(MSG_LONGPRESS, me);
		mHandler.sendMessageDelayed(msg, mLongPressTimeoutMillis);
		mHandler.sendMessageDelayed(msg, LONGPRESS_TIMEOUT);
		}
		}
		showPreview(mCurrentKey);

core/java/android/inputmethodservice/navigationbar/KeyButtonView.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -74,7 +74,6 @@ public class KeyButtonView extends ImageView implements ButtonInterface {
		private final Paint mOvalBgPaint = new Paint(Paint.ANTI_ALIAS_FLAG \| Paint.FILTER_BITMAP_FLAG);
		private float mDarkIntensity;
		private boolean mHasOvalBg = false;
		private final int mLongPressTimeoutMillis;

		/** Runnable for checking whether the long click action should be performed. */
		private final Runnable mCheckLongPress = new Runnable() {
		@@ -108,11 +107,6 @@ public class KeyButtonView extends ImageView implements ButtonInterface {
		setBackground(mRipple);
		setWillNotDraw(false);
		forceHasOverlappingRendering(false);

		mLongPressTimeoutMillis =
		android.companion.virtualdevice.flags.Flags.viewconfigurationApis()
		? ViewConfiguration.get(context).getLongPressTimeoutMillis()
		: ViewConfiguration.getLongPressTimeout();
		}

		@Override
		@@ -216,7 +210,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface {
		}
		if (Flags.imeSwitcherRevamp() && isLongClickable()) {
		removeCallbacks(mCheckLongPress);
		postDelayed(mCheckLongPress, mLongPressTimeoutMillis);
		postDelayed(mCheckLongPress, ViewConfiguration.getLongPressTimeout());
		}
		break;
		case MotionEvent.ACTION_MOVE:

core/java/android/view/GestureDetector.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -250,7 +250,6 @@ public class GestureDetector {
		private int mTapTimeout;
		private int mDoubleTapTimeout;
		private int mDoubleTapMinTime;
		private int mLongPressTimeoutMillis;

		// constants for Message.what used by GestureHandler below
		private static final int SHOW_PRESS = 1;
		@@ -515,12 +514,10 @@ public class GestureDetector {
		mTapTimeout = configuration.getTapTimeoutMillis();
		mDoubleTapTimeout = configuration.getDoubleTapTimeoutMillis();
		mDoubleTapMinTime = configuration.getDoubleTapMinTimeMillis();
		mLongPressTimeoutMillis = configuration.getLongPressTimeoutMillis();
		} else {
		mTapTimeout = ViewConfiguration.getTapTimeout();
		mDoubleTapTimeout = ViewConfiguration.getDoubleTapTimeout();
		mDoubleTapMinTime = ViewConfiguration.getDoubleTapMinTime();
		mLongPressTimeoutMillis = ViewConfiguration.getLongPressTimeout();
		}
		}
		mTouchSlopSquare = touchSlop * touchSlop;
		@@ -690,7 +687,7 @@ public class GestureDetector {
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS,
		0 /* arg2 */),
		mCurrentDownEvent.getDownTime()
		+ mLongPressTimeoutMillis);
		+ ViewConfiguration.getLongPressTimeout());
		}
		mHandler.sendEmptyMessageAtTime(SHOW_PRESS,
		mCurrentDownEvent.getDownTime() + mTapTimeout);
		@@ -731,14 +728,14 @@ public class GestureDetector {
		// will happen in response to user input. To prevent this,
		// reschedule long press with a modified timeout.
		mHandler.removeMessages(LONG_PRESS);
		final long longPressTimeout = ViewConfiguration.getLongPressTimeout();
		mHandler.sendMessageAtTime(
		mHandler.obtainMessage(
		LONG_PRESS,
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS,
		0 /* arg2 */),
		ev.getDownTime()
		+ (long) (mLongPressTimeoutMillis
		* mAmbiguousGestureMultiplier));
		+ (long) (longPressTimeout * mAmbiguousGestureMultiplier));
		}
		// Inhibit default scroll. If a gesture is ambiguous, we prevent scroll
		// until the gesture is resolved.

core/java/android/view/HandwritingInitiator.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -149,10 +149,7 @@ public class HandwritingInitiator {
		public HandwritingInitiator(@NonNull ViewConfiguration viewConfiguration,
		@NonNull InputMethodManager inputMethodManager) {
		mHandwritingSlop = viewConfiguration.getScaledHandwritingSlop();
		mHandwritingTimeoutInMillis =
		android.companion.virtualdevice.flags.Flags.viewconfigurationApis()
		? viewConfiguration.getLongPressTimeoutMillis()
		: ViewConfiguration.getLongPressTimeout();
		mHandwritingTimeoutInMillis = ViewConfiguration.getLongPressTimeout();
		mImm = inputMethodManager;
		}

core/java/android/view/View.java

+8 −12

Original line number	Diff line number	Diff line
		@@ -6012,7 +6012,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		final ViewConfiguration configuration = ViewConfiguration.get(context);
		mTouchSlop = configuration.getScaledTouchSlop();

		mTapTimeoutMillis = Flags.viewconfigurationApis()
		? configuration.getTapTimeoutMillis() : ViewConfiguration.getTapTimeout();
		mAmbiguousGestureMultiplier = configuration.getScaledAmbiguousGestureMultiplier();

		setOverScrollMode(OVER_SCROLL_IF_CONTENT_SCROLLS);
		@@ -17572,7 +17573,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		setPressed(true, x, y);
		}
		checkForLongClick(
		getLongPressTimeoutMillis(),
		ViewConfiguration.getLongPressTimeout(),
		x,
		y,
		// This is not a touch gesture -- do not classify it as one.
		@@ -18380,7 +18381,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		if (!clickable) {
		checkForLongClick(
		getLongPressTimeoutMillis(),
		ViewConfiguration.getLongPressTimeout(),
		x,
		y,
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS);
		@@ -18408,7 +18409,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		// Not inside a scrolling container, so show the feedback right away
		setPressed(true, x, y);
		checkForLongClick(
		getLongPressTimeoutMillis(),
		ViewConfiguration.getLongPressTimeout(),
		x,
		y,
		TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS);
		@@ -18442,7 +18443,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		// just extend the timeout here, in case the classification
		// stays ambiguous.
		removeLongPressCallback();
		long delay = (long) (getLongPressTimeoutMillis()
		long delay = (long) (ViewConfiguration.getLongPressTimeout()
		* mAmbiguousGestureMultiplier);
		// Subtract the time already spent
		delay -= event.getEventTime() - event.getDownTime();
		@@ -18530,12 +18531,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		}

		private int getLongPressTimeoutMillis() {
		return Flags.viewconfigurationApis()
		? ViewConfiguration.get(getContext()).getLongPressTimeoutMillis()
		: ViewConfiguration.getLongPressTimeout();
		}

		/**
		* Return true if the long press callback is scheduled to run sometime in the future.
		* Return false if there is no scheduled long press callback at the moment.
		@@ -31774,7 +31769,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		public void run() {
		mPrivateFlags &= ~PFLAG_PREPRESSED;
		setPressed(true, x, y);
		final int delay = getLongPressTimeoutMillis() - mTapTimeoutMillis;
		final long delay =
		(long) ViewConfiguration.getLongPressTimeout() - mTapTimeoutMillis;
		checkForLongClick(delay, x, y, TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS);
		}
		}