TextView: Make sure the contentRect is within visibile bounds.

Bug: 21620604
Change-Id: Idd0d891e423316b2ebacf883fd3cbfff9ef69743
This commit is contained in:
Abodunrinwa Toki
2015-06-04 22:17:47 +01:00
parent 0ee780a993
commit 601523ad00

View File

@@ -127,11 +127,16 @@ public class FloatingActionMode extends ActionMode {
private void repositionToolbar() {
checkToolbarInitialized();
mContentRectOnWindow.set(mContentRect);
mContentRectOnWindow.offset(mViewPosition[0], mViewPosition[1]);
// Make sure that content rect is not out of the view's visible bounds.
mContentRectOnWindow.set(
mContentRect.left + mViewPosition[0],
mContentRect.top + mViewPosition[1],
mContentRect.right + mViewPosition[0],
mContentRect.bottom + mViewPosition[1]);
Math.max(mContentRectOnWindow.left, mViewRect.left),
Math.max(mContentRectOnWindow.top, mViewRect.top),
Math.min(mContentRectOnWindow.right, mViewRect.right),
Math.min(mContentRectOnWindow.bottom, mViewRect.bottom));
if (!mContentRectOnWindow.equals(mPreviousContentRectOnWindow)) {
if (!mPreviousContentRectOnWindow.isEmpty()) {
notifyContentRectMoving();