openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Change-Id: I03558944743b4672b88db0094fab8f9af65d9a55
This commit is contained in:
Samuel Fufa 2020-07-28 18:37:18 +00:00 committed by Automerger Merge Worker
parent 36a16cd43a c222411b30
commit 884fc46942
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/launcher3/pm/UserCache.java
View File

@ -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());
}
}
}

1
src/com/android/launcher3/testing/TestProtocol.java
View File

@ -107,4 +107,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";
}

6
tests/src/com/android/launcher3/ui/WorkTabTest.java
View File

@ -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