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

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

Browse Source 
When turning screen off when in minimized mode with resizable launcher,
then turning screen back on and unminimizing, it would have the
incorrect position of the divider from the started split position and
the docked app would have the wrong task bounds compared to its stack
bounds (so the docked app looks clipped). Block toggling minimized state
when screen turns off when being minimized will fix this.

Fixes: 34937502, 35388501
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
CtsServicesHostTestCases
android.server.cts.ActivityManagerDockedStackTests
Change-Id: I255a56d6b4041586f9125ee39f6e75a3c61f544f
This commit is contained in:
Matthew Ng
2017-02-13 11:09:37 -08:00
parent dbbebbc3fe
commit 8e265527f9
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;