Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev

Browse Source
This commit is contained in:
Abodunrinwa Toki
2015-06-05 03:08:08 +00:00
committed by Android (Google) Code Review
parent 997f3ccad3 601523ad00
commit 4741f6a4c7
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/com/android/internal/view/FloatingActionMode.java
View File

@@ -127,11 +127,16 @@ public class FloatingActionMode extends ActionMode {
private void repositionToolbar() { private void repositionToolbar() {
checkToolbarInitialized(); 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( mContentRectOnWindow.set(
mContentRect.left + mViewPosition[0], Math.max(mContentRectOnWindow.left, mViewRect.left),
mContentRect.top + mViewPosition[1], Math.max(mContentRectOnWindow.top, mViewRect.top),
mContentRect.right + mViewPosition[0], Math.min(mContentRectOnWindow.right, mViewRect.right),
mContentRect.bottom + mViewPosition[1]); Math.min(mContentRectOnWindow.bottom, mViewRect.bottom));
if (!mContentRectOnWindow.equals(mPreviousContentRectOnWindow)) { if (!mContentRectOnWindow.equals(mPreviousContentRectOnWindow)) {
if (!mPreviousContentRectOnWindow.isEmpty()) { if (!mPreviousContentRectOnWindow.isEmpty()) {
notifyContentRectMoving(); notifyContentRectMoving();