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

Commit 680d09ed authored by Shawn Lin's avatar Shawn Lin Committed by Android (Google) Code Review
Browse files

Merge "Reset the flag of attaching nav to app to prevent flickering" into sc-dev

parents 3f0812ea b672d860

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

+2 −0
Original line number Diff line number Diff line
@@ -658,6 +658,8 @@ public class RecentsAnimationController implements DeathRecipient { 
        if (!mNavigationBarAttachedToApp) {

            return;

        }

        mNavigationBarAttachedToApp = false;



        if (mStatusBar != null) {

            mStatusBar.setNavigationBarLumaSamplingEnabled(mDisplayId, true);

        }

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

+8 −0
Original line number Diff line number Diff line
@@ -519,12 +519,14 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
                eq(mDefaultDisplay.mDisplayId), eq(false));

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

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

        assertTrue(mController.isNavigationBarAttachedToApp());



        mController.cleanupAnimation(REORDER_MOVE_TO_TOP);

        verify(mController).restoreNavigationBarFromApp(eq(true));

        verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled(

                eq(mDefaultDisplay.mDisplayId), eq(true));

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

        assertFalse(mController.isNavigationBarAttachedToApp());

    }



    @Test
@@ -541,6 +543,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
                eq(mDefaultDisplay.mDisplayId), eq(false));

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

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

        assertTrue(mController.isNavigationBarAttachedToApp());



        final WindowContainer parent = navToken.getParent();
@@ -550,6 +553,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
                eq(mDefaultDisplay.mDisplayId), eq(true));

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

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

        assertFalse(mController.isNavigationBarAttachedToApp());

    }



    @Test
@@ -566,6 +570,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
                eq(mDefaultDisplay.mDisplayId), eq(false));

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

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

        assertTrue(mController.isNavigationBarAttachedToApp());



        final WindowContainer parent = navToken.getParent();
@@ -575,6 +580,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
        verify(mController.mStatusBar).setNavigationBarLumaSamplingEnabled(

                eq(mDefaultDisplay.mDisplayId), eq(true));

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

        assertFalse(mController.isNavigationBarAttachedToApp());

    }



    @Test
@@ -607,6 +613,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
                eq(mDefaultDisplay.mDisplayId), eq(false));

        verify(navWindow).setSurfaceTranslationY(-secondary.getBounds().top);

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

        assertTrue(mController.isNavigationBarAttachedToApp());

        reset(navWindow);



        mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION);
@@ -616,6 +623,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
        verify(navWindow).setSurfaceTranslationY(0);

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

        verify(mController).restoreNavigationBarFromApp(eq(false));

        assertFalse(mController.isNavigationBarAttachedToApp());

    }



    @Test