diff options
author | Tony <twickham@google.com> | 2018-09-24 17:24:51 -0400 |
---|---|---|
committer | Tony <twickham@google.com> | 2018-09-24 17:24:51 -0400 |
commit | 2ca999cf1bd3cbd4647f57b8345c02999c6fa771 (patch) | |
tree | db4ad59dd95fba838abf2139f4cdf2f0eb1b115d /src | |
parent | 1473b8e1025d17578b08e062427c3af46764efa6 (diff) | |
download | android_packages_apps_Trebuchet-2ca999cf1bd3cbd4647f57b8345c02999c6fa771.tar.gz android_packages_apps_Trebuchet-2ca999cf1bd3cbd4647f57b8345c02999c6fa771.tar.bz2 android_packages_apps_Trebuchet-2ca999cf1bd3cbd4647f57b8345c02999c6fa771.zip |
Change long press timeout to use a factor of ViewConfiguration.getLongPressTimeout()
This way, if the default ViewConfiguration timeout changes, we will adjust accordingly.
Bug: 113639506
Change-Id: Ic3b93311c8e8d8196db2850fa641ffc675a16fb2
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/CheckLongPressHelper.java | 12 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 5d401433b..08bcc1dd2 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -272,8 +272,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, /** * Overrides the default long press timeout. */ - public void setLongPressTimeout(int longPressTimeout) { - mLongPressHelper.setLongPressTimeout(longPressTimeout); + public void setLongPressTimeoutFactor(float longPressTimeoutFactor) { + mLongPressHelper.setLongPressTimeoutFactor(longPressTimeoutFactor); } @Override diff --git a/src/com/android/launcher3/CheckLongPressHelper.java b/src/com/android/launcher3/CheckLongPressHelper.java index dde733cd1..639c173dc 100644 --- a/src/com/android/launcher3/CheckLongPressHelper.java +++ b/src/com/android/launcher3/CheckLongPressHelper.java @@ -17,17 +17,18 @@ package com.android.launcher3; import android.view.View; +import android.view.ViewConfiguration; import com.android.launcher3.util.Thunk; public class CheckLongPressHelper { - public static final int DEFAULT_LONG_PRESS_TIMEOUT = 300; + public static final float DEFAULT_LONG_PRESS_TIMEOUT_FACTOR = 0.75f; @Thunk View mView; @Thunk View.OnLongClickListener mListener; @Thunk boolean mHasPerformedLongPress; - private int mLongPressTimeout = DEFAULT_LONG_PRESS_TIMEOUT; + private float mLongPressTimeoutFactor = DEFAULT_LONG_PRESS_TIMEOUT_FACTOR; private CheckForLongPress mPendingCheckForLongPress; class CheckForLongPress implements Runnable { @@ -60,8 +61,8 @@ public class CheckLongPressHelper { /** * Overrides the default long press timeout. */ - public void setLongPressTimeout(int longPressTimeout) { - mLongPressTimeout = longPressTimeout; + public void setLongPressTimeoutFactor(float longPressTimeoutFactor) { + mLongPressTimeoutFactor = longPressTimeoutFactor; } public void postCheckForLongPress() { @@ -70,7 +71,8 @@ public class CheckLongPressHelper { if (mPendingCheckForLongPress == null) { mPendingCheckForLongPress = new CheckForLongPress(); } - mView.postDelayed(mPendingCheckForLongPress, mLongPressTimeout); + mView.postDelayed(mPendingCheckForLongPress, + (long) (ViewConfiguration.getLongPressTimeout() * mLongPressTimeoutFactor)); } public void cancelLongPress() { diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 0f1355019..69b4bdb1d 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -22,7 +22,6 @@ import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnFocusChangeListener; -import android.view.ViewConfiguration; import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; import android.widget.TextView; @@ -252,7 +251,7 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. R.layout.all_apps_icon, parent, false); icon.setOnClickListener(ItemClickHandler.INSTANCE); icon.setOnLongClickListener(ItemLongClickListener.INSTANCE_ALL_APPS); - icon.setLongPressTimeout(ViewConfiguration.getLongPressTimeout()); + icon.setLongPressTimeoutFactor(1f); icon.setOnFocusChangeListener(mIconFocusListener); // Ensure the all apps icon height matches the workspace icons in portrait mode. |