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

am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev

Browse Source 
* commit '4603bd34ce8a5557729e3912a081ec9f8c0d7ab5':
  FloatingToolbar: Offset visible rect by the rootview's offset
This commit is contained in:
Abodunrinwa Toki
2015-07-07 15:48:48 +00:00
committed by Android Git Automerger
parent 3eaebfe5e9 4603bd34ce
commit 0bb0e22619
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ public class FloatingActionMode extends ActionMode {
private final Rect mPreviousContentRectOnWindow; private final Rect mPreviousContentRectOnWindow;
private final int[] mViewPosition; private final int[] mViewPosition;
private final int[] mPreviousViewPosition; private final int[] mPreviousViewPosition;
private final int[] mRootViewPosition;
private final Rect mViewRect; private final Rect mViewRect;
private final Rect mPreviousViewRect; private final Rect mPreviousViewRect;
private final Rect mScreenRect; private final Rect mScreenRect;
@@ -80,6 +81,7 @@ public class FloatingActionMode extends ActionMode {
mPreviousContentRectOnWindow = new Rect(); mPreviousContentRectOnWindow = new Rect();
mViewPosition = new int[2]; mViewPosition = new int[2];
mPreviousViewPosition = new int[2]; mPreviousViewPosition = new int[2];
mRootViewPosition = new int[2];
mViewRect = new Rect(); mViewRect = new Rect();
mPreviousViewRect = new Rect(); mPreviousViewRect = new Rect();
mScreenRect = new Rect(); mScreenRect = new Rect();
@@ -137,7 +139,9 @@ public class FloatingActionMode extends ActionMode {
checkToolbarInitialized(); checkToolbarInitialized();
mOriginatingView.getLocationInWindow(mViewPosition); mOriginatingView.getLocationInWindow(mViewPosition);
mOriginatingView.getRootView().getLocationInWindow(mRootViewPosition);
mOriginatingView.getGlobalVisibleRect(mViewRect); mOriginatingView.getGlobalVisibleRect(mViewRect);
mViewRect.offset(mRootViewPosition[0], mRootViewPosition[1]);
if (!Arrays.equals(mViewPosition, mPreviousViewPosition) if (!Arrays.equals(mViewPosition, mPreviousViewPosition)
|| !mViewRect.equals(mPreviousViewRect)) { || !mViewRect.equals(mPreviousViewRect)) {