am f405dc87: am 17a35383: Merge "Override View.drawableStateChanged to detect state_pressed"
* commit 'f405dc87a8e61fe95c8e4ee5b81a2f4cd005dfd0': Override View.drawableStateChanged to detect state_pressedmain
commit
2f6851d9da
|
@ -51,11 +51,32 @@ public final class SetupStartIndicatorView extends LinearLayout {
|
||||||
mIndicatorView = indicatorView;
|
mIndicatorView = indicatorView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: Once we stop supporting ICS, uncomment {@link #setPressed(boolean)} method and
|
||||||
|
// remove this method.
|
||||||
@Override
|
@Override
|
||||||
public void setPressed(final boolean pressed) {
|
protected void drawableStateChanged() {
|
||||||
super.setPressed(pressed);
|
super.drawableStateChanged();
|
||||||
|
for (final int state : getDrawableState()) {
|
||||||
|
if (state == android.R.attr.state_pressed) {
|
||||||
|
updateIndicatorView(true /* pressed */);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
updateIndicatorView(false /* pressed */);
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Once we stop supporting ICS, uncomment this method and remove
|
||||||
|
// {@link #drawableStateChanged()} method.
|
||||||
|
// @Override
|
||||||
|
// public void setPressed(final boolean pressed) {
|
||||||
|
// super.setPressed(pressed);
|
||||||
|
// updateIndicatorView(pressed);
|
||||||
|
// }
|
||||||
|
|
||||||
|
private void updateIndicatorView(final boolean pressed) {
|
||||||
if (mIndicatorView != null) {
|
if (mIndicatorView != null) {
|
||||||
mIndicatorView.setPressed(pressed);
|
mIndicatorView.setPressed(pressed);
|
||||||
|
mIndicatorView.invalidate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -72,12 +93,6 @@ public final class SetupStartIndicatorView extends LinearLayout {
|
||||||
mIndicatorPaint.setStyle(Paint.Style.FILL);
|
mIndicatorPaint.setStyle(Paint.Style.FILL);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPressed(final boolean pressed) {
|
|
||||||
super.setPressed(pressed);
|
|
||||||
invalidate();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onDraw(final Canvas canvas) {
|
protected void onDraw(final Canvas canvas) {
|
||||||
super.onDraw(canvas);
|
super.onDraw(canvas);
|
||||||
|
|
Loading…
Reference in New Issue