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

Commit ed8c67d4 authored by Jim Miller's avatar Jim Miller Committed by Brint E. Kriebel
Browse files

Fix crash in widget pager - DO NOT MERGE 

Fixes bug 14299491

Change-Id: I3c94cbd7f7923dc5a429c9929bc432a5dd29d04f
(cherry picked from commit af54c81e)
parent b8de37d5

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

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

            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.playTogether(

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