release.ps1: keep Gradle's warnings from stopping a piped run

Gradle prints compiler warnings on its error stream. When the script's output was piped or
sent to a file, PowerShell 5.1 took the first such line for an error and stopped the build
at step 2 (seen on the first 0.3.1 attempt). The streams are now merged inside cmd, and
only the exit code decides whether the build failed.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>

flexera/release.ps1

@@ -170,7 +170,10 @@ if ($SkipBuild) {
     Get-ChildItem (Join-Path $Root 'build\kotlin') -Directory -Filter "compile${Variant}Kotlin*" -ErrorAction SilentlyContinue |
         Remove-Item -Recurse -Force
     $env:JAVA_HOME = $JavaHome
-    cmd /c ".\gradlew.bat assemble$Variant --no-build-cache --console=plain"
+    # "2>&1" inside cmd: Gradle prints compiler warnings on its error stream. If this script's
+    # output is piped or sent to a file, PowerShell would otherwise take the first such line
+    # for an error and stop the build. Only the exit code says whether the build failed.
+    cmd /c ".\gradlew.bat assemble$Variant --no-build-cache --console=plain 2>&1"
     if ($LASTEXITCODE -ne 0) { throw "The build failed." }
 }
 if (-not (Test-Path $apk)) { throw "Expected the APK at $apk, but it is not there." }

flexera/res/values/flexera_dimens.xml

@@ -21,15 +21,22 @@
     <!-- Letters never sit further apart than this, however few there are. -->
     <dimen name="flexera_wave_max_spacing">30dp</dimen>
     <dimen name="flexera_wave_vertical_margin">16dp</dimen>
-    <!-- How far before the finger the wave's peak sits, so the thumb never covers the letter. -->
-    <dimen name="flexera_wave_finger_gap">52dp</dimen>
+    <!-- How far beyond the finger the wave's peak sits, so the thumb never covers the selected
+         letter. A thumb hides about 11 mm (70dp) to each side of the point it touches; the
+         letter's centre has to clear that by its own half width and a margin. At 52dp, the
+         first value, the letter sat under the thumb. -->
+    <dimen name="flexera_wave_finger_gap">104dp</dimen>
     <!-- The smallest bulge, used when the finger is right on the edge. -->
-    <dimen name="flexera_wave_min_reach">60dp</dimen>
-    <!-- How far up and down the edge the bulge spreads. -->
-    <dimen name="flexera_wave_width">56dp</dimen>
+    <dimen name="flexera_wave_min_reach">96dp</dimen>
+    <!-- How far up and down the edge the bulge spreads, at the least. A taller wave is wider
+         (WaveAlphabetView.WAVE_WIDTH_SHARE_OF_REACH). -->
+    <dimen name="flexera_wave_width">68dp</dimen>
+    <!-- The wave's peak never comes closer than this to the opposite edge of the screen. -->
+    <dimen name="flexera_wave_far_margin">36dp</dimen>
 
-    <!-- Swipe up and hold (PRD AD-17): a pause only counts once the swipe has travelled this far. -->
-    <dimen name="flexera_hold_min_swipe">72dp</dimen>
+    <!-- Swipe up and hold (PRD AD-17): a pause only counts once the swipe has travelled this far.
+         Enough to tell a hold from a hesitant start, short enough that a small swipe counts. -->
+    <dimen name="flexera_hold_min_swipe">32dp</dimen>
 
     <!-- Soft shadow behind white drawer text, for readability over light wallpaper. -->
     <dimen name="flexera_drawer_text_shadow_radius">3dp</dimen>

flexera/src/app/flexera/drawer/FlexeraDrawer.kt

