Merge "Disable AppCopyFragment"
This commit is contained in:
@@ -74,6 +74,9 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
|
|||||||
private static final int DIALOG_SETUP_USER = 4;
|
private static final int DIALOG_SETUP_USER = 4;
|
||||||
private static final int DIALOG_CONFIRM_RESET_GUEST = 5;
|
private static final int DIALOG_CONFIRM_RESET_GUEST = 5;
|
||||||
|
|
||||||
|
/** Whether to enable the app_copying fragment. */
|
||||||
|
private static final boolean SHOW_APP_COPYING_PREF = false;
|
||||||
|
|
||||||
private UserManager mUserManager;
|
private UserManager mUserManager;
|
||||||
private UserCapabilities mUserCaps;
|
private UserCapabilities mUserCaps;
|
||||||
private boolean mGuestUserAutoCreated;
|
private boolean mGuestUserAutoCreated;
|
||||||
@@ -298,6 +301,9 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
|
|||||||
if (mGuestUserAutoCreated) {
|
if (mGuestUserAutoCreated) {
|
||||||
mRemoveUserPref.setEnabled((mUserInfo.flags & UserInfo.FLAG_INITIALIZED) != 0);
|
mRemoveUserPref.setEnabled((mUserInfo.flags & UserInfo.FLAG_INITIALIZED) != 0);
|
||||||
}
|
}
|
||||||
|
if (!SHOW_APP_COPYING_PREF) {
|
||||||
|
removePreference(KEY_APP_COPYING);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
mPhonePref.setChecked(!mUserManager.hasUserRestriction(
|
mPhonePref.setChecked(!mUserManager.hasUserRestriction(
|
||||||
UserManager.DISALLOW_OUTGOING_CALLS, new UserHandle(userId)));
|
UserManager.DISALLOW_OUTGOING_CALLS, new UserHandle(userId)));
|
||||||
@@ -410,6 +416,9 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void openAppCopyingScreen() {
|
private void openAppCopyingScreen() {
|
||||||
|
if (!SHOW_APP_COPYING_PREF) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
final Bundle extras = new Bundle();
|
final Bundle extras = new Bundle();
|
||||||
extras.putInt(AppRestrictionsFragment.EXTRA_USER_ID, mUserInfo.id);
|
extras.putInt(AppRestrictionsFragment.EXTRA_USER_ID, mUserInfo.id);
|
||||||
new SubSettingLauncher(getContext())
|
new SubSettingLauncher(getContext())
|
||||||
|
Reference in New Issue
Block a user