Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev
This commit is contained in:
TreeHugger Robot
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
9e1e5ddb72
@@ -46,30 +46,25 @@ import java.util.Objects;
|
||||
/**
|
||||
* Helper class for {@link ActionDisabledByAdminDialog} which sets up the dialog.
|
||||
*/
|
||||
public class ActionDisabledByAdminDialogHelper {
|
||||
public final class ActionDisabledByAdminDialogHelper {
|
||||
|
||||
private static final String TAG = ActionDisabledByAdminDialogHelper.class.getName();
|
||||
@VisibleForTesting EnforcedAdmin mEnforcedAdmin;
|
||||
private ViewGroup mDialogView;
|
||||
private String mRestriction = null;
|
||||
private final Activity mActivity;
|
||||
private String mRestriction;
|
||||
private final ActionDisabledByAdminController mActionDisabledByAdminController;
|
||||
private final Activity mActivity;
|
||||
|
||||
public ActionDisabledByAdminDialogHelper(Activity activity) {
|
||||
mActivity = activity;
|
||||
mActionDisabledByAdminController =
|
||||
ActionDisabledByAdminControllerFactory.createInstance(
|
||||
mActivity.getSystemService(DevicePolicyManager.class),
|
||||
new ActionDisabledLearnMoreButtonLauncherImpl(),
|
||||
new DeviceAdminStringProviderImpl(mActivity));
|
||||
mDialogView = (ViewGroup) LayoutInflater.from(mActivity).inflate(
|
||||
R.layout.admin_support_details_dialog, null);
|
||||
mActionDisabledByAdminController = ActionDisabledByAdminControllerFactory
|
||||
.createInstance(mActivity, new DeviceAdminStringProviderImpl(mActivity));
|
||||
}
|
||||
|
||||
private @UserIdInt int getEnforcementAdminUserId(@NonNull EnforcedAdmin admin) {
|
||||
if (admin.user == null) {
|
||||
return UserHandle.USER_NULL;
|
||||
} else {
|
||||
return admin.user.getIdentifier();
|
||||
}
|
||||
return admin.user == null ? UserHandle.USER_NULL : admin.user.getIdentifier();
|
||||
}
|
||||
|
||||
private @UserIdInt int getEnforcementAdminUserId() {
|
||||
@@ -78,21 +73,24 @@ public class ActionDisabledByAdminDialogHelper {
|
||||
|
||||
public AlertDialog.Builder prepareDialogBuilder(String restriction,
|
||||
EnforcedAdmin enforcedAdmin) {
|
||||
mEnforcedAdmin = enforcedAdmin;
|
||||
mRestriction = restriction;
|
||||
final AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
|
||||
mDialogView = (ViewGroup) LayoutInflater.from(mActivity).inflate(
|
||||
R.layout.admin_support_details_dialog, null);
|
||||
initializeDialogViews(mDialogView, mEnforcedAdmin, getEnforcementAdminUserId(),
|
||||
mRestriction, mActionDisabledByAdminController);
|
||||
builder.setPositiveButton(R.string.okay, null).setView(mDialogView);
|
||||
maybeSetLearnMoreButton(builder);
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(mActivity)
|
||||
.setPositiveButton(R.string.okay, null)
|
||||
.setView(mDialogView);
|
||||
prepareDialogBuilder(builder, restriction, enforcedAdmin);
|
||||
return builder;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void maybeSetLearnMoreButton(AlertDialog.Builder builder) {
|
||||
mActionDisabledByAdminController.setupLearnMoreButton(mActivity, builder);
|
||||
void prepareDialogBuilder(AlertDialog.Builder builder, String restriction,
|
||||
EnforcedAdmin enforcedAdmin) {
|
||||
mActionDisabledByAdminController.initialize(
|
||||
new ActionDisabledLearnMoreButtonLauncherImpl(mActivity, builder));
|
||||
|
||||
mEnforcedAdmin = enforcedAdmin;
|
||||
mRestriction = restriction;
|
||||
initializeDialogViews(mDialogView, mEnforcedAdmin, getEnforcementAdminUserId(),
|
||||
mRestriction);
|
||||
mActionDisabledByAdminController.setupLearnMoreButton(mActivity);
|
||||
}
|
||||
|
||||
public void updateDialog(String restriction, EnforcedAdmin admin) {
|
||||
@@ -102,17 +100,17 @@ public class ActionDisabledByAdminDialogHelper {
|
||||
mEnforcedAdmin = admin;
|
||||
mRestriction = restriction;
|
||||
initializeDialogViews(mDialogView, mEnforcedAdmin, getEnforcementAdminUserId(),
|
||||
mRestriction, mActionDisabledByAdminController);
|
||||
mRestriction);
|
||||
}
|
||||
|
||||
private void initializeDialogViews(View root, EnforcedAdmin enforcedAdmin, int userId,
|
||||
String restriction, ActionDisabledByAdminController controller) {
|
||||
String restriction) {
|
||||
ComponentName admin = enforcedAdmin.component;
|
||||
if (admin == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
controller.updateEnforcedAdmin(enforcedAdmin, userId);
|
||||
mActionDisabledByAdminController.updateEnforcedAdmin(enforcedAdmin, userId);
|
||||
setAdminSupportIcon(root, admin, userId);
|
||||
|
||||
if (isNotCurrentUserOrProfile(admin, userId)) {
|
||||
@@ -151,8 +149,7 @@ public class ActionDisabledByAdminDialogHelper {
|
||||
if (titleView == null) {
|
||||
return;
|
||||
}
|
||||
titleView.setText(
|
||||
mActionDisabledByAdminController.getAdminSupportTitle(restriction));
|
||||
titleView.setText(mActionDisabledByAdminController.getAdminSupportTitle(restriction));
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
|
||||
@@ -20,104 +20,67 @@ import static java.util.Objects.requireNonNull;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.admin.DevicePolicyManager;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Settings;
|
||||
import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
|
||||
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
|
||||
import com.android.settingslib.enterprise.ActionDisabledLearnMoreButtonLauncher;
|
||||
|
||||
import java.util.function.BiConsumer;
|
||||
|
||||
/**
|
||||
* Helper class to set up the "Learn more" button in the action disabled dialog.
|
||||
*/
|
||||
public class ActionDisabledLearnMoreButtonLauncherImpl
|
||||
implements ActionDisabledLearnMoreButtonLauncher {
|
||||
public final class ActionDisabledLearnMoreButtonLauncherImpl
|
||||
extends ActionDisabledLearnMoreButtonLauncher {
|
||||
|
||||
static final BiConsumer<Activity, EnforcedAdmin> SHOW_ADMIN_POLICIES =
|
||||
(activity, enforcedAdmin) -> {
|
||||
showAdminPolicies(enforcedAdmin, activity);
|
||||
activity.finish();
|
||||
};
|
||||
private final Activity mActivity;
|
||||
private final AlertDialog.Builder mBuilder;
|
||||
|
||||
static final BiConsumer<Activity, String> LAUNCH_HELP_PAGE = (activity, url) -> {
|
||||
launchLearnMoreHelpPage(activity, url);
|
||||
activity.finish();
|
||||
};
|
||||
|
||||
@Override
|
||||
public void setupLearnMoreButtonToShowAdminPolicies(
|
||||
Context context,
|
||||
Object alertDialogBuilder,
|
||||
int enforcementAdminUserId,
|
||||
EnforcedAdmin enforcedAdmin) {
|
||||
requireNonNull(context);
|
||||
requireNonNull(alertDialogBuilder);
|
||||
requireNonNull(enforcedAdmin);
|
||||
// The "Learn more" button appears only if the restriction is enforced by an admin in the
|
||||
// same profile group. Otherwise the admin package and its policies are not accessible to
|
||||
// the current user.
|
||||
final UserManager um = UserManager.get(context);
|
||||
if (um.isSameProfileGroup(enforcementAdminUserId, um.getUserHandle())) {
|
||||
setupLearnMoreButton((AlertDialog.Builder) alertDialogBuilder, () ->
|
||||
SHOW_ADMIN_POLICIES.accept((Activity) context, enforcedAdmin));
|
||||
}
|
||||
ActionDisabledLearnMoreButtonLauncherImpl(Activity activity, AlertDialog.Builder builder) {
|
||||
mActivity = requireNonNull(activity, "activity cannot be null");
|
||||
mBuilder = requireNonNull(builder, "builder cannot be null");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setupLearnMoreButtonToLaunchHelpPage(
|
||||
Context context,
|
||||
Object alertDialogBuilder,
|
||||
String url) {
|
||||
requireNonNull(context);
|
||||
requireNonNull(alertDialogBuilder);
|
||||
requireNonNull(url);
|
||||
setupLearnMoreButton((AlertDialog.Builder) alertDialogBuilder,
|
||||
() -> LAUNCH_HELP_PAGE.accept((Activity) context, url));
|
||||
public void setLearnMoreButton(Runnable action) {
|
||||
requireNonNull(action, "action cannot be null");
|
||||
|
||||
mBuilder.setNeutralButton(R.string.learn_more, (dialog, which) -> action.run());
|
||||
}
|
||||
|
||||
private void setupLearnMoreButton(AlertDialog.Builder builder, Runnable runnable) {
|
||||
builder.setNeutralButton(R.string.learn_more, (dialog, which) -> {
|
||||
runnable.run();
|
||||
});
|
||||
@Override
|
||||
protected void launchShowAdminPolicies(Context context, UserHandle user, ComponentName admin) {
|
||||
requireNonNull(context, "context cannot be null");
|
||||
requireNonNull(user, "user cannot be null");
|
||||
requireNonNull(admin, "admin cannot be null");
|
||||
|
||||
Intent intent = new Intent()
|
||||
.setClass(mActivity, DeviceAdminAdd.class)
|
||||
.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, admin)
|
||||
.putExtra(DeviceAdminAdd.EXTRA_CALLED_FROM_SUPPORT_DIALOG, true);
|
||||
// DeviceAdminAdd class may need to run as managed profile.
|
||||
mActivity.startActivityAsUser(intent, user);
|
||||
}
|
||||
|
||||
private static void launchLearnMoreHelpPage(Activity activity, String url) {
|
||||
activity.startActivityAsUser(createLearnMoreIntent(url), UserHandle.SYSTEM);
|
||||
@Override
|
||||
protected void launchShowAdminSettings(Context context) {
|
||||
requireNonNull(context, "context cannot be null");
|
||||
|
||||
Intent intent = new Intent()
|
||||
.setClass(mActivity, Settings.DeviceAdminSettingsActivity.class)
|
||||
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
// Activity merges both managed profile and parent users
|
||||
// admins so show as same user as this activity.
|
||||
mActivity.startActivity(intent);
|
||||
}
|
||||
|
||||
private static Intent createLearnMoreIntent(String url) {
|
||||
final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
|
||||
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
|
||||
return intent;
|
||||
}
|
||||
|
||||
private static void showAdminPolicies(
|
||||
EnforcedAdmin enforcedAdmin,
|
||||
Activity activity) {
|
||||
final Intent intent = new Intent();
|
||||
if (enforcedAdmin.component != null) {
|
||||
intent.setClass(activity, DeviceAdminAdd.class);
|
||||
intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN,
|
||||
enforcedAdmin.component);
|
||||
intent.putExtra(DeviceAdminAdd.EXTRA_CALLED_FROM_SUPPORT_DIALOG, true);
|
||||
// DeviceAdminAdd class may need to run as managed profile.
|
||||
activity.startActivityAsUser(intent, enforcedAdmin.user);
|
||||
} else {
|
||||
intent.setClass(activity, Settings.DeviceAdminSettingsActivity.class);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
// Activity merges both managed profile and parent users
|
||||
// admins so show as same user as this activity.
|
||||
activity.startActivity(intent);
|
||||
}
|
||||
@Override
|
||||
protected void finishSelf() {
|
||||
mActivity.finish();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user