Merge "Fix missing animation when launch activity from notification." into... (3e442958) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -321,7 +321,8 @@ public class NotificationShadeWindowController implements Callback, Dumpable,
	\|\| state.mPanelVisible \|\| state.mKeyguardFadingAway \|\| state.mBouncerShowing		\|\| state.mPanelVisible \|\| state.mKeyguardFadingAway \|\| state.mBouncerShowing
	\|\| state.mHeadsUpShowing		\|\| state.mHeadsUpShowing
	\|\| state.mScrimsVisibility != ScrimController.TRANSPARENT)		\|\| state.mScrimsVisibility != ScrimController.TRANSPARENT)
	\|\| state.mBackgroundBlurRadius > 0;		\|\| state.mBackgroundBlurRadius > 0
			\|\| state.mLaunchingActivity;
	}		}

	private void applyFitsSystemWindows(State state) {		private void applyFitsSystemWindows(State state) {
	@@ -485,6 +486,11 @@ public class NotificationShadeWindowController implements Callback, Dumpable,
	apply(mCurrentState);		apply(mCurrentState);
	}		}

			void setLaunchingActivity(boolean launching) {
			mCurrentState.mLaunchingActivity = launching;
			apply(mCurrentState);
			}

	public void setScrimsVisibility(int scrimsVisibility) {		public void setScrimsVisibility(int scrimsVisibility) {
	mCurrentState.mScrimsVisibility = scrimsVisibility;		mCurrentState.mScrimsVisibility = scrimsVisibility;
	apply(mCurrentState);		apply(mCurrentState);
	@@ -645,6 +651,7 @@ public class NotificationShadeWindowController implements Callback, Dumpable,
	boolean mForceCollapsed;		boolean mForceCollapsed;
	boolean mForceDozeBrightness;		boolean mForceDozeBrightness;
	boolean mForceUserActivity;		boolean mForceUserActivity;
			boolean mLaunchingActivity;
	boolean mBackdropShowing;		boolean mBackdropShowing;
	boolean mWallpaperSupportsAmbientMode;		boolean mWallpaperSupportsAmbientMode;
	boolean mNotTouchable;		boolean mNotTouchable;

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

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,6 +93,7 @@ public class NotificationShadeWindowViewController {
	private PhoneStatusBarView mStatusBarView;		private PhoneStatusBarView mStatusBarView;
	private PhoneStatusBarTransitions mBarTransitions;		private PhoneStatusBarTransitions mBarTransitions;
	private StatusBar mService;		private StatusBar mService;
			private NotificationShadeWindowController mNotificationShadeWindowController;
	private DragDownHelper mDragDownHelper;		private DragDownHelper mDragDownHelper;
	private boolean mDoubleTapEnabled;		private boolean mDoubleTapEnabled;
	private boolean mSingleTapEnabled;		private boolean mSingleTapEnabled;
	@@ -430,10 +431,14 @@ public class NotificationShadeWindowViewController {

	public void setExpandAnimationPending(boolean pending) {		public void setExpandAnimationPending(boolean pending) {
	mExpandAnimationPending = pending;		mExpandAnimationPending = pending;
			mNotificationShadeWindowController
			.setLaunchingActivity(mExpandAnimationPending \| mExpandAnimationRunning);
	}		}

	public void setExpandAnimationRunning(boolean running) {		public void setExpandAnimationRunning(boolean running) {
	mExpandAnimationRunning = running;		mExpandAnimationRunning = running;
			mNotificationShadeWindowController
			.setLaunchingActivity(mExpandAnimationPending \| mExpandAnimationRunning);
	}		}

	public void cancelExpandHelper() {		public void cancelExpandHelper() {
	@@ -456,8 +461,9 @@ public class NotificationShadeWindowViewController {
	}		}
	}		}

	public void setService(StatusBar statusBar) {		public void setService(StatusBar statusBar, NotificationShadeWindowController controller) {
	mService = statusBar;		mService = statusBar;
			mNotificationShadeWindowController = controller;
	}		}

	@VisibleForTesting		@VisibleForTesting

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1001,7 +1001,7 @@ public class StatusBar extends SystemUI implements DemoMode,
	updateTheme();		updateTheme();

	inflateStatusBarWindow();		inflateStatusBarWindow();
	mNotificationShadeWindowViewController.setService(this);		mNotificationShadeWindowViewController.setService(this, mNotificationShadeWindowController);
	mNotificationShadeWindowView.setOnTouchListener(getStatusBarWindowTouchListener());		mNotificationShadeWindowView.setOnTouchListener(getStatusBarWindowTouchListener());

	// TODO: Deal with the ugliness that comes from having some of the statusbar broken out		// TODO: Deal with the ugliness that comes from having some of the statusbar broken out

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowViewTest.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -83,6 +83,7 @@ public class NotificationShadeWindowViewTest extends SysuiTestCase {
	@Mock private NotificationStackScrollLayout mNotificationStackScrollLayout;		@Mock private NotificationStackScrollLayout mNotificationStackScrollLayout;
	@Mock private NotificationShadeDepthController mNotificationShadeDepthController;		@Mock private NotificationShadeDepthController mNotificationShadeDepthController;
	@Mock private SuperStatusBarViewFactory mStatusBarViewFactory;		@Mock private SuperStatusBarViewFactory mStatusBarViewFactory;
			@Mock private NotificationShadeWindowController mNotificationShadeWindowController;

	@Before		@Before
	public void setUp() {		public void setUp() {
	@@ -121,7 +122,7 @@ public class NotificationShadeWindowViewTest extends SysuiTestCase {
	mNotificationPanelViewController,		mNotificationPanelViewController,
	mStatusBarViewFactory);		mStatusBarViewFactory);
	mController.setupExpandedStatusBar();		mController.setupExpandedStatusBar();
	mController.setService(mStatusBar);		mController.setService(mStatusBar, mNotificationShadeWindowController);
	mController.setDragDownHelper(mDragDownHelper);		mController.setDragDownHelper(mDragDownHelper);

	}		}