diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-07-31 13:57:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 13:57:02 +0000 |
| commit | 9bc9469807703757f50fffd34ed6b3f6183cdc6e (patch) | |
| tree | 748425d9076252d6ae6022627009ab36f9ef635e | |
| parent | 489043d49be1ea66b7714666193e69399cffa223 (diff) | |
| parent | 5d6a2d387cd437e6d0c45d0df1bd10ba9db56253 (diff) | |
| download | frameworks_base-9bc9469807703757f50fffd34ed6b3f6183cdc6e.zip frameworks_base-9bc9469807703757f50fffd34ed6b3f6183cdc6e.tar.gz frameworks_base-9bc9469807703757f50fffd34ed6b3f6183cdc6e.tar.bz2 | |
am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev
* commit '5d6a2d387cd437e6d0c45d0df1bd10ba9db56253':
Fix SysUI crash on device boot.
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index ed49f39..59cf2bf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -370,16 +370,18 @@ public class NavigationBarView extends LinearLayout { mLayoutTransitionsEnabled = enabled; ViewGroup navButtons = (ViewGroup) mCurrentView.findViewById(R.id.nav_buttons); LayoutTransition lt = navButtons.getLayoutTransition(); - if (enabled) { - lt.enableTransitionType(LayoutTransition.APPEARING); - lt.enableTransitionType(LayoutTransition.DISAPPEARING); - lt.enableTransitionType(LayoutTransition.CHANGE_APPEARING); - lt.enableTransitionType(LayoutTransition.CHANGE_DISAPPEARING); - } else { - lt.disableTransitionType(LayoutTransition.APPEARING); - lt.disableTransitionType(LayoutTransition.DISAPPEARING); - lt.disableTransitionType(LayoutTransition.CHANGE_APPEARING); - lt.disableTransitionType(LayoutTransition.CHANGE_DISAPPEARING); + if (lt != null) { + if (enabled) { + lt.enableTransitionType(LayoutTransition.APPEARING); + lt.enableTransitionType(LayoutTransition.DISAPPEARING); + lt.enableTransitionType(LayoutTransition.CHANGE_APPEARING); + lt.enableTransitionType(LayoutTransition.CHANGE_DISAPPEARING); + } else { + lt.disableTransitionType(LayoutTransition.APPEARING); + lt.disableTransitionType(LayoutTransition.DISAPPEARING); + lt.disableTransitionType(LayoutTransition.CHANGE_APPEARING); + lt.disableTransitionType(LayoutTransition.CHANGE_DISAPPEARING); + } } } |