PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 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

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

Change-Id: I5e062ab2e1788ba676e2d27fd1dcb4850a2aaf01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brandon Dayauon
2023-03-09 18:36:58 +00:00
committed by Automerger Merge Worker
parent 509c0f9e51 0a42db6576
commit c191e45331
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. // need to manually set the duration to a reasonable value.
animator.setDuration(HINT_STATE.getTransitionDuration(mLauncher, true /* isToState */)); 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 == NORMAL && mToState == ALL_APPS)
|| (mFromState == ALL_APPS && mToState == NORMAL)) && isFling) { || (mFromState == ALL_APPS && mToState == NORMAL)) && isFling) {
mVibratorWrapper.vibrateForDragBump(); mVibratorWrapper.vibrateForDragBump();
src/com/android/launcher3/allapps/AllAppsTransitionController.java
+4 -3
View File
@@ -355,7 +355,7 @@ public class AllAppsTransitionController
}); });
} }
if(FeatureFlags.ENABLE_HAPTICS_ALL_APPS.get() && config.userControlled if(FeatureFlags.ENABLE_PREMIUM_HAPTICS_ALL_APPS.get() && config.userControlled
&& Utilities.ATLEAST_S) { && Utilities.ATLEAST_S) {
if (toState == ALL_APPS) { if (toState == ALL_APPS) {
builder.addOnFrameListener( builder.addOnFrameListener(
@@ -385,8 +385,9 @@ public class AllAppsTransitionController
builder.add(anim); builder.add(anim);
setAlphas(toState, config, builder); setAlphas(toState, config, builder);
// This controls both haptics for tapping on QSB and going to all apps.
if (ALL_APPS.equals(toState) && mLauncher.isInState(NORMAL) && !(Utilities.ATLEAST_S)) { if (ALL_APPS.equals(toState) && mLauncher.isInState(NORMAL) &&
!FeatureFlags.ENABLE_PREMIUM_HAPTICS_ALL_APPS.get()) {
mLauncher.getAppsView().performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, mLauncher.getAppsView().performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,
HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
} }
src/com/android/launcher3/config/FeatureFlags.java
+3 -2
View File
@@ -359,8 +359,9 @@ public final class FeatureFlags {
"Enable the ability to tap a staged app during split select to launch it in full screen" "Enable the ability to tap a staged app during split select to launch it in full screen"
); );
public static final BooleanFlag ENABLE_HAPTICS_ALL_APPS = getDebugFlag(270396358, public static final BooleanFlag ENABLE_PREMIUM_HAPTICS_ALL_APPS = getDebugFlag(270396358,
"ENABLE_HAPTICS_ALL_APPS", false, "Enables haptics opening/closing All apps"); "ENABLE_PREMIUM_HAPTICS_ALL_APPS", false,
"Enables haptics opening/closing All apps");
public static final BooleanFlag ENABLE_FORCED_MONO_ICON = getDebugFlag(270396209, public static final BooleanFlag ENABLE_FORCED_MONO_ICON = getDebugFlag(270396209,
"ENABLE_FORCED_MONO_ICON", false, "ENABLE_FORCED_MONO_ICON", false,