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

Commit 0ff535ea authored by Adam Cohen's avatar Adam Cohen
Browse files

Remove references to FloatMath, deprecated in M 

-> Allows us to build against M SDK

issue 22822360

Change-Id: I1178eb6bafc348699c5be8c29858eb3dff093e11
parent 249a510a

WallpaperPicker/src/com/android/gallery3d/common/BitmapUtils.java

+3 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.graphics.Canvas; 
import android.graphics.Matrix;

import android.graphics.Paint;

import android.os.Build;

import android.util.FloatMath;

import android.util.Log;



import java.io.ByteArrayOutputStream;
@@ -72,7 +71,7 @@ public class BitmapUtils { 
                && minSideLength == UNCONSTRAINED) return 1;



        int lowerBound = (maxNumOfPixels == UNCONSTRAINED) ? 1 :

                (int) FloatMath.ceil(FloatMath.sqrt((float) (w * h) / maxNumOfPixels));

                (int) Math.ceil(Math.sqrt((float) (w * h) / maxNumOfPixels));



        if (minSideLength == UNCONSTRAINED) {

            return lowerBound;
@@ -96,7 +95,7 @@ public class BitmapUtils { 


    // Find the min x that 1 / x >= scale

    public static int computeSampleSizeLarger(float scale) {

        int initialSize = (int) FloatMath.floor(1f / scale);

        int initialSize = (int) Math.floor(1f / scale);

        if (initialSize <= 1) return 1;



        return initialSize <= 8
@@ -107,7 +106,7 @@ public class BitmapUtils { 
    // Find the max x that 1 / x <= scale.

    public static int computeSampleSize(float scale) {

        Utils.assertTrue(scale > 0);

        int initialSize = Math.max(1, (int) FloatMath.ceil(1 / scale));

        int initialSize = Math.max(1, (int) Math.ceil(1 / scale));

        return initialSize <= 8

                ? Utils.nextPowerOf2(initialSize)

                : (initialSize + 7) / 8 * 8;

WallpaperPicker/src/com/android/launcher3/CropView.java

+2 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.graphics.Matrix; 
import android.graphics.Point;

import android.graphics.RectF;

import android.util.AttributeSet;

import android.util.FloatMath;

import android.view.MotionEvent;

import android.view.ScaleGestureDetector;

import android.view.ScaleGestureDetector.OnScaleGestureListener;
@@ -300,12 +299,12 @@ public class CropView extends TiledImageView implements OnScaleGestureListener { 
                    adjustment[0] = (edges.right - getWidth()) / scale;

                }

                if (edges.top > 0) {

                    adjustment[1] = FloatMath.ceil(edges.top / scale);

                    adjustment[1] = (float) Math.ceil(edges.top / scale);

                } else if (edges.bottom < getHeight()) {

                    adjustment[1] = (edges.bottom - getHeight()) / scale;

                }

                for (int dim = 0; dim <= 1; dim++) {

                    if (coef[dim] > 0) adjustment[dim] = FloatMath.ceil(adjustment[dim]);

                    if (coef[dim] > 0) adjustment[dim] = (float) Math.ceil(adjustment[dim]);

                }



                mInverseRotateMatrix.mapPoints(adjustment);

src/com/android/launcher3/LauncherScroller.java

+2 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.animation.TimeInterpolator; 
import android.content.Context;

import android.hardware.SensorManager;

import android.os.Build;

import android.util.FloatMath;

import android.view.ViewConfiguration;

import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;
@@ -409,7 +408,7 @@ public class LauncherScroller { 


            float dx = (float) (mFinalX - mStartX);

            float dy = (float) (mFinalY - mStartY);

            float hyp = FloatMath.sqrt(dx * dx + dy * dy);

            float hyp = (float) Math.sqrt(dx * dx + dy * dy);



            float ndx = dx / hyp;

            float ndy = dy / hyp;
@@ -426,7 +425,7 @@ public class LauncherScroller { 
        mMode = FLING_MODE;

        mFinished = false;



        float velocity = FloatMath.sqrt(velocityX * velocityX + velocityY * velocityY);

        float velocity = (float) Math.sqrt(velocityX * velocityX + velocityY * velocityY);



        mVelocity = velocity;

        mDuration = getSplineFlingDuration(velocity);