Merge "Refactored some com.android.car.settings.enterprise interfaces." into sc-dev (1cbeefce) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminController.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -16,11 +16,9 @@

		package com.android.settingslib.enterprise;

		import android.app.Activity;
		import android.content.Context;

		import androidx.annotation.Nullable;
		import androidx.appcompat.app.AlertDialog.Builder;

		import com.android.settingslib.RestrictedLockUtils;

		@@ -33,7 +31,7 @@ public interface ActionDisabledByAdminController {
		* Handles the adding and setting up of the learn more button. If button is not needed, then
		* this method can be left empty.
		*/
		void setupLearnMoreButton(Activity activity, Builder builder);
		void setupLearnMoreButton(Context context, Object alertDialogBuilder);

		/**
		* Returns the admin support dialog's title resource id.

+5 −7

Original line number	Diff line number	Diff line
		@@ -16,9 +16,7 @@

		package com.android.settingslib.enterprise;

		import android.app.Activity;

		import androidx.appcompat.app.AlertDialog;
		import android.content.Context;

		import com.android.settingslib.RestrictedLockUtils;

		@@ -31,8 +29,8 @@ public interface ActionDisabledLearnMoreButtonLauncher {
		* Sets up a "learn more" button which shows a screen with device policy settings
		*/
		void setupLearnMoreButtonToShowAdminPolicies(
		Activity activity,
		AlertDialog.Builder builder,
		Context context,
		Object alertDialogBuilder,
		int enforcementAdminUserId,
		RestrictedLockUtils.EnforcedAdmin enforcedAdmin);

		@@ -40,7 +38,7 @@ public interface ActionDisabledLearnMoreButtonLauncher {
		* Sets up a "learn more" button which launches a help page
		*/
		void setupLearnMoreButtonToLaunchHelpPage(
		Activity activity,
		AlertDialog.Builder builder,
		Context context,
		Object alertDialogBuilder,
		String url);
		}

+7 −8

Original line number	Diff line number	Diff line
		@@ -19,11 +19,9 @@ package com.android.settingslib.enterprise;
		import static java.util.Objects.requireNonNull;

		import android.annotation.UserIdInt;
		import android.app.Activity;
		import android.content.Context;

		import androidx.annotation.Nullable;
		import androidx.appcompat.app.AlertDialog.Builder;

		import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

		@@ -41,21 +39,22 @@ public class FinancedDeviceActionDisabledByAdminController
		FinancedDeviceActionDisabledByAdminController(
		ActionDisabledLearnMoreButtonLauncher helper,
		DeviceAdminStringProvider deviceAdminStringProvider) {
		mHelper = requireNonNull(helper);
		mDeviceAdminStringProvider = requireNonNull(deviceAdminStringProvider);
		mHelper = requireNonNull(helper, "helper cannot be null");
		mDeviceAdminStringProvider = requireNonNull(deviceAdminStringProvider,
		"deviceAdminStringProvider cannot be null");
		}

		@Override
		public void updateEnforcedAdmin(EnforcedAdmin admin, int adminUserId) {
		mEnforcementAdminUserId = adminUserId;
		mEnforcedAdmin = requireNonNull(admin);
		mEnforcedAdmin = requireNonNull(admin, "admin cannot be null");
		}

		@Override
		public void setupLearnMoreButton(Activity activity, Builder builder) {
		public void setupLearnMoreButton(Context context, Object alertDialogBuilder) {
		mHelper.setupLearnMoreButtonToShowAdminPolicies(
		activity,
		builder,
		context,
		alertDialogBuilder,
		mEnforcementAdminUserId,
		mEnforcedAdmin);
		}

+5 −8

Original line number	Diff line number	Diff line
		@@ -19,14 +19,11 @@ package com.android.settingslib.enterprise;
		import static java.util.Objects.requireNonNull;

		import android.annotation.UserIdInt;
		import android.app.Activity;
		import android.app.admin.DevicePolicyManager;
		import android.content.Context;
		import android.os.UserManager;
		import android.text.TextUtils;

		import androidx.appcompat.app.AlertDialog.Builder;

		import com.android.settingslib.RestrictedLockUtils;

		/**
		@@ -49,20 +46,20 @@ class ManagedDeviceActionDisabledByAdminController implements
		@Override
		public void updateEnforcedAdmin(RestrictedLockUtils.EnforcedAdmin admin, int adminUserId) {
		mEnforcementAdminUserId = adminUserId;
		mEnforcedAdmin = requireNonNull(admin);
		mEnforcedAdmin = requireNonNull(admin, "admin cannot be null");
		}

		@Override
		public void setupLearnMoreButton(Activity activity, Builder builder) {
		public void setupLearnMoreButton(Context context, Object alertDialogBuilder) {
		String url = mStringProvider.getLearnMoreHelpPageUrl();
		if (TextUtils.isEmpty(url)) {
		mHelper.setupLearnMoreButtonToShowAdminPolicies(
		activity,
		builder,
		context,
		alertDialogBuilder,
		mEnforcementAdminUserId,
		mEnforcedAdmin);
		} else {
		mHelper.setupLearnMoreButtonToLaunchHelpPage(activity, builder, url);
		mHelper.setupLearnMoreButtonToLaunchHelpPage(context, alertDialogBuilder, url);
		}
		}

+5 −4

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.settingslib.enterprise;
		import static com.google.common.truth.Truth.assertThat;

		import android.app.Activity;
		import android.content.Context;

		import androidx.appcompat.app.AlertDialog;

		@@ -37,15 +38,15 @@ class ActionDisabledByAdminControllerTestUtils {
		ActionDisabledLearnMoreButtonLauncher createLearnMoreButtonLauncher() {
		return new ActionDisabledLearnMoreButtonLauncher() {
		@Override
		public void setupLearnMoreButtonToShowAdminPolicies(Activity activity,
		AlertDialog.Builder builder, int enforcementAdminUserId,
		public void setupLearnMoreButtonToShowAdminPolicies(Context context,
		Object alertDialogBuilder, int enforcementAdminUserId,
		RestrictedLockUtils.EnforcedAdmin enforcedAdmin) {
		mLearnMoreButtonAction = LEARN_MORE_ACTION_SHOW_ADMIN_POLICIES;
		}

		@Override
		public void setupLearnMoreButtonToLaunchHelpPage(Activity activity,
		AlertDialog.Builder builder, String url) {
		public void setupLearnMoreButtonToLaunchHelpPage(Context context,
		Object alertDialogBuilder, String url) {
		mLearnMoreButtonAction = LEARN_MORE_ACTION_LAUNCH_HELP_PAGE;
		}
		};