@@ -200,12 +200,19 @@ object FlexeraDrawer {
         appsView: ActivityAllAppsContainerView<*>,
         dragLayer: BaseDragLayer<*>,
         ev: MotionEvent,
+    ) = scrubFromSwipe(appsView, dragLayer, ev.x, ev.y)
+
+    /** The same, for a finger position ([x], [y]) in the drag layer's coordinates. */
+    @JvmStatic
+    fun scrubFromSwipe(
+        appsView: ActivityAllAppsContainerView<*>,
+        dragLayer: BaseDragLayer<*>,
+        x: Float,
+        y: Float,
     ) {
         val wave = waveAlphabet(appsView) ?: return
         val offset = layoutOffset(wave, dragLayer)
-        val x = ev.x - offset.x
-        val y = ev.y - offset.y
-        if (wave.isScrubbing) wave.moveScrub(x, y) else wave.beginScrub(x, y)
+        if (wave.isScrubbing) wave.moveScrub(x - offset.x, y - offset.y) else wave.beginScrub(x - offset.x, y - offset.y)
     }
 
     /**
@@ -245,6 +252,15 @@ object FlexeraDrawer {
         waveAlphabet(appsView)?.endScrub()
     }
 
+    /**
+     * Ends a scrub started by [scrubFromSwipe] and undoes it: the list goes back to where it
+     * stood, so the drawer opens the way an ordinary swipe up leaves it.
+     */
+    @JvmStatic
+    fun cancelScrubFromSwipe(appsView: ActivityAllAppsContainerView<*>) {
+        waveAlphabet(appsView)?.cancelScrub()
+    }
+
     /**
      * A letter header. It carries its letter so that the adapter's diffing notices when the
      * header at a position changes, for example after an app is installed or removed.

flexera/src/app/flexera/drawer/WaveAlphabetView.kt

@@ -6,7 +6,9 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
+import android.graphics.RadialGradient
 import android.graphics.Rect
+import android.graphics.Shader
 import android.graphics.Typeface
 import android.os.Build
 import android.os.Bundle
@@ -37,9 +39,9 @@ import kotlin.math.roundToInt
  *
  * Only letters that have apps are shown. Touching the strip and sliding along it jumps the list
  * to the letter under the finger, with a haptic tick on every change. While the finger is down,
- * the letters near it bulge away from the edge in a wave, and the wave reaches further the
- * further the finger moves in from the edge, so the current letter always sits beside the thumb
- * instead of under it.
+ * the letters near it bulge away from the edge in a wave. The wave's peak, where the current
+ * letter is, stays a thumb's width beyond the finger however far in from the edge the finger
+ * is, so the letter always sits beside the thumb instead of under it.
  *
  * The strip sits on the right edge unless the owner moves it to the left (PRD AD-15).
  *
@@ -69,6 +71,7 @@ class WaveAlphabetView(
     private val fingerGap = res.getDimension(R.dimen.flexera_wave_finger_gap)
     private val minReach = res.getDimension(R.dimen.flexera_wave_min_reach)
     private val waveWidth = res.getDimension(R.dimen.flexera_wave_width)
+    private val farMargin = res.getDimension(R.dimen.flexera_wave_far_margin)
     private val letterSize = res.getDimension(R.dimen.flexera_wave_letter_size)
 
     /** The section name Launcher3 gives the work profile's info card, an "i" in a circle. */
@@ -91,6 +94,22 @@ class WaveAlphabetView(
     }
     private val boldTypeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
 
+    /**
+     * A soft dark spot behind the selected letter. Out over the list the letter can land on an
+     * app name, and on a light wallpaper white on white; the spot keeps it readable on both.
+     * Drawn as a circle of radius 1 and scaled to size, so nothing is allocated while drawing.
+     */
+    private val backdropPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        shader = RadialGradient(
+            0f,
+            0f,
+            1f,
+            intArrayOf(BACKDROP_COLOR, BACKDROP_COLOR, Color.TRANSPARENT),
+            floatArrayOf(0f, BACKDROP_SOLID_SHARE, 1f),
+            Shader.TileMode.CLAMP,
+        )
+    }
+
     private var letters: List<Letter> = emptyList()
     private var letterYs = FloatArray(0)
     private var stripTop = 0f
