From acea100015dffbb77d137b0681d6c34992e72ae9 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Sat, 10 May 2014 01:30:10 +0200 Subject: [PATCH] Real fix for recent SystemUI crash. Bug: 14680799 Change-Id: I13b476a5e1b610410caeca642722b16053a2a5ea --- .../statusbar/phone/PhoneStatusBarTransitions.java | 10 ++-------- .../systemui/statusbar/phone/PhoneStatusBarView.java | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java index e941d54f9aad5..84065659a6dd5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java @@ -44,16 +44,12 @@ public final class PhoneStatusBarTransitions extends BarTransitions { public void init() { mLeftSide = mView.findViewById(R.id.notification_icon_area); - initStatus(); - applyModeBackground(-1, getMode(), false /*animate*/); - applyMode(getMode(), false /*animate*/); - } - - private void initStatus() { mStatusIcons = mView.findViewById(R.id.statusIcons); mSignalCluster = mView.findViewById(R.id.signal_cluster); mBattery = mView.findViewById(R.id.battery); mClock = mView.findViewById(R.id.clock); + applyModeBackground(-1, getMode(), false /*animate*/); + applyMode(getMode(), false /*animate*/); } public ObjectAnimator animateTransitionTo(View v, float toAlpha) { @@ -83,8 +79,6 @@ public final class PhoneStatusBarTransitions extends BarTransitions { private void applyMode(int mode, boolean animate) { if (mLeftSide == null) return; // pre-init - if (mStatusIcons == null) initStatus(); - if (mStatusIcons == null) return; float newAlpha = getNonBatteryClockAlphaFor(mode); float newAlphaBC = getBatteryClockAlpha(mode); if (mCurrentAnimation != null) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java index e6de0572abdfd..084bfcf1d2e66 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java @@ -63,7 +63,7 @@ public class PhoneStatusBarView extends PanelBar { } @Override - public void onAttachedToWindow() { + public void onFinishInflate() { mBarTransitions.init(); }