am 70fc6257: Merge change 23828 into eclair

Merge commit '70fc625745b5c6303951113e6d17ea57870fe2f7' into eclair-plus-aosp

* commit '70fc625745b5c6303951113e6d17ea57870fe2f7':
  allow subclassing for drawing vertical scrollbar, so that clients (e.g. webview) can resize/position
This commit is contained in:
Mike Reed
2009-09-03 10:48:29 -07:00
committed by Android Git Automerger

View File

@@ -5409,6 +5409,18 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
scrollBar.draw(canvas);
}
/**
* @hide
*/
protected void onDrawVScrollBar(Canvas canvas, ScrollBarDrawable scrollBar,
int l, int t, int r, int b) {
scrollBar.setBounds(l, t, r, b);
scrollBar.setParameters(computeVerticalScrollRange(),
computeVerticalScrollOffset(),
computeVerticalScrollExtent(), true);
scrollBar.draw(canvas);
}
/**
* <p>Draw the vertical scrollbar if {@link #isVerticalScrollBarEnabled()}
* returns true.</p>
@@ -5441,13 +5453,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
// TODO: Deal with RTL languages to position scrollbar on left
final int left = scrollX + width - size - (mUserPaddingRight & inside);
scrollBar.setBounds(left, scrollY + (mPaddingTop & inside),
left + size, scrollY + height - (mUserPaddingBottom & inside));
scrollBar.setParameters(
computeVerticalScrollRange(),
computeVerticalScrollOffset(),
computeVerticalScrollExtent(), true);
scrollBar.draw(canvas);
onDrawVScrollBar(canvas, scrollBar,
left,
scrollY + (mPaddingTop & inside),
left + size,
scrollY + height - (mUserPaddingBottom & inside));
}
/**