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

Commit 540309df authored by Ian Rogers's avatar Ian Rogers Committed by android-build-merger
Browse files

Merge "Float.NaN != ... always evaluates to true, use Float.isNaN." 

am: c09248bd

* commit 'c09248bd':
  Float.NaN != ... always evaluates to true, use Float.isNaN.
parents 3a70581d c09248bd

src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ public class ColorBrightnessView extends View implements ColorListener { 
        canvas.drawRect(mBorder, mBorder, mWidth - mBorder, mHeight - mBorder, mBarPaint1);

        canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1);

        canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2);

        if (mDotX != Float.NaN) {

        if (!Float.isNaN(mDotX)) {

            canvas.drawCircle(mDotX, mDotY, mDotRadius, mDotPaint);

        }

    }

src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public class ColorHueView extends View implements ColorListener { 


        canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1);

        canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2);

        if (mDotX != Float.NaN) {

        if (!Float.isNaN(mDotX)) {

            canvas.drawCircle(mDotX, mDotY, mDotRadius, mDotPaint);

        }

    }

src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ public class ColorOpacityView extends View implements ColorListener { 
        canvas.drawRect(mBorder, 0, mWidth - mBorder, mHeight, mBarPaint1);

        canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1);

        canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2);

        if (mDotX != Float.NaN) {

        if (!Float.isNaN(mDotX)) {

            canvas.drawCircle(mDotX, mDotY, mDotRadius, mDotPaint);

        }

    }

src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java

+1 −2
Original line number Diff line number Diff line
@@ -170,8 +170,7 @@ public class ColorRectView extends View implements ColorListener { 
        canvas.drawRect(rect, mWheelPaint3);

        canvas.drawRect(rect, mWheelPaint2);



        if (mDotX != Float.NaN) {



        if (!Float.isNaN(mDotX)) {

            canvas.drawCircle(mDotX, mDotY, mDotRadus, mDotPaint);

        }

    }

src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java

+1 −2
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ public class ColorSVRectView extends View implements ColorListener { 
        mRect.right -= mBorder;

        canvas.drawBitmap(mBitmap, null, mRect, mPaint1);



        if (mDotX != Float.NaN) {



        if (!Float.isNaN(mDotX)) {

            canvas.drawCircle(mDotX, mDotY, mDotRadus, mDotPaint);

        }

    }