PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Improve multi user settings screen"

Browse Source 
This reverts commit d19dc306dd.

Reason for revert: this CL made Settings the test cases called shadowUserManager.hasUserRestriction()
https://sponge.corp.google.com/target?show=FAILED&sortBy=STATUS&id=07150153-ccb7-4215-a9f8-eed31e44c66f&target=RunSettingsRoboTests1-test-output

Bug: 142798722

Change-Id: I3937a07ee35a472cadd6db8cd0177e08e63516a4
This commit is contained in:
Edgar Wang
2020-05-07 08:44:12 +00:00
parent d19dc306dd
commit fff8c56de2
16 changed files with 507 additions and 1462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.testutils.shadow;
import android.annotation.UserIdInt;
import android.content.pm.UserInfo;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.UserManager.EnforcingUser;
@@ -44,18 +43,13 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
private static boolean sIsSupportsMultipleUsers;
private final List<String> mBaseRestrictions = new ArrayList<>();
private final List<String> mUserRestrictions = new ArrayList<>();
private final List<String> mGuestRestrictions = new ArrayList<>();
private final List<String> mRestrictions = new ArrayList<>();
private final Map<String, List<EnforcingUser>> mRestrictionSources = new HashMap<>();
private final List<UserInfo> mUserProfileInfos = new ArrayList<>();
private final Set<Integer> mManagedProfiles = new HashSet<>();
private boolean mIsQuietModeEnabled = false;
private int[] profileIdsForUser = new int[0];
private boolean mUserSwitchEnabled;
private @UserManager.UserSwitchabilityResult int mSwitchabilityStatus =
UserManager.SWITCHABILITY_STATUS_OK;
private final Map<Integer, Integer> mSameProfileGroupIds = Maps.newHashMap();
public void addProfile(UserInfo userInfo) {
@@ -88,32 +82,11 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
@Implementation
protected boolean hasBaseUserRestriction(String restrictionKey, UserHandle userHandle) {
return mBaseRestrictions.contains(restrictionKey);
return mRestrictions.contains(restrictionKey);
}
public void addBaseUserRestriction(String restriction) {
mBaseRestrictions.add(restriction);
}
@Implementation
protected boolean hasUserRestriction(@UserManager.UserRestrictionKey String restrictionKey,
UserHandle userHandle) {
return mUserRestrictions.contains(restrictionKey);
}
public void addUserRestriction(String restriction) {
mUserRestrictions.add(restriction);
}
@Implementation
protected Bundle getDefaultGuestRestrictions() {
Bundle bundle = new Bundle();
mGuestRestrictions.forEach(restriction -> bundle.putBoolean(restriction, true));
return bundle;
}
public void addGuestUserRestriction(String restriction) {
mGuestRestrictions.add(restriction);
mRestrictions.add(restriction);
}
public static ShadowUserManager getShadow() {
@@ -193,21 +166,4 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
public void setSupportsMultipleUsers(boolean supports) {
sIsSupportsMultipleUsers = supports;
}
@Implementation
protected UserInfo getUserInfo(@UserIdInt int userId) {
return mUserProfileInfos.stream()
.filter(userInfo -> userInfo.id == userId)
.findFirst()
.orElse(super.getUserInfo(userId));
}
@Implementation
protected @UserManager.UserSwitchabilityResult int getUserSwitchability() {
return mSwitchabilityStatus;
}
public void setSwitchabilityStatus(@UserManager.UserSwitchabilityResult int newStatus) {
mSwitchabilityStatus = newStatus;
}
}