From 6a0b277c7c5759cae8151e87cbc11c5a2c7332a2 Mon Sep 17 00:00:00 2001 From: Abodunrinwa Toki Date: Tue, 26 May 2015 21:35:18 +0100 Subject: [PATCH] Hide the floatingtoolbar when content rect is invisible. Hide the floating toolbar when the content rect is outside the source view's visible area. Bug: 21304845 Change-Id: I0dd10ad2cda7a8d9b05c81334cdfbd68c22dbc6a --- core/java/com/android/internal/view/FloatingActionMode.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/java/com/android/internal/view/FloatingActionMode.java b/core/java/com/android/internal/view/FloatingActionMode.java index 019520836d58..93d2a1df114b 100644 --- a/core/java/com/android/internal/view/FloatingActionMode.java +++ b/core/java/com/android/internal/view/FloatingActionMode.java @@ -121,11 +121,7 @@ public class FloatingActionMode extends ActionMode { 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(); } -- 2.11.0