Merge "Fix SysUI crash on device boot." into mnc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
5d6a2d387c
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user