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

Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084

Change-Id: I6c3d96994d7faa0af63f43911bf382c83219f00d
This commit is contained in:
Felipe Leme
2021-05-25 19:29:36 +00:00
committed by Automerger Merge Worker
parent 2fa3ec90a4 d51e6cb7a4
commit 779d68ca4b
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImpl.java
View File

@@ -20,6 +20,7 @@ import static java.util.Objects.requireNonNull;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.UserHandle;
@@ -54,32 +55,33 @@ public class ActionDisabledLearnMoreButtonLauncherImpl
@Override
public void setupLearnMoreButtonToShowAdminPolicies(
Activity activity,
AlertDialog.Builder builder,
Context context,
Object alertDialogBuilder,
int enforcementAdminUserId,
EnforcedAdmin enforcedAdmin) {
requireNonNull(activity);
requireNonNull(builder);
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(activity);
final UserManager um = UserManager.get(context);
if (um.isSameProfileGroup(enforcementAdminUserId, um.getUserHandle())) {
setupLearnMoreButton(builder, () ->
SHOW_ADMIN_POLICIES.accept(activity, enforcedAdmin));
setupLearnMoreButton((AlertDialog.Builder) alertDialogBuilder, () ->
SHOW_ADMIN_POLICIES.accept((Activity) context, enforcedAdmin));
}
}
@Override
public void setupLearnMoreButtonToLaunchHelpPage(
Activity activity,
AlertDialog.Builder builder,
Context context,
Object alertDialogBuilder,
String url) {
requireNonNull(activity);
requireNonNull(builder);
requireNonNull(context);
requireNonNull(alertDialogBuilder);
requireNonNull(url);
setupLearnMoreButton(builder, () -> LAUNCH_HELP_PAGE.accept(activity, url));
setupLearnMoreButton((AlertDialog.Builder) alertDialogBuilder,
() -> LAUNCH_HELP_PAGE.accept((Activity) context, url));
}
private void setupLearnMoreButton(AlertDialog.Builder builder, Runnable runnable) {