Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '911176d7e6c8ba28ed7f7be63edcb17456f615fe':
  Fix crash in widget pager - DO NOT MERGE
This commit is contained in:
Jim Miller
2014-05-21 20:39:41 +00:00
committed by Android Git Automerger
parent 4f65a54561 911176d7e6
commit af103dd393
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java
View File

@@ -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),