PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge "Play original haptic when feature flag is off. Rename feature flag" into tm-qpr-dev am: c1e12fc150 am: 3f5e40eaae am: 0a42db6576 am: c191e45331

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21896830

Change-Id: I510cbfa87edc7e9f3316fc911d63ebd7d385fa12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brandon Dayauon
2023-03-09 19:52:36 +00:00
committed by Automerger Merge Worker
parent cd859f1a34 c191e45331
commit db8bb327cd
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+1 -1
View File
@@ -191,7 +191,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
// need to manually set the duration to a reasonable value.
animator.setDuration(HINT_STATE.getTransitionDuration(mLauncher, true /* isToState */));
}
if (FeatureFlags.ENABLE_HAPTICS_ALL_APPS.get() &&
if (FeatureFlags.ENABLE_PREMIUM_HAPTICS_ALL_APPS.get() &&
((mFromState == NORMAL && mToState == ALL_APPS)
|| (mFromState == ALL_APPS && mToState == NORMAL)) && isFling) {
mVibratorWrapper.vibrateForDragBump();