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

am 8ceb1188: am e787bfa2: am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev

Browse Source 
* commit '8ceb1188f17826088695ed488ad0ab58ec22afa2':
  Fix SysUI crash on device boot.
This commit is contained in:
Julia Reynolds
2015-07-31 14:16:04 +00:00
committed by Android Git Automerger
parent 0550536b27 8ceb1188f1
commit 2a23ef2817
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
View File

@@ -370,16 +370,18 @@ public class NavigationBarView extends LinearLayout {
mLayoutTransitionsEnabled = enabled; mLayoutTransitionsEnabled = enabled;
ViewGroup navButtons = (ViewGroup) mCurrentView.findViewById(R.id.nav_buttons); ViewGroup navButtons = (ViewGroup) mCurrentView.findViewById(R.id.nav_buttons);
LayoutTransition lt = navButtons.getLayoutTransition(); LayoutTransition lt = navButtons.getLayoutTransition();
if (enabled) { if (lt != null) {
lt.enableTransitionType(LayoutTransition.APPEARING); if (enabled) {
lt.enableTransitionType(LayoutTransition.DISAPPEARING); lt.enableTransitionType(LayoutTransition.APPEARING);
lt.enableTransitionType(LayoutTransition.CHANGE_APPEARING); lt.enableTransitionType(LayoutTransition.DISAPPEARING);
lt.enableTransitionType(LayoutTransition.CHANGE_DISAPPEARING); lt.enableTransitionType(LayoutTransition.CHANGE_APPEARING);
} else { lt.enableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);
lt.disableTransitionType(LayoutTransition.APPEARING); } else {
lt.disableTransitionType(LayoutTransition.DISAPPEARING); lt.disableTransitionType(LayoutTransition.APPEARING);
lt.disableTransitionType(LayoutTransition.CHANGE_APPEARING); lt.disableTransitionType(LayoutTransition.DISAPPEARING);
lt.disableTransitionType(LayoutTransition.CHANGE_DISAPPEARING); lt.disableTransitionType(LayoutTransition.CHANGE_APPEARING);
lt.disableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);
}
} }
} }