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

Commit 7954a1af authored by George Mount's avatar George Mount
Browse files

Add edge effect type accessors for views that support it 

Bug: 171228096
The edge effect type attribute is supported in
ScrollView, HorizontalScrollView, and ListView, so
those views must provide accessor methods for the
edge effect type. This CL adds them.

Test: I5684df2a21cfeaefeac01290f7681e5c5beebd7c
Change-Id: I93db702995401bf890217e8001cfe0664ac51c81
parent 9efcb0bd

core/api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -53310,6 +53310,7 @@ package android.widget { 
    method public int getCheckedItemPosition();

    method public android.util.SparseBooleanArray getCheckedItemPositions();

    method public int getChoiceMode();

    method public int getEdgeEffectType();

    method public int getListPaddingBottom();

    method public int getListPaddingLeft();

    method public int getListPaddingRight();
@@ -53351,6 +53352,7 @@ package android.widget { 
    method public void setChoiceMode(int);

    method public void setDrawSelectorOnTop(boolean);

    method public void setEdgeEffectColor(@ColorInt int);

    method public void setEdgeEffectType(int);

    method public void setFastScrollAlwaysVisible(boolean);

    method public void setFastScrollEnabled(boolean);

    method public void setFastScrollStyle(int);
@@ -54343,6 +54345,7 @@ package android.widget { 
    method public boolean executeKeyEvent(android.view.KeyEvent);

    method public void fling(int);

    method public boolean fullScroll(int);

    method public int getEdgeEffectType();

    method @ColorInt public int getLeftEdgeEffectColor();

    method public int getMaxScrollAmount();

    method @ColorInt public int getRightEdgeEffectColor();
@@ -54350,6 +54353,7 @@ package android.widget { 
    method public boolean isSmoothScrollingEnabled();

    method public boolean pageScroll(int);

    method public void setEdgeEffectColor(@ColorInt int);

    method public void setEdgeEffectType(int);

    method public void setFillViewport(boolean);

    method public void setLeftEdgeEffectColor(@ColorInt int);

    method public void setRightEdgeEffectColor(@ColorInt int);
@@ -55190,6 +55194,7 @@ package android.widget { 
    method public void fling(int);

    method public boolean fullScroll(int);

    method @ColorInt public int getBottomEdgeEffectColor();

    method public int getEdgeEffectType();

    method public int getMaxScrollAmount();

    method @ColorInt public int getTopEdgeEffectColor();

    method public boolean isFillViewport();
@@ -55198,6 +55203,7 @@ package android.widget { 
    method public void scrollToDescendant(@NonNull android.view.View);

    method public void setBottomEdgeEffectColor(@ColorInt int);

    method public void setEdgeEffectColor(@ColorInt int);

    method public void setEdgeEffectType(int);

    method public void setFillViewport(boolean);

    method public void setSmoothScrollingEnabled(boolean);

    method public void setTopEdgeEffectColor(@ColorInt int);

core/java/android/widget/AbsListView.java

+21 −0
Original line number Diff line number Diff line
@@ -6611,6 +6611,27 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
        return mEdgeGlowBottom.getColor();

    }



    /**

     * Returns the {@link EdgeEffect#getType()} for the edge effects.

     * @return the {@link EdgeEffect#getType()} for the edge effects.

     * @attr ref android.R.styleable#EdgeEffect_edgeEffectType

     */

    @EdgeEffect.EdgeEffectType

    public int getEdgeEffectType() {

        return mEdgeGlowTop.getType();

    }



    /**

     * Sets the {@link EdgeEffect#setType(int)} for the edge effects.

     * @param type The edge effect type to use for the edge effects.

     * @attr ref android.R.styleable#EdgeEffect_edgeEffectType

     */

    public void setEdgeEffectType(@EdgeEffect.EdgeEffectType int type) {

        mEdgeGlowTop.setType(type);

        mEdgeGlowBottom.setType(type);

        invalidate();

    }



    /**

     * Sets the recycler listener to be notified whenever a View is set aside in

     * the recycler for later reuse. This listener can be used to free resources

core/java/android/widget/HorizontalScrollView.java

+21 −0
Original line number Diff line number Diff line
@@ -302,6 +302,27 @@ public class HorizontalScrollView extends FrameLayout { 
        return mEdgeGlowRight.getColor();

    }



    /**

     * Returns the {@link EdgeEffect#getType()} for the edge effects.

     * @return the {@link EdgeEffect#getType()} for the edge effects.

     * @attr ref android.R.styleable#EdgeEffect_edgeEffectType

     */

    @EdgeEffect.EdgeEffectType

    public int getEdgeEffectType() {

        return mEdgeGlowLeft.getType();

    }



    /**

     * Sets the {@link EdgeEffect#setType(int)} for the edge effects.

     * @param type The edge effect type to use for the edge effects.

     * @attr ref android.R.styleable#EdgeEffect_edgeEffectType

     */

    public void setEdgeEffectType(@EdgeEffect.EdgeEffectType int type) {

        mEdgeGlowRight.setType(type);

        mEdgeGlowLeft.setType(type);

        invalidate();

    }



    /**

     * @return The maximum amount this scroll view will scroll in response to

     *   an arrow event.

core/java/android/widget/ScrollView.java

+21 −0
Original line number Diff line number Diff line
@@ -334,6 +334,27 @@ public class ScrollView extends FrameLayout { 
        return mEdgeGlowBottom.getColor();

    }



    /**

     * Returns the {@link EdgeEffect#getType()} for the edge effects.

     * @return the {@link EdgeEffect#getType()} for the edge effects.

     * @attr ref android.R.styleable#EdgeEffect_edgeEffectType

     */

    @EdgeEffect.EdgeEffectType

    public int getEdgeEffectType() {

        return mEdgeGlowTop.getType();

    }



    /**

     * Sets the {@link EdgeEffect#setType(int)} for the edge effects.

     * @param type The edge effect type to use for the edge effects.

     * @attr ref android.R.styleable#EdgeEffect_edgeEffectType

     */

    public void setEdgeEffectType(@EdgeEffect.EdgeEffectType int type) {

        mEdgeGlowTop.setType(type);

        mEdgeGlowBottom.setType(type);

        invalidate();

    }



    /**

     * @return The maximum amount this scroll view will scroll in response to

     *   an arrow event.