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

Commit eefe8b0e authored by Graciela Putri's avatar Graciela Putri Committed by Android (Google) Code Review
Browse files

Merge "Rename to setTopActivityOrganizedTask" into main

parents b450d0b5 a022e0de

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ class AppCompatActivityRobot { 
        mDisplayContent.setIgnoreOrientationRequest(enabled);

        mDisplayContent.setIgnoreOrientationRequest(enabled);

    }

    }





    void setTopOrganizedTaskAsTopTask() {

    void setTopActivityOrganizedTask() {

        doReturn(mTaskStack.top()).when(mActivityStack.top()).getOrganizedTask();

        doReturn(mTaskStack.top()).when(mActivityStack.top()).getOrganizedTask();

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -150,7 +150,7 @@ public class AppCompatUtilsTest extends WindowTestsBase { 
            robot.applyOnActivity((a) -> {

            robot.applyOnActivity((a) -> {

                a.createActivityWithComponentInNewTask();

                a.createActivityWithComponentInNewTask();

                a.setIgnoreOrientationRequest(true);

                a.setIgnoreOrientationRequest(true);

                a.setTopOrganizedTaskAsTopTask();

                a.setTopActivityOrganizedTask();

                a.setTopActivityInSizeCompatMode(true);

                a.setTopActivityInSizeCompatMode(true);

                a.setTopActivityVisible(true);

                a.setTopActivityVisible(true);

            });

            });