@@ -106,6 +125,10 @@ class WaveAlphabetView(
     private var fingerY = 0f
     private var selected = -1
 
+    /** Where the list stood when the scrub began (first visible row and its offset), for [cancelScrub]. */
+    private var listPositionBefore = RecyclerView.NO_POSITION
+    private var listOffsetBefore = 0
+
     /** 0 when the strip is at rest, 1 when the wave is fully out. Animated on touch down and up. */
     private var press = 0f
     private var pressAnimator: ValueAnimator? = null
@@ -225,12 +248,16 @@ class WaveAlphabetView(
         // Where the letters rest, and which way "away from the edge" points.
         val baseX = if (onLeft) edgeInset else width - edgeInset
         val inward = if (onLeft) 1f else -1f
-        // The wave's peak sits a fixed gap before the finger, so it reaches further out the
-        // further the finger is from the edge.
+        // The wave's peak sits a fixed gap beyond the finger, on the side away from the edge,
+        // which is the side the thumb leaves uncovered. So the wave reaches further out the
+        // further the finger is from the edge, up to nearly the whole width of the screen.
         val fingerDistance = (fingerX - baseX) * inward
-        val maxReach = width * 0.7f
+        val maxReach = max(minReach + 1f, width - edgeInset - farMargin)
         val fullReach = (fingerDistance + fingerGap).coerceIn(minReach, maxReach)
         val reach = fullReach * press
+        // A taller wave is also a wider one. It keeps its shape that way, and the letters next
+        // to the selected one bend around the thumb instead of vanishing under it.
+        val spread = max(waveWidth, fullReach * WAVE_WIDTH_SHARE_OF_REACH)
 
         // Darken the list under the wave where its letters cross icons and names. From the
         // right edge that only happens once the wave reaches well into the screen, as it does
@@ -243,7 +270,7 @@ class WaveAlphabetView(
 
         for (i in letters.indices) {
             val y = letterYs[i]
-            val nearness = if (press > 0f) bell((y - fingerY) / waveWidth) else 0f
+            val nearness = if (press > 0f) bell((y - fingerY) / spread) else 0f
             val isSelected = i == selected && press > 0f
 
             val scale = 1f + (if (isSelected) SELECTED_GROWTH else NEAR_GROWTH) * nearness * press
@@ -256,6 +283,15 @@ class WaveAlphabetView(
             }
 
             val x = baseX + inward * reach * nearness
+            if (isSelected) {
+                val radius = paint.textSize * BACKDROP_RADIUS_IN_LETTER_SIZES
+                backdropPaint.alpha = (press * 255).toInt()
+                canvas.save()
+                canvas.translate(x, y)
+                canvas.scale(radius, radius)
+                canvas.drawCircle(0f, 0f, 1f, backdropPaint)
+                canvas.restore()
+            }
             // Centre the glyph on the letter's line.
             val baseline = y - (paint.descent() + paint.ascent()) / 2f
             canvas.drawText(letters[i].label, x, baseline, paint)
@@ -312,10 +348,35 @@ class WaveAlphabetView(
         if (letters.isEmpty()) return
         scrubbing = true
         selected = -1
+        rememberListPosition()
         animatePress(1f, PRESS_IN_MS)
         moveScrub(x, y)
     }
 
+    private fun rememberListPosition() {
+        listPositionBefore = RecyclerView.NO_POSITION
+        val rv = appsView.activeRecyclerView ?: return
+        val layoutManager = rv.layoutManager as? LinearLayoutManager ?: return
+        val position = layoutManager.findFirstVisibleItemPosition()
+        if (position == RecyclerView.NO_POSITION) return
+        listPositionBefore = position
+        listOffsetBefore = (layoutManager.findViewByPosition(position)?.top ?: rv.paddingTop) - rv.paddingTop
+    }
+
+    /**
+     * Ends the scrub and puts the list back where it stood before it, as if the scrub had not
+     * happened. For a scrub that turns out to have been started by mistake.
+     */
+    fun cancelScrub() {
+        if (!scrubbing) return
+        endScrub()
+        if (listPositionBefore == RecyclerView.NO_POSITION) return
+        val rv = appsView.activeRecyclerView ?: return
+        rv.stopScroll()
+        (rv.layoutManager as? LinearLayoutManager)
+            ?.scrollToPositionWithOffset(listPositionBefore, listOffsetBefore)
+    }
+
     /** Moves the finger of a scrub started with [beginScrub]. */
     fun moveScrub(x: Float, y: Float) {
         if (!scrubbing || letters.isEmpty()) return
@@ -465,6 +526,14 @@ class WaveAlphabetView(
         /** How much its neighbours grow, tapering with distance from the finger. */
         const val NEAR_GROWTH = 0.5f
 
+        /** The spot behind the selected letter: black at 60%, solid to this share of its radius. */
+        const val BACKDROP_COLOR = 0x99000000.toInt()
+        const val BACKDROP_SOLID_SHARE = 0.55f
+        const val BACKDROP_RADIUS_IN_LETTER_SIZES = 1.15f
+
+        /** The wave's spread up and down the edge, as a share of how far it reaches out. */
+        const val WAVE_WIDTH_SHARE_OF_REACH = 0.33f
+
         /** How dark the list gets under a wave that lies fully over it (0 = unchanged, 1 = black). */
         const val SCRUB_DIM = 0.55f
 

flexera/version.properties

@@ -2,4 +2,4 @@
 # build.gradle reads this and derives the Android version code from it
 # (major * 10000 + minor * 100 + patch), so the name and the code can never disagree.
 # flexera/release.ps1 raises it for every release.
-versionName=0.3.0
+versionName=0.3.1

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java

@@ -17,6 +17,7 @@
 package com.android.launcher3.uioverrides.touchcontrollers;
 
 import static com.android.app.animation.Interpolators.ACCELERATE_DECELERATE;
+import static com.android.app.animation.Interpolators.DECELERATE;
 import static com.android.launcher3.LauncherAnimUtils.SCRIM_COLORS;
 import static com.android.launcher3.LauncherAnimUtils.newSingleUseCancelListener;
 import static com.android.launcher3.LauncherState.ALL_APPS;
@@ -35,6 +36,7 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.graphics.PointF;
+import android.os.SystemClock;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 
@@ -81,10 +83,23 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     private boolean mDidTouchStartInNavBar;
 
     // Flexera Launcher: swipe up and hold hands the same touch to the wave alphabet (PRD AD-17).
-    // "Started" is set when the pause is detected and the drawer begins to finish opening;
-    // "ready" is set once it is fully open and the alphabet can take the finger's position.
+    // "Started" is set when the pause is detected: the alphabet takes the finger at once, while
+    // the drawer finishes opening under it. "Drawer open" is set when that has finished.
     private boolean mFlexeraScrubStarted;
-    private boolean mFlexeraScrubReady;
+    private boolean mFlexeraDrawerOpen;
+    // Where the finger was at the last drag event, in the drag layer's coordinates.
+    private float mFlexeraLastX;
+    private float mFlexeraLastY;
+    // How long the drawer takes to finish opening once a hold is detected. Short, because the
+    // alphabet is already following the finger and the list has to be readable behind it.
+    private static final long FLEXERA_HOLD_OPEN_MS = 120;
+    // A finger that has not moved for this long is holding. Swipe to recents waits twice as
+    // long; here a false alarm only opens the drawer the swipe was opening anyway.
+    private static final long FLEXERA_HOLD_STILL_MS = 150;
+    // A finger that lifts sooner than this after the hold was noticed was not holding; see
+    // onDragEnd. Too short a time to have read the letter and meant it.
+    private static final long FLEXERA_MIN_HOLD_MS = 200;
+    private long mFlexeraScrubStartTime;
     private boolean mStartedOverview;
     private boolean mReachedOverview;
     // The last recorded displacement before we reached overview.
@@ -177,9 +192,10 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
 
         // Flexera Launcher: a pause during an ordinary swipe up to the drawer starts a scrub.
         mFlexeraScrubStarted = false;
-        mFlexeraScrubReady = false;
+        mFlexeraDrawerOpen = false;
         if (flexeraHoldToScrub()) {
             mMotionPauseDetector.setOnMotionPauseListener(this::onFlexeraHoldDetected);
+            mMotionPauseDetector.setForcePauseTimeout(FLEXERA_HOLD_STILL_MS);
         }
 
         if (mFromState == NORMAL && mToState == HINT_STATE) {
@@ -219,8 +235,15 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         if (mFlexeraScrubStarted) {
             // Flexera Launcher: lifting the finger ends the scrub and leaves the drawer open at
             // the chosen letter. If the drawer is still opening, its end callback finishes up.
-            app.flexera.drawer.FlexeraDrawer.endScrubFromSwipe(mLauncher.getAppsView());
-            if (mFlexeraScrubReady) {
+            if (SystemClock.uptimeMillis() - mFlexeraScrubStartTime < FLEXERA_MIN_HOLD_MS) {
+                // The finger left almost as soon as the hold was noticed, so it was not
+                // holding: an ordinary swipe slowed down at its end. Open the drawer the way
+                // that swipe would have, with the list where it was.
+                app.flexera.drawer.FlexeraDrawer.cancelScrubFromSwipe(mLauncher.getAppsView());
+            } else {
+                app.flexera.drawer.FlexeraDrawer.endScrubFromSwipe(mLauncher.getAppsView());
+            }
+            if (mFlexeraDrawerOpen) {
                 onSwipeInteractionCompleted(ALL_APPS);
             }
         } else if (mStartedOverview) {
@@ -288,26 +311,34 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     }
 
     /**
-     * Flexera Launcher: the finger paused part-way through a swipe up. Finish opening the drawer
-     * and, once it is open, let the same touch scrub the wave alphabet. This mirrors
-     * {@link #onMotionPauseDetected()}, which does the same hand-over to Overview.
+     * Flexera Launcher: the finger paused part-way through a swipe up. From this moment the same
+     * touch scrubs the wave alphabet, with no wait: the alphabet takes the finger where it is,
+     * and the drawer finishes opening under it.
      */
     private void onFlexeraHoldDetected() {
         if (mCurrentAnimation == null || mFlexeraScrubStarted || !flexeraHoldToScrub()) {
             return;
         }
-        mCurrentAnimation.getTarget().addListener(newSingleUseCancelListener(() ->
-                mLauncher.getStateManager().goToState(ALL_APPS, true, forSuccessCallback(() -> {
-                    mFlexeraScrubReady = true;
-                    if (!mDetector.isDraggingState()) {
-                        // The finger lifted while the drawer was still opening.
-                        onSwipeInteractionCompleted(ALL_APPS);
-                    }
-                }))));
-
-        mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);
-        mCurrentAnimation.dispatchOnCancel();
         mFlexeraScrubStarted = true;
+        mFlexeraScrubStartTime = SystemClock.uptimeMillis();
+        app.flexera.drawer.FlexeraDrawer.scrubFromSwipe(
+                mLauncher.getAppsView(), mLauncher.getDragLayer(), mFlexeraLastX, mFlexeraLastY);
+
+        // Play the swipe's own animation to its end, as lifting the finger would, only faster.
+        // Going through the state manager instead would take its full 600 ms opening time.
+        mCurrentAnimation.setEndAction(() -> {
+            mFlexeraDrawerOpen = true;
+            if (!mDetector.isDraggingState()) {
+                // The finger lifted while the drawer was still opening.
+                onSwipeInteractionCompleted(ALL_APPS);
+            }
+        });
+        ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
+        anim.setFloatValues(
+                Utilities.boundToRange(mCurrentAnimation.getProgressFraction(), 0f, 1f), 1f);
+        anim.setDuration(FLEXERA_HOLD_OPEN_MS).setInterpolator(DECELERATE);
+        mCurrentAnimation.dispatchOnStart();
+        anim.start();
         VibratorWrapper.INSTANCE.get(mLauncher).vibrate(OVERVIEW_HAPTIC);
     }
 
@@ -326,13 +357,15 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
 
     @Override
     public boolean onDrag(float yDisplacement, float xDisplacement, MotionEvent event) {
+        // Flexera Launcher: remembered so that a hold, which can be noticed between two touch
+        // events, knows where the finger is.
+        mFlexeraLastX = event.getX();
+        mFlexeraLastY = event.getY();
         if (mFlexeraScrubStarted) {
             // Flexera Launcher: the swipe has become a scrub; the finger now moves the alphabet,
-            // not the drawer. Until the drawer has finished opening there is nothing to move yet.
-            if (mFlexeraScrubReady) {
-                app.flexera.drawer.FlexeraDrawer.scrubFromSwipe(
-                        mLauncher.getAppsView(), mLauncher.getDragLayer(), event);
-            }
+            // not the drawer.
+            app.flexera.drawer.FlexeraDrawer.scrubFromSwipe(
+                    mLauncher.getAppsView(), mLauncher.getDragLayer(), mFlexeraLastX, mFlexeraLastY);
             return true;
         }
         if (mStartedOverview) {

quickstep/src/com/android/quickstep/util/MotionPauseDetector.java

@@ -76,6 +76,9 @@ public class MotionPauseDetector {
     private boolean mDisallowPause;
     // Time at which speed became < mSpeedSlow (only used if mMakePauseHarderToTrigger == true).
     private long mSlowStartTime;
+    // Flexera Launcher: how long without motion counts as a pause. A gesture may shorten it
+    // (see setForcePauseTimeout); clear() puts the stock value back.
+    private long mForcePauseTimeoutMs = FORCE_PAUSE_TIMEOUT;
 
     public MotionPauseDetector(Context context) {
         this(context, false);
@@ -122,6 +125,15 @@ public class MotionPauseDetector {
         mIsTrackpadGesture = isTrackpadGesture;
     }
 
+    /**
+     * Flexera Launcher: sets how long the finger must stay still before that alone counts as a
+     * pause, for the gesture in progress. Swipe up and hold (PRD AD-17) uses a shorter time
+     * than the stock 300 ms, so the alphabet answers a hold without a noticeable wait.
+     */
+    public void setForcePauseTimeout(long timeoutMs) {
+        mForcePauseTimeoutMs = timeoutMs;
+    }
+
     /**
      * @param disallowPause If true, we will not detect any pauses until this is set to false again.
      */
@@ -153,7 +165,7 @@ public class MotionPauseDetector {
                 ? TEST_HARNESS_TRIGGER_TIMEOUT
                 : mMakePauseHarderToTrigger
                         ? HARDER_TRIGGER_TIMEOUT
-                        : FORCE_PAUSE_TIMEOUT;
+                        : mForcePauseTimeoutMs;
         mForcePauseTimeout.setAlarm(timeoutMs);
         float newVelocity = mVelocityProvider.addMotionEvent(ev, ev.getPointerId(pointerIndex));
         if (mPreviousVelocity != null) {
@@ -262,6 +274,7 @@ public class MotionPauseDetector {
         mIsTrackpadGesture = false;
         mIsPaused = mHasEverBeenPaused = false;
         mSlowStartTime = 0;
+        mForcePauseTimeoutMs = FORCE_PAUSE_TIMEOUT;
         mForcePauseTimeout.cancelAlarm();
     }