am df5ca90e: am 37c11800: Don\'t animate in the navigation bar when going to full shade (66d7cdcd) · Commits · e / os / android_frameworks_base

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

+12 −5

Original line number	Diff line number	Diff line
		@@ -91,7 +91,8 @@ public class NavigationBarView extends LinearLayout {

		private OnVerticalChangedListener mOnVerticalChangedListener;
		private boolean mIsLayoutRtl;
		private boolean mLayoutTransitionsEnabled;
		private boolean mLayoutTransitionsEnabled = true;
		private boolean mWakeAndUnlocking;

		private class NavTransitionListener implements TransitionListener {
		private boolean mBackTransitioning;
		@@ -361,13 +362,19 @@ public class NavigationBarView extends LinearLayout {
		}
		}

		public void setLayoutTransitionsEnabled(boolean enabled) {
		mLayoutTransitionsEnabled = enabled;
		updateLayoutTransitionsEnabled();
		}

		public void setWakeAndUnlocking(boolean wakeAndUnlocking) {
		setUseFadingAnimations(wakeAndUnlocking);
		setLayoutTransitionsEnabled(!wakeAndUnlocking);
		mWakeAndUnlocking = wakeAndUnlocking;
		updateLayoutTransitionsEnabled();
		}

		private void setLayoutTransitionsEnabled(boolean enabled) {
		mLayoutTransitionsEnabled = enabled;
		private void updateLayoutTransitionsEnabled() {
		boolean enabled = !mWakeAndUnlocking && mLayoutTransitionsEnabled;
		ViewGroup navButtons = (ViewGroup) mCurrentView.findViewById(R.id.nav_buttons);
		LayoutTransition lt = navButtons.getLayoutTransition();
		if (lt != null) {
		@@ -459,7 +466,7 @@ public class NavigationBarView extends LinearLayout {
		}
		mCurrentView = mRotatedViews[rot];
		mCurrentView.setVisibility(View.VISIBLE);
		setLayoutTransitionsEnabled(mLayoutTransitionsEnabled);
		updateLayoutTransitionsEnabled();

		getImeSwitchButton().setOnClickListener(mImeSwitcherClickListener);

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+15 −1

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ import com.android.systemui.statusbar.policy.UserSwitcherController;
		import com.android.systemui.statusbar.policy.ZenModeController;
		import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
		import com.android.systemui.statusbar.stack.NotificationStackScrollLayout.OnChildLocationsChangedListener;
		import com.android.systemui.statusbar.stack.StackStateAnimator;
		import com.android.systemui.statusbar.stack.StackViewState;
		import com.android.systemui.volume.VolumeComponent;

		@@ -3486,11 +3487,24 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		setBarState(StatusBarState.SHADE);
		if (mLeaveOpenOnKeyguardHide) {
		mLeaveOpenOnKeyguardHide = false;
		mNotificationPanel.animateToFullShade(calculateGoingToFullShadeDelay());
		long delay = calculateGoingToFullShadeDelay();
		mNotificationPanel.animateToFullShade(delay);
		if (mDraggedDownRow != null) {
		mDraggedDownRow.setUserLocked(false);
		mDraggedDownRow = null;
		}

		// Disable layout transitions in navbar for this transition because the load is just
		// too heavy for the CPU and GPU on any device.
		if (mNavigationBarView != null) {
		mNavigationBarView.setLayoutTransitionsEnabled(false);
		mNavigationBarView.postDelayed(new Runnable() {
		@Override
		public void run() {
		mNavigationBarView.setLayoutTransitionsEnabled(true);
		}
		}, delay + StackStateAnimator.ANIMATION_DURATION_GO_TO_FULL_SHADE);
		}
		} else {
		instantCollapseNotificationPanel();
		}