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

Commit 25f0e618 authored by Alan Viverette's avatar Alan Viverette
Browse files

Revert "Use ObjectAnimator for fading scrollbars, set initial duration to 1500" 

Bug: 19522833
Bug: 19528265
This reverts commit 72710f11.

Change-Id: I7235ae3ca53696f029cc18f19fe1d373c4f54bbf
parent 228fd600

core/java/android/view/View.java

+294 −220

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/ViewConfiguration.java

+1 −17
Original line number Diff line number Diff line
@@ -46,12 +46,6 @@ public class ViewConfiguration { 
     */

    private static final int SCROLL_BAR_DEFAULT_DELAY = 300;



    /**

     * Default delay before the scrollbars fade in milliseconds for the first

     * time they are shown to the user.

     */

    private static final int SCROLL_BAR_DEFAULT_INITIAL_DELAY = 1500;



    /**

     * Defines the length of the fading edges in dips

     */
@@ -401,22 +395,12 @@ public class ViewConfiguration { 
    }



    /**

     * @return Default delay in milliseconds before the scrollbars fade out

     *         after they have been awoken.

     * @return Default delay before the scrollbars fade in milliseconds

     */

    public static int getScrollDefaultDelay() {

        return SCROLL_BAR_DEFAULT_DELAY;

    }



    /**

     * @return Default delay in milliseconds before the scrollbars fade out

     *         after they are initially shown to the user.

     * @hide Pending cleanup of ViewConfiguration values.

     */

    public static int getScrollDefaultInitialDelay() {

        return SCROLL_BAR_DEFAULT_INITIAL_DELAY;

    }



    /**

     * @return the length of the fading edges in dips

     *

graphics/java/android/graphics/drawable/Drawable.java

+0 −16
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.graphics.Xfermode; 
import android.os.Trace;

import android.util.AttributeSet;

import android.util.DisplayMetrics;

import android.util.IntProperty;

import android.util.StateSet;

import android.util.TypedValue;

import android.util.Xml;
@@ -1372,20 +1371,5 @@ public abstract class Drawable { 
            default: return defaultMode;

        }

    }



    /** @hide */

    public static final IntProperty<Drawable> ALPHA = new IntProperty<Drawable>("alpha") {

        @Override

        public void setValue(Drawable object, int value) {

            object.mutate();

            object.setAlpha(value);

            object.invalidateSelf();

        }



        @Override

        public Integer get(Drawable object) {

            return object.getAlpha();

        }

    };

}