diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java index 7c84df91fffa..e85ff8ef22c0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -519,7 +519,14 @@ public class KeyguardStatusBarView extends RelativeLayout mStatusIconContainer.setAlpha(alpha); mStatusIconContainer.setVisibility(visibility); - mSystemIconsContainer.setTranslationX(-mCurrentBurnInOffsetX * mDarkAmount); + float iconsX = -mCurrentBurnInOffsetX; + if (mMultiUserSwitch.getVisibility() == VISIBLE) { + // Squared alpha to add a nice easing curve and avoid overlap during animation. + mMultiUserAvatar.setAlpha(alpha * alpha); + iconsX += mMultiUserAvatar.getPaddingLeft() + mMultiUserAvatar.getWidth() + + mMultiUserAvatar.getPaddingRight(); + } + mSystemIconsContainer.setTranslationX(iconsX * mDarkAmount); mSystemIconsContainer.setTranslationY(mCurrentBurnInOffsetY * mDarkAmount); updateIconsAndTextColors(); } |