commit c80a4d7ae337688d40f3a0216a053cfa67a67950
author Chet Haase <chet@google.com> Mon Aug 29 22:11:07 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 29 22:11:09 2016 +0000
tree 9d31e0a114780ffbae29b5c3b78d42665776ef42
parent 2bbfe98062d69fbe5dd5d924f385741f9ba4b2ff
parent 99c340cad9ec79128a32a39416a5764a34aa362b

Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev

core/java/com/android/internal/view/FloatingActionMode.java

diff --git a/core/java/com/android/internal/view/FloatingActionMode.java b/core/java/com/android/internal/view/FloatingActionMode.java
index 31ab26f..831c646 100644
--- a/core/java/com/android/internal/view/FloatingActionMode.java
+++ b/core/java/com/android/internal/view/FloatingActionMode.java
@@ -26,6 +26,7 @@
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.ViewParent;
+import android.util.DisplayMetrics;
 
 import com.android.internal.R;
 import com.android.internal.util.Preconditions;
@@ -209,11 +210,9 @@
     }
 
     private boolean isContentRectWithinBounds() {
-        mScreenRect.set(
-            0,
-            0,
-            mContext.getResources().getDisplayMetrics().widthPixels,
-            mContext.getResources().getDisplayMetrics().heightPixels);
+        DisplayMetrics metrics = mContext.getApplicationContext()
+                .getResources().getDisplayMetrics();
+        mScreenRect.set(0, 0, metrics.widthPixels, metrics.heightPixels);
 
         return intersectsClosed(mContentRectOnScreen, mScreenRect)
             && intersectsClosed(mContentRectOnScreen, mViewRectOnScreen);