Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-dev
diff --git a/core/java/com/android/internal/view/FloatingActionMode.java b/core/java/com/android/internal/view/FloatingActionMode.java
index 0195208..93d2a1d 100644
--- a/core/java/com/android/internal/view/FloatingActionMode.java
+++ b/core/java/com/android/internal/view/FloatingActionMode.java
@@ -121,11 +121,7 @@
public void updateViewLocationInWindow() {
checkToolbarInitialized();
mOriginatingView.getLocationInWindow(mViewPosition);
- mViewRect.set(
- mViewPosition[0],
- mViewPosition[1],
- mViewPosition[0] + mOriginatingView.getWidth(),
- mViewPosition[1] + mOriginatingView.getHeight());
+ mOriginatingView.getGlobalVisibleRect(mViewRect);
repositionToolbar();
}