Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev
diff --git a/api/current.txt b/api/current.txt
index 419a977..e475167 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28253,10 +28253,6 @@
ctor public StackView(android.content.Context);
ctor public StackView(android.content.Context, android.util.AttributeSet);
ctor public StackView(android.content.Context, android.util.AttributeSet, int);
- method public int getClickColor();
- method public int getOutlineColor();
- method public void setClickColor(int);
- method public void setOutlineColor(int);
}
public class Switch extends android.widget.CompoundButton {
diff --git a/core/java/android/widget/StackView.java b/core/java/android/widget/StackView.java
index 91519aa..22df3bc 100644
--- a/core/java/android/widget/StackView.java
+++ b/core/java/android/widget/StackView.java
@@ -220,46 +220,6 @@
}
/**
- * Sets the color of the outlines of items in this StackView.
- *
- * @param color the color of the StackView item outlines.
- * @attr ref android.R.styleable#StackView_resOutColor
- */
- @android.view.RemotableViewMethod
- public void setOutlineColor(int color) {
- mResOutColor = color;
- }
-
- /**
- * Returns the color of the outlines of items in this StackView.
- *
- * @attr ref android.R.styleable#StackView_resOutColor
- */
- public int getOutlineColor() {
- return mResOutColor;
- }
-
- /**
- * Sets the color for the click feedback on items in this StackView.
- *
- * @param color the color of the StackView item click feedback.
- * @attr ref android.R.styleable#StackView_clickColor
- */
- @android.view.RemotableViewMethod
- public void setClickColor(int color) {
- mClickColor = color;
- }
-
- /**
- * Returns the color of the click feedback on items in this StackView.
- *
- * @attr ref android.R.styleable#StackView_clickColor
- */
- public int getClickColor() {
- return mClickColor;
- }
-
- /**
* Animate the views between different relative indexes within the {@link AdapterViewAnimator}
*/
void transformViewForTransition(int fromIndex, int toIndex, final View view, boolean animate) {