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

Commit 2ca999cf authored by Tony's avatar Tony
Browse files

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
parent 1473b8e1

src/com/android/launcher3/BubbleTextView.java

+2 −2
Original line number Diff line number Diff line
@@ -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

src/com/android/launcher3/CheckLongPressHelper.java

+7 −5
Original line number Diff line number Diff line
@@ -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() {

src/com/android/launcher3/allapps/AllAppsGridAdapter.java

+1 −2
Original line number Diff line number Diff line
@@ -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.