--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationHandle.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationHandle.java
@@ -21,8 +21,12 @@
 import android.annotation.ColorInt;
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.BlurMaskFilter;
 import android.graphics.Canvas;
+import android.graphics.LinearGradient;
 import android.graphics.Paint;
+import android.graphics.Shader;
+import android.provider.Settings;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.util.FloatProperty;
@@ -49,6 +53,14 @@
     private boolean mShrink;
 
     private ObjectAnimator mPulseAnimator = null;
+
+    // Vanta Rail: the handle is a line of light, not a pill. Accent follows the
+    // Monet accent so a Hub colour change repaints the rail too.
+    private final Paint mGlowPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private final float mGlowRadius;
+    private float mDarkIntensity;
+    private int mRailWidth = -1;
+    private int mRailAccent;
     private float mPulseAnimationProgress;
 
     private static final FloatProperty<NavigationHandle> PULSE_ANIMATION_PROGRESS =
@@ -87,6 +99,8 @@
         mLightColor = Utils.getColorAttrDefaultColor(lightContext, R.attr.homeHandleColor);
         mDarkColor = Utils.getColorAttrDefaultColor(darkContext, R.attr.homeHandleColor);
         mPaint.setAntiAlias(true);
+        mGlowRadius = res.getDisplayMetrics().density * 7f;
+        mGlowPaint.setMaskFilter(new BlurMaskFilter(mGlowRadius, BlurMaskFilter.Blur.NORMAL));
         setFocusable(false);
     }
 
@@ -120,9 +134,36 @@
         float x = -additionalWidth;
         float y = navHeight - mBottom - height + (additionalHeight / 2);
         float adjustedRadius = height / 2;
+        if (railHidden()) return;
+        updateRailShader(width - x);
+        float glow = (1f - 0.6f * mDarkIntensity) * (0.55f + 0.45f * mPulseAnimationProgress);
+        mGlowPaint.setColor(mRailAccent);
+        mGlowPaint.setAlpha((int) (255 * 0.6f * glow));
+        float g = mGlowRadius * 0.5f;
+        canvas.drawRoundRect(x + g, y - g, width - g, y + height + g,
+                adjustedRadius + g, adjustedRadius + g, mGlowPaint);
         canvas.drawRoundRect(x, y, width, y + height, adjustedRadius, adjustedRadius, mPaint);
     }
 
+    private boolean railHidden() {
+        return "hidden".equals(Settings.Secure.getString(
+                getContext().getContentResolver(), "vanta_rail_style"));
+    }
+
+    private void updateRailShader(float w) {
+        int accent = getContext().getColor(android.R.color.system_accent1_200);
+        int deep = getContext().getColor(android.R.color.system_accent1_700);
+        int core = (int) ArgbEvaluator.getInstance().evaluate(mDarkIntensity, 0xFFF4FDFF, deep);
+        int edge = (int) ArgbEvaluator.getInstance().evaluate(mDarkIntensity, accent, deep);
+        if ((int) w == mRailWidth && edge == mRailAccent && mPaint.getShader() != null) return;
+        mRailWidth = (int) w;
+        mRailAccent = edge;
+        mPaint.setColor(0xFFFFFFFF);
+        mPaint.setShader(new LinearGradient(0, 0, w, 0,
+                new int[] {edge & 0x00FFFFFF, edge, core, edge, edge & 0x00FFFFFF},
+                new float[] {0f, 0.2f, 0.5f, 0.8f, 1f}, Shader.TileMode.CLAMP));
+    }
+
     @Override
     public void setImageDrawable(Drawable drawable) {}
 
@@ -134,6 +175,8 @@
 
     @Override
     public void setDarkIntensity(float intensity) {
+        mDarkIntensity = intensity;
+        mRailWidth = -1;
         int color = (int) ArgbEvaluator.getInstance().evaluate(intensity, mLightColor, mDarkColor);
         if (mPaint.getColor() != color) {
             mPaint.setColor(color);
