Remove haptic on touch down
Bug: 65463659 Change-Id: I111d18a3d1dcd7877ad4aa5baaeca2e6810be332
This commit is contained in:
@@ -149,7 +149,6 @@ public class Hotseat extends FrameLayout
|
|||||||
allAppsButton.setOnKeyListener(new HotseatIconKeyEventListener());
|
allAppsButton.setOnKeyListener(new HotseatIconKeyEventListener());
|
||||||
if (mLauncher != null) {
|
if (mLauncher != null) {
|
||||||
mLauncher.setAllAppsButton(allAppsButton);
|
mLauncher.setAllAppsButton(allAppsButton);
|
||||||
allAppsButton.setOnTouchListener(mLauncher.getHapticFeedbackTouchListener());
|
|
||||||
allAppsButton.setOnClickListener(mLauncher);
|
allAppsButton.setOnClickListener(mLauncher);
|
||||||
allAppsButton.setOnFocusChangeListener(mLauncher.mFocusHandler);
|
allAppsButton.setOnFocusChangeListener(mLauncher.mFocusHandler);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -279,8 +279,6 @@ public class Launcher extends BaseActivity
|
|||||||
|
|
||||||
private PopupDataProvider mPopupDataProvider;
|
private PopupDataProvider mPopupDataProvider;
|
||||||
|
|
||||||
private View.OnTouchListener mHapticFeedbackTouchListener;
|
|
||||||
|
|
||||||
// Determines how long to wait after a rotation before restoring the screen orientation to
|
// Determines how long to wait after a rotation before restoring the screen orientation to
|
||||||
// match the sensor state.
|
// match the sensor state.
|
||||||
private static final int RESTORE_SCREEN_ORIENTATION_DELAY = 500;
|
private static final int RESTORE_SCREEN_ORIENTATION_DELAY = 500;
|
||||||
@@ -1326,7 +1324,6 @@ public class Launcher extends BaseActivity
|
|||||||
onClickWallpaperPicker(view);
|
onClickWallpaperPicker(view);
|
||||||
}
|
}
|
||||||
}.attachTo(wallpaperButton);
|
}.attachTo(wallpaperButton);
|
||||||
wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());
|
|
||||||
|
|
||||||
// Bind widget button actions
|
// Bind widget button actions
|
||||||
mWidgetsButton = findViewById(R.id.widget_button);
|
mWidgetsButton = findViewById(R.id.widget_button);
|
||||||
@@ -1336,7 +1333,6 @@ public class Launcher extends BaseActivity
|
|||||||
onClickAddWidgetButton(view);
|
onClickAddWidgetButton(view);
|
||||||
}
|
}
|
||||||
}.attachTo(mWidgetsButton);
|
}.attachTo(mWidgetsButton);
|
||||||
mWidgetsButton.setOnTouchListener(getHapticFeedbackTouchListener());
|
|
||||||
|
|
||||||
// Bind settings actions
|
// Bind settings actions
|
||||||
View settingsButton = findViewById(R.id.settings_button);
|
View settingsButton = findViewById(R.id.settings_button);
|
||||||
@@ -1348,7 +1344,6 @@ public class Launcher extends BaseActivity
|
|||||||
onClickSettingsButton(view);
|
onClickSettingsButton(view);
|
||||||
}
|
}
|
||||||
}.attachTo(settingsButton);
|
}.attachTo(settingsButton);
|
||||||
settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());
|
|
||||||
} else {
|
} else {
|
||||||
settingsButton.setVisibility(View.GONE);
|
settingsButton.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
@@ -2533,22 +2528,6 @@ public class Launcher extends BaseActivity
|
|||||||
startActivity(intent, getActivityLaunchOptions(v));
|
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
|
@Override
|
||||||
public void onAccessibilityStateChanged(boolean enabled) {
|
public void onAccessibilityStateChanged(boolean enabled) {
|
||||||
mDragLayer.onAccessibilityStateChanged(enabled);
|
mDragLayer.onAccessibilityStateChanged(enabled);
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ public class PageIndicatorCaretLandscape extends PageIndicator {
|
|||||||
setCaretDrawable(caretDrawable);
|
setCaretDrawable(caretDrawable);
|
||||||
|
|
||||||
Launcher l = Launcher.getLauncher(context);
|
Launcher l = Launcher.getLauncher(context);
|
||||||
setOnTouchListener(l.getHapticFeedbackTouchListener());
|
|
||||||
setOnClickListener(l);
|
setOnClickListener(l);
|
||||||
setOnFocusChangeListener(l.mFocusHandler);
|
setOnFocusChangeListener(l.mFocusHandler);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -141,7 +141,6 @@ public class PageIndicatorLineCaret extends PageIndicator {
|
|||||||
super.onFinishInflate();
|
super.onFinishInflate();
|
||||||
mAllAppsHandle = (ImageView) findViewById(R.id.all_apps_handle);
|
mAllAppsHandle = (ImageView) findViewById(R.id.all_apps_handle);
|
||||||
mAllAppsHandle.setImageDrawable(getCaretDrawable());
|
mAllAppsHandle.setImageDrawable(getCaretDrawable());
|
||||||
mAllAppsHandle.setOnTouchListener(mLauncher.getHapticFeedbackTouchListener());
|
|
||||||
mAllAppsHandle.setOnClickListener(mLauncher);
|
mAllAppsHandle.setOnClickListener(mLauncher);
|
||||||
mAllAppsHandle.setOnFocusChangeListener(mLauncher.mFocusHandler);
|
mAllAppsHandle.setOnFocusChangeListener(mLauncher.mFocusHandler);
|
||||||
mLauncher.setAllAppsButton(mAllAppsHandle);
|
mLauncher.setAllAppsButton(mAllAppsHandle);
|
||||||
|
|||||||
Reference in New Issue
Block a user