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

Merge "Separate out sysui state updating" into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-31 19:39:36 +00:00
committed by Android (Google) Code Review
parent 491e0ce574 56a667b218
commit c7ce38df0f
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java
View File

@@ -546,7 +546,8 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
navBarFragment.updateSystemUiStateFlags(-1); navBarFragment.updateSystemUiStateFlags(-1);
} }
if (navBarView != null) { if (navBarView != null) {
navBarView.updateSystemUiStateFlags(); navBarView.updatePanelSystemUiStateFlags();
navBarView.updateDisabledSystemUiStateFlags();
} }
if (mStatusBarWinController != null) { if (mStatusBarWinController != null) {
mStatusBarWinController.notifyStateChangedCallbacks(); mStatusBarWinController.notifyStateChangedCallbacks();

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

@@ -323,7 +323,7 @@ public class NavigationBarView extends FrameLayout implements
public void setComponents(NotificationPanelView panel, AssistManager assistManager) { public void setComponents(NotificationPanelView panel, AssistManager assistManager) {
mPanelView = panel; mPanelView = panel;
updateSystemUiStateFlags(); updatePanelSystemUiStateFlags();
} }
@Override @Override
@@ -587,7 +587,7 @@ public class NavigationBarView extends FrameLayout implements
updateNavButtonIcons(); updateNavButtonIcons();
updateSlippery(); updateSlippery();
setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled()); setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());
updateSystemUiStateFlags(); updateDisabledSystemUiStateFlags();
} }
public void updateNavButtonIcons() { public void updateNavButtonIcons() {
@@ -710,10 +710,10 @@ public class NavigationBarView extends FrameLayout implements
public void onStatusBarPanelStateChanged() { public void onStatusBarPanelStateChanged() {
updateSlippery(); updateSlippery();
updateSystemUiStateFlags(); updatePanelSystemUiStateFlags();
} }
public void updateSystemUiStateFlags() { public void updateDisabledSystemUiStateFlags() {
int displayId = mContext.getDisplayId(); int displayId = mContext.getDisplayId();
mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_SCREEN_PINNING, mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_SCREEN_PINNING,
ActivityManagerWrapper.getInstance().isScreenPinningActive(), displayId); ActivityManagerWrapper.getInstance().isScreenPinningActive(), displayId);
@@ -723,6 +723,10 @@ public class NavigationBarView extends FrameLayout implements
(mDisabledFlags & View.STATUS_BAR_DISABLE_HOME) != 0, displayId); (mDisabledFlags & View.STATUS_BAR_DISABLE_HOME) != 0, displayId);
mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_SEARCH_DISABLED, mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_SEARCH_DISABLED,
(mDisabledFlags & View.STATUS_BAR_DISABLE_SEARCH) != 0, displayId); (mDisabledFlags & View.STATUS_BAR_DISABLE_SEARCH) != 0, displayId);
}
public void updatePanelSystemUiStateFlags() {
int displayId = mContext.getDisplayId();
if (mPanelView != null) { if (mPanelView != null) {
mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED, mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,
mPanelView.isFullyExpanded() && !mPanelView.isInSettings(), displayId); mPanelView.isFullyExpanded() && !mPanelView.isInSettings(), displayId);