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

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

Browse Source 
am: 3b8e0fdf92

Change-Id: If193932cfe4b79535ba8d2ce44f144899e81ee4e
This commit is contained in:
Abodunrinwa Toki
2016-07-17 18:20:11 +00:00
committed by android-build-merger
parent 62547293e3 3b8e0fdf92
commit c749762107
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import android.view.View;
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 @@ public class FloatingActionMode extends ActionMode {
}
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);