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

Merge "Unminimizing after toggle screen on/off shows docked app correctly (1/2)"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-24 05:20:56 +00:00
committed by Android (Google) Code Review
parent 08d3cdbe48 8e265527f9
commit c0aa433922
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/DockedStackDividerController.java
View File

@@ -540,12 +540,14 @@ public class DockedStackDividerController implements DimLayerUser {
checkMinimizeChanged(true /* animate */);
// We were minimized, and now we are still minimized, but somebody is trying to launch an
// app in docked stack, better show recent apps so we actually get unminimized! This catches
// app in docked stack, better show recent apps so we actually get unminimized! However do
// not do this if keyguard is dismissed such as when the device is unlocking. This catches
// any case that was missed in ActivityStarter.postStartActivityUncheckedProcessing because
// we couldn't retrace the launch of the app in the docked stack to the launch from
// homescreen.
if (wasMinimized && mMinimizedDock && containsAppInDockedStack(openingApps)
&& appTransition != TRANSIT_NONE) {
&& appTransition != TRANSIT_NONE &&
!AppTransition.isKeyguardGoingAwayTransit(appTransition)) {
mService.showRecentApps(true /* fromHome */);
}
}
@@ -579,6 +581,12 @@ public class DockedStackDividerController implements DimLayerUser {
if (homeTask == null || !isWithinDisplay(homeTask)) {
return;
}
// Do not minimize when dock is already minimized while keyguard is showing and not
// occluded such as unlocking the screen
if (mMinimizedDock && mService.mPolicy.isKeyguardShowingAndNotOccluded()) {
return;
}
final TaskStack fullscreenStack =
mDisplayContent.getStackById(FULLSCREEN_WORKSPACE_STACK_ID);
final boolean homeVisible = homeTask.getTopVisibleAppToken() != null;