OSDN Git Service

Ensure consistent stack behind PIP when going to/from fullscreen.
authorWinson Chung <winsonc@google.com>
Fri, 11 Nov 2016 01:40:34 +0000 (17:40 -0800)
committerWinson Chung <winsonc@google.com>
Fri, 11 Nov 2016 19:47:32 +0000 (19:47 +0000)
commit0c1ca09dbb0fc6f0acd6cc529e25c01a85ff63c5
treebda53c2b93cadc25ec60fd737e2e23938077bf3d
parentfcb261cd07259daaf21f2eb7340a7d74308887ac
Ensure consistent stack behind PIP when going to/from fullscreen.

- When a fullscreen activity enters PIP, we were previously always
  bringing the home stack forward due to the return type being set
  to HOME_ACTIVITY_TYPE, causing the home screen to be visible if
  expanding PIP over a fullscreen activity and going back into PIP
  immediately.  This CL instead updates the return-to type to
  reflect the stack that was currently open before the pinned task
  was made fullscreen again to ensure that it is consistent when
  entering PIP again.

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPipUnPipOverHome
Test: #testPipUnPipOverApp

Change-Id: Id5dd7db1f5a8040ff21190cc347eb6aae5893006
services/core/java/com/android/server/am/ActivityStackSupervisor.java