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

Merge "Revert "Fix missing animation when launch activity from notification."" into rvc-dev

Browse Source
This commit is contained in:
Tracy Zhou
2020-05-14 01:56:23 +00:00
committed by Android (Google) Code Review
parent 7121bc89c8 fe40c85543
commit a408cd135a
4 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -321,8 +321,7 @@ 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) {
@@ -486,11 +485,6 @@ 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);
@@ -651,7 +645,6 @@ 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;

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

@@ -93,7 +93,6 @@ 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;
@@ -431,14 +430,10 @@ 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() {
@@ -461,9 +456,8 @@ public class NotificationShadeWindowViewController {
} }
} }
public void setService(StatusBar statusBar, NotificationShadeWindowController controller) { public void setService(StatusBar statusBar) {
mService = statusBar; mService = statusBar;
mNotificationShadeWindowController = controller;
} }
@VisibleForTesting @VisibleForTesting

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

@@ -1001,7 +1001,7 @@ public class StatusBar extends SystemUI implements DemoMode,
updateTheme(); updateTheme();
inflateStatusBarWindow(); inflateStatusBarWindow();
mNotificationShadeWindowViewController.setService(this, mNotificationShadeWindowController); mNotificationShadeWindowViewController.setService(this);
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

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

@@ -83,7 +83,6 @@ 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() {
@@ -122,7 +121,7 @@ public class NotificationShadeWindowViewTest extends SysuiTestCase {
mNotificationPanelViewController, mNotificationPanelViewController,
mStatusBarViewFactory); mStatusBarViewFactory);
mController.setupExpandedStatusBar(); mController.setupExpandedStatusBar();
mController.setService(mStatusBar, mNotificationShadeWindowController); mController.setService(mStatusBar);
mController.setDragDownHelper(mDragDownHelper); mController.setDragDownHelper(mDragDownHelper);
} }