Adding Prework for Private Space integration in Launcher

This Cl adds the following:
1. Fixes for Quite Mode check maintained by Launcher
2. Addition of new Quite Mode broadcasts
3. Fixes for determining work profile user correctly.

Flag: ACONFIG com.android.launcher3.Flags.enable_private_space DEVELOPMENT
Bug: 289223923
Test: Ran Launcher3 tests
Change-Id: I5f6158b213723339e70ff99e66c5f439f5879e12
This commit is contained in:
Himanshu Gupta
2023-10-12 16:53:00 +01:00
parent 402ca3e3e5
commit 9aab4d4603
13 changed files with 223 additions and 29 deletions

View File

@@ -18,14 +18,19 @@ package com.android.launcher3.ui;
import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY;
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.os.Process;
import android.os.UserHandle;
import android.os.UserManager;
import android.platform.test.flag.junit.SetFlagsRule;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@@ -34,15 +39,20 @@ import com.android.launcher3.allapps.ActivityAllAppsContainerView;
import com.android.launcher3.allapps.WorkProfileManager;
import com.android.launcher3.logging.StatsLogManager;
import com.android.launcher3.model.data.AppInfo;
import com.android.launcher3.pm.UserCache;
import com.android.launcher3.util.ActivityContextWrapper;
import com.android.launcher3.util.UserIconInfo;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import java.util.Arrays;
@SmallTest
@RunWith(AndroidJUnit4.class)
public class ActivityAllAppsContainerViewTest {
@@ -50,19 +60,38 @@ public class ActivityAllAppsContainerViewTest {
private static final UserHandle WORK_HANDLE = new UserHandle(13);
@Mock
private StatsLogManager mStatsLogManager;
@Mock
private UserCache mUserCache;
@Mock
private UserManager mUserManager;
private AppInfo[] mWorkAppInfo;
private ActivityAllAppsContainerView<?> mActivityAllAppsContainerView;
private WorkProfileManager mWorkManager;
private Context mContext;
@Rule public final SetFlagsRule mSetFlagsRule = getFlagsRule();
private SetFlagsRule getFlagsRule() {
SetFlagsRule flagsRule = new SetFlagsRule();
flagsRule.initAllFlagsToReleaseConfigDefault();
return flagsRule;
}
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
Context context = new ActivityContextWrapper(getApplicationContext());
mActivityAllAppsContainerView = new ActivityAllAppsContainerView(context);
mWorkManager = new WorkProfileManager(context.getSystemService(UserManager.class),
mActivityAllAppsContainerView, mStatsLogManager);
mContext = new ActivityContextWrapper(getApplicationContext());
mActivityAllAppsContainerView = new ActivityAllAppsContainerView(mContext);
when(mUserCache.getUserProfiles())
.thenReturn(Arrays.asList(Process.myUserHandle(), WORK_HANDLE));
when(mUserCache.getUserInfo(Process.myUserHandle()))
.thenReturn(new UserIconInfo(Process.myUserHandle(), 0));
when(mUserCache.getUserInfo(WORK_HANDLE))
.thenReturn(new UserIconInfo(WORK_HANDLE, 1));
mWorkManager = new WorkProfileManager(mUserManager, mActivityAllAppsContainerView,
mStatsLogManager, mUserCache);
mActivityAllAppsContainerView.setWorkManager(mWorkManager);
ComponentName componentName = new ComponentName(context,
ComponentName componentName = new ComponentName(mContext,
"com.android.launcher3.tests.Activity" + "Gmail");
AppInfo gmailWorkAppInfo = new AppInfo(componentName, "Gmail", WORK_HANDLE, new Intent());
mWorkAppInfo = new AppInfo[]{gmailWorkAppInfo};
@@ -85,4 +114,22 @@ public class ActivityAllAppsContainerViewTest {
assertThat(mActivityAllAppsContainerView.shouldShowTabs()).isEqualTo(true);
}
@Test
public void testWorkProfileEnabled_requestQuietModeCalledCorrectly() throws Exception {
/* Setup */
when(mUserManager.requestQuietModeEnabled(false, WORK_HANDLE))
.thenReturn(true);
/* Execution */
mWorkManager.setWorkProfileEnabled(true);
/* Assertion */
awaitTasksCompleted();
Mockito.verify(mUserManager).requestQuietModeEnabled(false, WORK_HANDLE);
}
private static void awaitTasksCompleted() throws Exception {
UI_HELPER_EXECUTOR.submit(() -> null).get();
}
}