Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d5a1ff8 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by android-build-merger
Browse files

Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev

am: 0aadeed5

Change-Id: I88bf203f78319713f719fe2426c0c4a1e7770b11
parents 679f7e40 0aadeed5
Loading
Loading
Loading
Loading
+4 −6
Original line number Diff line number Diff line
@@ -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);


+1.54 KiB
Loading image diff...
+3.19 KiB
Loading image diff...
+965 B
Loading image diff...
+2.04 KiB
Loading image diff...
Loading