Merge "Update All Set page vibrations on large screens" into udc-qpr-dev am: 087990668b

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

Change-Id: I24e4f42dc8232307b19c0050e973445f88251c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Schneider Victor-tulias
2023-08-10 14:44:16 +00:00
committed by Automerger Merge Worker

View File

@@ -95,9 +95,10 @@ public class AllSetActivity extends Activity {
private static final float ANIMATION_PAUSE_ALPHA_THRESHOLD = 0.1f;
private final AnimatedFloat mSwipeProgress = new AnimatedFloat(this::onSwipeProgressUpdate);
private TISBindHelper mTISBindHelper;
private final AnimatedFloat mSwipeProgress = new AnimatedFloat(this::onSwipeProgressUpdate);
private BgDrawable mBackground;
private View mRootView;
private float mSwipeUpShift;
@@ -172,7 +173,7 @@ public class AllSetActivity extends Activity {
LOTTIE_TERTIARY_COLOR_TOKEN, R.color.all_set_bg_tertiary),
getTheme());
startBackgroundAnimation();
startBackgroundAnimation(dp.isTablet);
}
private void runOnUiHelperThread(Runnable runnable) {
@@ -183,7 +184,7 @@ public class AllSetActivity extends Activity {
Executors.UI_HELPER_EXECUTOR.execute(runnable);
}
private void startBackgroundAnimation() {
private void startBackgroundAnimation(boolean forTablet) {
if (!Utilities.ATLEAST_S || mVibrator == null) {
return;
}
@@ -199,7 +200,7 @@ public class AllSetActivity extends Activity {
.addPrimitive(supportsThud
? VibrationEffect.Composition.PRIMITIVE_THUD
: VibrationEffect.Composition.PRIMITIVE_TICK,
/* scale= */ 1.0f,
/* scale= */ forTablet ? 1.0f : 0.3f,
/* delay= */ 50)
.compose();