Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7497621 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by android-build-merger
Browse files

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

am: 3b8e0fdf

Change-Id: If193932cfe4b79535ba8d2ce44f144899e81ee4e
parents 62547293 3b8e0fdf

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

+4 −5
Original line number Diff line number Diff line
@@ -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);