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

Commit 99c340ca authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by Chet Haase
Browse files

FloatingActionMode: Fix screen coordinates.

Use application context to get the screen's display metrics.

Bug: 30127070
Change-Id: I2c453c494ef210c12d89fc7e3ff026728f9ecb0f
(cherry picked from commit afb38c5c)
parent c2b9d558
Loading
Loading
Loading
Loading
+4 −5
Original line number Original line Diff line number Diff line
@@ -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);