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

Commit 8b354ecf authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 6fed8978 94965684

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -1438,7 +1438,7 @@ public class FilterShowActivity extends AbstractPermissionActivity implements On 


        if (representation instanceof FilterRotateRepresentation) {

            FilterRotateRepresentation r = (FilterRotateRepresentation) representation;

            r.rotateCW();

            r.rotateCCW();

        }

        if (representation instanceof FilterMirrorRepresentation) {

            FilterMirrorRepresentation r = (FilterMirrorRepresentation) representation;

src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java

+17 −0
Original line number Diff line number Diff line
@@ -103,6 +103,23 @@ public class FilterRotateRepresentation extends FilterRepresentation { 
        }

    }



    public void rotateCCW() {

        switch(mRotation) {

            case ZERO:

                mRotation = Rotation.TWO_SEVENTY;

                break;

            case NINETY:

                mRotation = Rotation.ZERO;

                break;

            case ONE_EIGHTY:

                mRotation = Rotation.NINETY;

                break;

            case TWO_SEVENTY:

                mRotation = Rotation.ONE_EIGHTY;

                break;

        }

    }



    public void set(FilterRotateRepresentation r) {

        mRotation = r.mRotation;

    }

src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class ImageRotate extends ImageShow { 
    }



    public void rotate() {

        mLocalRep.rotateCW();

        mLocalRep.rotateCCW();

        invalidate();

    }

src/com/android/gallery3d/filtershow/imageshow/MasterImage.java

+2 −2
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ public class MasterImage implements RenderingRequestCaller { 
        if (mAnimator != null) {

            mAnimator.cancel();

            if (mCurrentLookAnimation == ROTATE_ANIMATION) {

                mCurrentAnimRotationStartValue += 90;

                mCurrentAnimRotationStartValue -= 90;

            }

        } else {

            resetAnimBitmap();
@@ -578,7 +578,7 @@ public class MasterImage implements RenderingRequestCaller { 
        }

        if (newRepresentation instanceof FilterRotateRepresentation) {

            mCurrentLookAnimation = ROTATE_ANIMATION;

            mAnimator = ValueAnimator.ofFloat(0, 90);

            mAnimator = ValueAnimator.ofFloat(0, -90);

            mAnimator.setDuration(500);

        }

        if (newRepresentation instanceof FilterMirrorRepresentation) {