Merge "Make status bar full screen when assist UI is present"
This commit is contained in:
committed by
Android (Google) Code Review
commit
ab864c6dd3
@@ -246,7 +246,7 @@ public class StatusBarWindowController implements Callback, Dumpable, Configurat
|
||||
private boolean isExpanded(State state) {
|
||||
return !state.forceCollapsed && (state.isKeyguardShowingAndNotOccluded()
|
||||
|| state.panelVisible || state.keyguardFadingAway || state.bouncerShowing
|
||||
|| state.headsUpShowing || state.bubblesShowing
|
||||
|| state.headsUpShowing || state.bubblesShowing || state.assistShowing
|
||||
|| state.scrimsVisibility != ScrimController.VISIBILITY_FULLY_TRANSPARENT);
|
||||
}
|
||||
|
||||
@@ -489,6 +489,21 @@ public class StatusBarWindowController implements Callback, Dumpable, Configurat
|
||||
return mCurrentState.bubblesShowing;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets whether assist UI is showing on the screen.
|
||||
*/
|
||||
public void setAssistShowing(boolean assistShowing) {
|
||||
mCurrentState.assistShowing = assistShowing;
|
||||
apply(mCurrentState);
|
||||
}
|
||||
|
||||
/**
|
||||
* The assist UI showing state for the status bar.
|
||||
*/
|
||||
public boolean getAssistShowing() {
|
||||
return mCurrentState.assistShowing;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets if there is a bubble being expanded on the screen.
|
||||
*/
|
||||
@@ -558,6 +573,7 @@ public class StatusBarWindowController implements Callback, Dumpable, Configurat
|
||||
boolean notTouchable;
|
||||
boolean bubblesShowing;
|
||||
boolean bubbleExpanded;
|
||||
boolean assistShowing;
|
||||
|
||||
/**
|
||||
* The {@link StatusBar} state from the status bar.
|
||||
|
||||
Reference in New Issue
Block a user