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

Commit c222411b authored by Samuel Fufa's avatar Samuel Fufa Committed by Automerger Merge Worker
Browse files

Merge "Adding tracing for work profile removal" into ub-launcher3-rvc-qpr-dev am: 0cfcdc21 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12241857

Change-Id: If7e003c297d2726e1499c55ca9d9bc57d369b43b
parents 4341d784 0cfcdc21

src/com/android/launcher3/pm/UserCache.java

+5 −0
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ import android.content.Intent; 
import android.os.UserHandle;

import android.os.UserManager;

import android.util.ArrayMap;

import android.util.Log;

import android.util.LongSparseArray;



import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.MainThreadInitializedObject;

import com.android.launcher3.util.SafeCloseable;

import com.android.launcher3.util.SimpleBroadcastReceiver;
@@ -102,6 +104,9 @@ public class UserCache { 
                mUsers = null;

                mUserToSerialMap = null;

            }

            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work profile removed", new Exception());

            }

        }

    }

src/com/android/launcher3/testing/TestProtocol.java

+1 −0
Original line number Diff line number Diff line
@@ -106,4 +106,5 @@ public final class TestProtocol { 
    public static final String PAUSE_NOT_DETECTED = "b/139891609";

    public static final String OVERIEW_NOT_ALLAPPS = "b/156095088";

    public static final String NO_SWIPE_TO_HOME = "b/158017601";

    public static final String WORK_PROFILE_REMOVED = "b/159671700";

}

tests/src/com/android/launcher3/ui/WorkTabTest.java

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue; 
import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;

import android.widget.TextView;



import androidx.test.filters.LargeTest;
@@ -34,6 +35,7 @@ import com.android.launcher3.allapps.AllAppsContainerView; 
import com.android.launcher3.allapps.AllAppsPagedView;

import com.android.launcher3.allapps.WorkModeSwitch;

import com.android.launcher3.dragndrop.DragLayer;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.views.WorkEduView;



import org.junit.After;
@@ -132,6 +134,10 @@ public class WorkTabTest extends AbstractLauncherUiTest { 
                    l.getResources().getString(R.string.work_profile_edu_personal_apps));

            workEduView.findViewById(R.id.proceed).callOnClick();

        });



        executeOnLauncher(launcher -> Log.d(TestProtocol.WORK_PROFILE_REMOVED,

                "Work profile status: " + launcher.getAppsView().isPersonalTabVisible()));



        // verify work edu is seen next

        waitForLauncherCondition("Launcher did not show the next edu screen", l ->

                ((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage() == WORK_PAGE