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

Merge "Don't dismiss remove work profile dialog on orientation change."

Browse Source
This commit is contained in:
Nicolas Prévot
2016-06-28 11:15:55 +00:00
committed by Android (Google) Code Review
parent c070e5e039 bdd1bf86ea
commit 7dc283b1d7
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/accounts/AccountSettings.java
View File

@@ -228,14 +228,8 @@ public class AccountSettings extends SettingsPreferenceFragment
}
if (preference == profileData.removeWorkProfilePreference) {
final int userId = profileData.userInfo.id;
UserDialogs.createRemoveDialog(getActivity(), userId,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
mUm.removeUser(userId);
}
}
).show();
RemoveUserFragment.newInstance(userId).show(getActivity().getFragmentManager(),
"removeUser");
return true;
}
if (preference == profileData.managedProfilePreference) {
@@ -621,6 +615,32 @@ public class AccountSettings extends SettingsPreferenceFragment
}
}
public static class RemoveUserFragment extends DialogFragment {
private static final String ARG_USER_ID = "userId";
static RemoveUserFragment newInstance(int userId) {
Bundle args = new Bundle();
args.putInt(ARG_USER_ID, userId);
RemoveUserFragment fragment = new RemoveUserFragment();
fragment.setArguments(args);
return fragment;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final int userId = getArguments().getInt(ARG_USER_ID);
return UserDialogs.createRemoveDialog(getActivity(), userId,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
UserManager um = (UserManager)
getActivity().getSystemService(Context.USER_SERVICE);
um.removeUser(userId);
}
});
}
}
/**
* Dialog to inform user about changing auto-sync setting
*/