Merge "Add support for launching user edit dialog"
This commit is contained in:
@@ -172,6 +172,9 @@ public class UserSettings extends SettingsPreferenceFragment
|
|||||||
private static final String KEY_TITLE = "title";
|
private static final String KEY_TITLE = "title";
|
||||||
private static final String KEY_SUMMARY = "summary";
|
private static final String KEY_SUMMARY = "summary";
|
||||||
|
|
||||||
|
private static final String EXTRA_OPEN_DIALOG_USER_PROFILE_EDITOR =
|
||||||
|
"EXTRA_OPEN_DIALOG_USER_PROFILE_EDITOR";
|
||||||
|
|
||||||
static {
|
static {
|
||||||
USER_REMOVED_INTENT_FILTER = new IntentFilter(Intent.ACTION_USER_REMOVED);
|
USER_REMOVED_INTENT_FILTER = new IntentFilter(Intent.ACTION_USER_REMOVED);
|
||||||
USER_REMOVED_INTENT_FILTER.addAction(Intent.ACTION_USER_INFO_CHANGED);
|
USER_REMOVED_INTENT_FILTER.addAction(Intent.ACTION_USER_INFO_CHANGED);
|
||||||
@@ -283,6 +286,12 @@ public class UserSettings extends SettingsPreferenceFragment
|
|||||||
mSwitchBarController = new MultiUserSwitchBarController(activity,
|
mSwitchBarController = new MultiUserSwitchBarController(activity,
|
||||||
new MainSwitchBarController(switchBar), this /* listener */);
|
new MainSwitchBarController(switchBar), this /* listener */);
|
||||||
getSettingsLifecycle().addObserver(mSwitchBarController);
|
getSettingsLifecycle().addObserver(mSwitchBarController);
|
||||||
|
|
||||||
|
boolean openUserEditDialog = getIntent().getBooleanExtra(
|
||||||
|
EXTRA_OPEN_DIALOG_USER_PROFILE_EDITOR, false);
|
||||||
|
if (switchBar.isChecked() && openUserEditDialog) {
|
||||||
|
showDialog(DIALOG_USER_PROFILE_EDITOR);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Reference in New Issue
Block a user