Merge "Add edge effect type accessors for views that support it" into sc-dev (e4c9e20d) · Commits · e / os / android_frameworks_base

core/api/current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -53373,6 +53373,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();
		@@ -53414,6 +53415,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);
		@@ -54422,6 +54424,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();
		@@ -54429,6 +54432,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);
		@@ -55282,6 +55286,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();
		@@ -55290,6 +55295,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.