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

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

Browse Source
This commit is contained in:
Chet Haase
2016-08-29 22:11:07 +00:00
committed by Android (Google) Code Review
parent 2bbfe98062 99c340cad9
commit c80a4d7ae3
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.ViewConfiguration;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewParent; import android.view.ViewParent;
import android.util.DisplayMetrics;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
@@ -209,11 +210,9 @@ public class FloatingActionMode extends ActionMode {
} }
private boolean isContentRectWithinBounds() { private boolean isContentRectWithinBounds() {
mScreenRect.set( DisplayMetrics metrics = mContext.getApplicationContext()
0, .getResources().getDisplayMetrics();
0, mScreenRect.set(0, 0, metrics.widthPixels, metrics.heightPixels);
mContext.getResources().getDisplayMetrics().widthPixels,
mContext.getResources().getDisplayMetrics().heightPixels);
return intersectsClosed(mContentRectOnScreen, mScreenRect) return intersectsClosed(mContentRectOnScreen, mScreenRect)
&& intersectsClosed(mContentRectOnScreen, mViewRectOnScreen); && intersectsClosed(mContentRectOnScreen, mViewRectOnScreen);