Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0

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

Change-Id: I71d0c09c5c1419f48bd3dd754eeaafa1acbf17f7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java

@@ -23,21 +23,29 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.content.pm.UserInfo;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.widget.TextView;
 
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
 import com.android.settingslib.drawer.ActivityTile;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.Tile;
 
+import com.google.android.collect.Lists;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
 import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
@@ -46,8 +54,9 @@ public class ProfileSelectDialogTest {
     private static final UserHandle NORMAL_USER = new UserHandle(1111);
     private static final UserHandle REMOVED_USER = new UserHandle(2222);
 
-    @Mock
-    private Context mContext;
+    @Spy
+    private Context mContext = ApplicationProvider.getApplicationContext();
+
     @Mock
     private UserManager mUserManager;
 
@@ -91,4 +100,18 @@ public class ProfileSelectDialogTest {
         verify(mUserManager, times(1)).getUserInfo(NORMAL_USER.getIdentifier());
         verify(mUserManager, times(2)).getUserInfo(REMOVED_USER.getIdentifier());
     }
+
+    @Test
+    public void createDialog_showsCorrectTitle() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+
+        Dialog dialog = ProfileSelectDialog.createDialog(mContext, Lists.newArrayList(NORMAL_USER),
+                (position) -> {
+                });
+        dialog.show();
+
+        TextView titleView = dialog.findViewById(R.id.topPanel).findViewById(android.R.id.title);
+        assertThat(titleView.getText().toString()).isEqualTo(
+                mContext.getText(com.android.settingslib.R.string.choose_profile).toString());
+    }
 }

tests/robotests/src/com/android/settings/dashboard/profileselector/UserAdapterTest.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dashboard.profileselector;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.internal.widget.RecyclerView;
+import com.android.settingslib.R;
+
+import com.google.android.collect.Lists;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.ArrayList;
+
+@RunWith(RobolectricTestRunner.class)
+public class UserAdapterTest {
+    @Rule
+    public MockitoRule mRule = MockitoJUnit.rule();
+
+    private final int mPersonalUserId = UserHandle.myUserId();
+    private static final int WORK_USER_ID = 1;
+
+    @Mock
+    private UserManager mUserManager;
+
+    @Mock
+    private UserInfo mPersonalUserInfo;
+
+    @Mock
+    private UserInfo mWorkUserInfo;
+
+    @Mock
+    private UserAdapter.OnClickListener mOnClickListener;
+
+    @Spy
+    private Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Before
+    public void setUp() {
+        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
+        when(mUserManager.getUserInfo(mPersonalUserId)).thenReturn(mPersonalUserInfo);
+        when(mUserManager.getUserInfo(WORK_USER_ID)).thenReturn(mWorkUserInfo);
+    }
+
+    @Test
+    public void createUserSpinnerAdapter_singleProfile_returnsNull() {
+        when(mUserManager.getUserProfiles()).thenReturn(
+                Lists.newArrayList(UserHandle.of(mPersonalUserId)));
+
+        UserAdapter userSpinnerAdapter =
+                UserAdapter.createUserSpinnerAdapter(mUserManager, mContext);
+
+        assertThat(userSpinnerAdapter).isNull();
+    }
+
+    @Test
+    public void createUserSpinnerAdapter_twoProfiles_succeed() {
+        when(mUserManager.getUserProfiles()).thenReturn(
+                Lists.newArrayList(UserHandle.of(mPersonalUserId), UserHandle.of(WORK_USER_ID)));
+
+        UserAdapter userSpinnerAdapter =
+                UserAdapter.createUserSpinnerAdapter(mUserManager, mContext);
+
+        assertThat(userSpinnerAdapter.getCount()).isEqualTo(2);
+        assertThat(userSpinnerAdapter.getUserHandle(0).getIdentifier()).isEqualTo(mPersonalUserId);
+        assertThat(userSpinnerAdapter.getUserHandle(1).getIdentifier()).isEqualTo(WORK_USER_ID);
+    }
+
+    @Test
+    public void createUserRecycleViewAdapter_canBindViewHolderCorrectly() {
+        ArrayList<UserHandle> userHandles =
+                Lists.newArrayList(UserHandle.of(mPersonalUserId), UserHandle.of(WORK_USER_ID));
+        FrameLayout parent = new FrameLayout(mContext);
+
+        RecyclerView.Adapter<UserAdapter.ViewHolder> adapter =
+                UserAdapter.createUserRecycleViewAdapter(mContext, userHandles, mOnClickListener);
+        UserAdapter.ViewHolder holder = adapter.createViewHolder(parent, 0);
+        adapter.bindViewHolder(holder, 0);
+        holder.itemView.findViewById(R.id.button).performClick();
+
+        assertThat(adapter.getItemCount()).isEqualTo(2);
+        TextView textView = holder.itemView.findViewById(android.R.id.title);
+        assertThat(textView.getText().toString()).isEqualTo("Personal");
+        verify(mOnClickListener).onClick(anyInt());
+    }
+}