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

Commit 2dd64c07 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-ef87c1d2-519f-467f-b097-802ff59b63b3" into ub-launcher3-master 

* changes:
  [automerger] Remove haptic on touch down Bug: 65463659 am: d315ff2b
  Remove haptic on touch down Bug: 65463659
parents 83f76835 3705664c

src/com/android/launcher3/Hotseat.java

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ public class Hotseat extends FrameLayout 
            allAppsButton.setOnKeyListener(new HotseatIconKeyEventListener());

            if (mLauncher != null) {

                mLauncher.setAllAppsButton(allAppsButton);

                allAppsButton.setOnTouchListener(mLauncher.getHapticFeedbackTouchListener());

                allAppsButton.setOnClickListener(mLauncher);

                allAppsButton.setOnFocusChangeListener(mLauncher.mFocusHandler);

            }

src/com/android/launcher3/Launcher.java

+0 −21
Original line number Diff line number Diff line
@@ -280,8 +280,6 @@ public class Launcher extends BaseActivity 


    private PopupDataProvider mPopupDataProvider;



    private View.OnTouchListener mHapticFeedbackTouchListener;



    // Determines how long to wait after a rotation before restoring the screen orientation to

    // match the sensor state.

    private static final int RESTORE_SCREEN_ORIENTATION_DELAY = 500;
@@ -1226,7 +1224,6 @@ public class Launcher extends BaseActivity 
                onClickWallpaperPicker(view);

            }

        }.attachTo(wallpaperButton);

        wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());



        // Bind widget button actions

        mWidgetsButton = findViewById(R.id.widget_button);
@@ -1236,7 +1233,6 @@ public class Launcher extends BaseActivity 
                onClickAddWidgetButton(view);

            }

        }.attachTo(mWidgetsButton);

        mWidgetsButton.setOnTouchListener(getHapticFeedbackTouchListener());



        // Bind settings actions

        View settingsButton = findViewById(R.id.settings_button);
@@ -1248,7 +1244,6 @@ public class Launcher extends BaseActivity 
                    onClickSettingsButton(view);

                }

            }.attachTo(settingsButton);

            settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());

        } else {

            settingsButton.setVisibility(View.GONE);

        }
@@ -2421,22 +2416,6 @@ public class Launcher extends BaseActivity 
        startActivity(intent, getActivityLaunchOptions(v));

    }



    public View.OnTouchListener getHapticFeedbackTouchListener() {

        if (mHapticFeedbackTouchListener == null) {

            mHapticFeedbackTouchListener = new View.OnTouchListener() {

                @SuppressLint("ClickableViewAccessibility")

                @Override

                public boolean onTouch(View v, MotionEvent event) {

                    if ((event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_DOWN) {

                        v.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);

                    }

                    return false;

                }

            };

        }

        return mHapticFeedbackTouchListener;

    }



    @Override

    public void onAccessibilityStateChanged(boolean enabled) {

        mDragLayer.onAccessibilityStateChanged(enabled);

src/com/android/launcher3/pageindicators/PageIndicatorCaretLandscape.java

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ public class PageIndicatorCaretLandscape extends PageIndicator { 
        setCaretDrawable(caretDrawable);



        Launcher l = Launcher.getLauncher(context);

        setOnTouchListener(l.getHapticFeedbackTouchListener());

        setOnClickListener(l);

        setOnFocusChangeListener(l.mFocusHandler);

    }

src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ public class PageIndicatorLineCaret extends PageIndicator { 
        super.onFinishInflate();

        mAllAppsHandle = (ImageView) findViewById(R.id.all_apps_handle);

        mAllAppsHandle.setImageDrawable(getCaretDrawable());

        mAllAppsHandle.setOnTouchListener(mLauncher.getHapticFeedbackTouchListener());

        mAllAppsHandle.setOnClickListener(mLauncher);

        mAllAppsHandle.setOnFocusChangeListener(mLauncher.mFocusHandler);

        mLauncher.setAllAppsButton(mAllAppsHandle);