diff options
| author | Abodunrinwa Toki <toki@google.com> | 2015-05-26 21:31:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-26 21:31:36 +0000 |
| commit | 4d2fc599cf5e7ac0735af683d215ce3dbf91b9fe (patch) | |
| tree | af53def09754e4efa76dd73a121532b3c3188c5a /core/java/com | |
| parent | 5aa147dd9bb6f3968108aaefd076dd2df330a539 (diff) | |
| parent | 6a0b277c7c5759cae8151e87cbc11c5a2c7332a2 (diff) | |
| download | frameworks_base-4d2fc599cf5e7ac0735af683d215ce3dbf91b9fe.zip frameworks_base-4d2fc599cf5e7ac0735af683d215ce3dbf91b9fe.tar.gz frameworks_base-4d2fc599cf5e7ac0735af683d215ce3dbf91b9fe.tar.bz2 | |
Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-dev
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/view/FloatingActionMode.java | 6 |
1 files changed, 1 insertions, 5 deletions
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 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(); } |