Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9481e97c authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Reset the layer of the nav bar when restoring it back" into sc-dev am: dfdfad1a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186139

Change-Id: I18d03a96b745e4e49d24ce20d7e51148b72418dd
parents 311bcfa1 dfdfad1a

services/core/java/com/android/server/wm/RecentsAnimationController.java

+2 −0
Original line number Diff line number Diff line
@@ -675,6 +675,8 @@ public class RecentsAnimationController implements DeathRecipient { 
        }

        final SurfaceControl.Transaction t = mDisplayContent.getPendingTransaction();

        final WindowContainer parent = navToken.getParent();

        t.setLayer(navToken.getSurfaceControl(), navToken.getLastLayer());



        if (animate) {

            final NavBarFadeAnimationController navBarFadeAnimationController =

                    mDisplayContent.getDisplayPolicy().getNavBarFadeAnimationController();

services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java

+6 −0
Original line number Diff line number Diff line
@@ -518,6 +518,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
        verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled(

                mDefaultDisplay.mDisplayId, false);

        verify(transaction).reparent(navToken.getSurfaceControl(), activity.getSurfaceControl());

        verify(transaction).setLayer(navToken.getSurfaceControl(), Integer.MAX_VALUE);



        final WindowContainer parent = navToken.getParent();

        final NavBarFadeAnimationController navBarFadeAnimationController =
@@ -526,6 +527,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
        mController.cleanupAnimation(REORDER_MOVE_TO_TOP);

        verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled(

                mDefaultDisplay.mDisplayId, true);

        verify(transaction).setLayer(navToken.getSurfaceControl(), 0);

        verify(transaction).reparent(navToken.getSurfaceControl(), parent.getSurfaceControl());

        verify(navBarFadeAnimationController).fadeWindowToken(true);

    }
@@ -543,6 +545,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
        verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled(

                mDefaultDisplay.mDisplayId, false);

        verify(transaction).reparent(navToken.getSurfaceControl(), activity.getSurfaceControl());

        verify(transaction).setLayer(navToken.getSurfaceControl(), Integer.MAX_VALUE);



        final WindowContainer parent = navToken.getParent();

        final NavBarFadeAnimationController navBarFadeAnimationController =
@@ -551,6 +554,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
        mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION);

        verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled(

                mDefaultDisplay.mDisplayId, true);

        verify(transaction).setLayer(navToken.getSurfaceControl(), 0);

        verify(transaction).reparent(navToken.getSurfaceControl(), parent.getSurfaceControl());

        verify(navBarFadeAnimationController, never()).fadeWindowToken(anyBoolean());

    }
@@ -579,6 +583,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
        verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled(

                mDefaultDisplay.mDisplayId, false);

        verify(transaction).reparent(navToken.getSurfaceControl(), activity.getSurfaceControl());

        verify(transaction).setLayer(navToken.getSurfaceControl(), Integer.MAX_VALUE);



        final WindowContainer parent = navToken.getParent();

        final NavBarFadeAnimationController navBarFadeAnimationController =
@@ -591,6 +596,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
        mController.cleanupAnimation(REORDER_MOVE_TO_TOP);

        verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled(

                mDefaultDisplay.mDisplayId, true);

        verify(transaction).setLayer(navToken.getSurfaceControl(), 0);

        verify(mockController).setOnShowRunnable(any());

        verify(transaction, times(0)).reparent(navToken.getSurfaceControl(),

                parent.getSurfaceControl());