Revert "Update overscroll and toast UI"

This change broke android.uirendering.cts.testclasses.EdgeEffectTests.

This reverts commit 6085f8a16b5f6ed6a7a7acf854ec29ff2bef45fa.

Bug: 64085792

Change-Id: I70ccebebb54dabf1ec0ee5002adca93e44104a1e

1 files changed, 4 insertions, 6 deletions

diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java
index f9f5901a6651..98d8a13d68b5 100644
--- a/core/java/android/widget/EdgeEffect.java
+++ b/core/java/android/widget/EdgeEffect.java
@@ -59,8 +59,7 @@ public class EdgeEffect {
     // Time it will take in ms for a pulled glow to decay to partial strength before release
     private static final int PULL_DECAY_TIME = 2000;
 
-    private static final float MAX_ALPHA = 0.15f;
-    private static final float GLOW_ALPHA_START = .09f;
+    private static final float MAX_ALPHA = 0.5f;
 
     private static final float MAX_GLOW_SCALE = 2.f;
 
@@ -76,7 +75,6 @@ public class EdgeEffect {
     private static final double ANGLE = Math.PI / 6;
     private static final float SIN = (float) Math.sin(ANGLE);
     private static final float COS = (float) Math.cos(ANGLE);
-    private static final float RADIUS_FACTOR = 0.6f;
 
     private float mGlowAlpha;
     private float mGlowScaleY;
@@ -136,10 +134,10 @@ public class EdgeEffect {
      * @param height Effect height in pixels
      */
     public void setSize(int width, int height) {
-        final float r = width * RADIUS_FACTOR / SIN;
+        final float r = width * 0.75f / SIN;
         final float y = COS * r;
         final float h = r - y;
-        final float or = height * RADIUS_FACTOR / SIN;
+        final float or = height * 0.75f / SIN;
         final float oy = COS * or;
         final float oh = or - oy;
 
@@ -274,7 +272,7 @@ public class EdgeEffect {
 
         // The glow depends more on the velocity, and therefore starts out
         // nearly invisible.
-        mGlowAlphaStart = GLOW_ALPHA_START;
+        mGlowAlphaStart = 0.3f;
         mGlowScaleYStart = Math.max(mGlowScaleY, 0.f);