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

Commit 6f354679 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am af103dd3: am 911176d7: am 607d5998: Fix crash in widget pager - DO NOT MERGE 

* commit 'af103dd3':
  Fix crash in widget pager - DO NOT MERGE
parents 82ec8c58 af103dd3

packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -846,7 +846,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit 
            currentPage.setPivotX(0);

            currentPage.setPivotX(0);

            currentPage.setPivotX(currentPage.getMeasuredWidth() / 2);

            currentPage.setPivotX(currentPage.getMeasuredWidth() / 2);

        }

        }

        if (!(currentPage.getScaleX() < 1f || currentPage.getScaleY() < 1f)) {

        if (currentPage != null && (!(currentPage.getScaleX() < 1f || currentPage.getScaleY() < 1f))) {

            mZoomInOutAnim = new AnimatorSet();

            mZoomInOutAnim = new AnimatorSet();

            mZoomInOutAnim.playTogether(

            mZoomInOutAnim.playTogether(

                    ObjectAnimator.ofFloat(currentPage, "scaleX", BOUNCER_SCALE_FACTOR),

                    ObjectAnimator.ofFloat(currentPage, "scaleX", BOUNCER_SCALE_FACTOR),