Loading packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java +11 −0 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.internal.logging.MetricsLogger; Loading @@ -43,6 +44,9 @@ import com.android.systemui.statusbar.policy.BaseUserSwitcherAdapter; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.user.data.source.UserRecord; import java.util.List; import java.util.stream.Collectors; import javax.inject.Inject; /** Loading Loading @@ -83,6 +87,13 @@ public class UserDetailView extends PseudoGridView { private final FalsingManager mFalsingManager; private @Nullable UserSwitchDialogController.DialogShower mDialogShower; @NonNull @Override protected List<UserRecord> getUsers() { return super.getUsers().stream().filter( userRecord -> !userRecord.isManageUsers).collect(Collectors.toList()); } @Inject public Adapter(Context context, UserSwitcherController controller, UiEventLogger uiEventLogger, FalsingManager falsingManager) { Loading packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseUserSwitcherAdapter.kt +1 −5 Original line number Diff line number Diff line Loading @@ -43,11 +43,7 @@ protected constructor( } override fun getCount(): Int { return if (controller.isKeyguardShowing) { users.count { !it.isRestricted } } else { users.size } return users.size } override fun getItem(position: Int): UserRecord { Loading packages/SystemUI/tests/src/com/android/systemui/qs/tiles/UserDetailViewAdapterTest.kt +6 −0 Original line number Diff line number Diff line Loading @@ -33,6 +33,7 @@ import com.android.systemui.qs.QSUserSwitcherEvent import com.android.systemui.statusbar.policy.UserSwitcherController import com.android.systemui.user.data.source.UserRecord import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Before import org.junit.Test import org.junit.runner.RunWith Loading Loading @@ -139,6 +140,11 @@ class UserDetailViewAdapterTest : SysuiTestCase() { clickableTest(false, false, mUserDetailItemView, true) } @Test fun testManageUsersIsNotAvailable() { assertNull(adapter.users.find { it.isManageUsers }) } private fun createUserRecord(current: Boolean, guest: Boolean) = UserRecord( UserInfo(0 /* id */, "name", 0 /* flags */), Loading Loading
packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java +11 −0 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.internal.logging.MetricsLogger; Loading @@ -43,6 +44,9 @@ import com.android.systemui.statusbar.policy.BaseUserSwitcherAdapter; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.user.data.source.UserRecord; import java.util.List; import java.util.stream.Collectors; import javax.inject.Inject; /** Loading Loading @@ -83,6 +87,13 @@ public class UserDetailView extends PseudoGridView { private final FalsingManager mFalsingManager; private @Nullable UserSwitchDialogController.DialogShower mDialogShower; @NonNull @Override protected List<UserRecord> getUsers() { return super.getUsers().stream().filter( userRecord -> !userRecord.isManageUsers).collect(Collectors.toList()); } @Inject public Adapter(Context context, UserSwitcherController controller, UiEventLogger uiEventLogger, FalsingManager falsingManager) { Loading
packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseUserSwitcherAdapter.kt +1 −5 Original line number Diff line number Diff line Loading @@ -43,11 +43,7 @@ protected constructor( } override fun getCount(): Int { return if (controller.isKeyguardShowing) { users.count { !it.isRestricted } } else { users.size } return users.size } override fun getItem(position: Int): UserRecord { Loading
packages/SystemUI/tests/src/com/android/systemui/qs/tiles/UserDetailViewAdapterTest.kt +6 −0 Original line number Diff line number Diff line Loading @@ -33,6 +33,7 @@ import com.android.systemui.qs.QSUserSwitcherEvent import com.android.systemui.statusbar.policy.UserSwitcherController import com.android.systemui.user.data.source.UserRecord import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Before import org.junit.Test import org.junit.runner.RunWith Loading Loading @@ -139,6 +140,11 @@ class UserDetailViewAdapterTest : SysuiTestCase() { clickableTest(false, false, mUserDetailItemView, true) } @Test fun testManageUsersIsNotAvailable() { assertNull(adapter.users.find { it.isManageUsers }) } private fun createUserRecord(current: Boolean, guest: Boolean) = UserRecord( UserInfo(0 /* id */, "name", 0 /* flags */), Loading