Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb45fd3f authored by Antoan Angelov's avatar Antoan Angelov Committed by Android (Google) Code Review
Browse files

Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev

parents a3d3c22a d79ab005
Loading
Loading
Loading
Loading
+15 −11
Original line number Diff line number Diff line
@@ -7756,6 +7756,8 @@
    <string name="help_url_battery_missing" translatable="false"></string>
    <!-- url for vpn page if connected vpn is not a secure type -->
    <string name="help_url_insecure_vpn" translatable="false"></string>
    <!-- url for learning more about IT admin policy disabling -->
    <string name="help_url_action_disabled_by_it_admin" translatable="false"></string>
    <!-- User account title [CHAR LIMIT=30] -->
    <string name="user_account_title">Account for content</string>
@@ -10823,22 +10825,24 @@
    <!-- Summary of Android version info (when there is a pending upgrade available) [CHAR LIMIT=NONE] -->
    <string name="android_version_pending_update_summary">Update available</string>
    <!-- Title for dialog displayed when user selects on a setting locked by an admin [CHAR LIMIT=30 BACKUP_MESSAGE_ID:4867639270211833535] -->
    <string name="disabled_by_policy_title">Action not allowed</string>
    <!-- Title for dialog displayed to tell user that changing volume was disallowed by an admin [CHAR LIMIT=50] -->
    <!-- Title for dialog displayed when user taps a setting on their phone that's blocked by their IT admin [CHAR LIMIT=30 BACKUP_MESSAGE_ID:4867639270211833535] -->
    <string name="disabled_by_policy_title">Blocked by your IT admin</string>
    <!-- Title for dialog displayed to tell user that changing volume on their phone is blocked by their IT admin [CHAR LIMIT=50] -->
    <string name="disabled_by_policy_title_adjust_volume">Can’t change volume</string>
    <!-- Title for dialog displayed to tell user that outgoing calls were disabled by an admin [CHAR LIMIT=50] -->
    <string name="disabled_by_policy_title_outgoing_calls">Calling not allowed</string>
    <!-- Title for dialog displayed to tell user that sending SMS were disabled by an admin [CHAR LIMIT=50] -->
    <string name="disabled_by_policy_title_sms">SMS not allowed</string>
    <!-- Title for dialog displayed to tell user that the camera was disabled by an admin [CHAR LIMIT=50] -->
    <string name="disabled_by_policy_title_camera">Camera not allowed</string>
    <!-- Title for dialog displayed to tell user that screenshots are disabled by an admin [CHAR LIMIT=50] -->
    <string name="disabled_by_policy_title_screen_capture">Screenshot not allowed</string>
    <!-- Title for dialog displayed to tell user that outgoing calls are blocked by their IT admin [CHAR LIMIT=50] -->
    <string name="disabled_by_policy_title_outgoing_calls">Can’t make calls</string>
    <!-- Title for dialog displayed to tell user that sending SMS messages is blocked by their IT admin [CHAR LIMIT=50] -->
    <string name="disabled_by_policy_title_sms">Can’t send SMS messages</string>
    <!-- Title for dialog displayed to tell user that the camera on their phone is blocked by their IT admin [CHAR LIMIT=50] -->
    <string name="disabled_by_policy_title_camera">Can’t use camera</string>
    <!-- Title for dialog displayed to tell user that taking screenshots on their phone is blocked by their IT admin [CHAR LIMIT=50] -->
    <string name="disabled_by_policy_title_screen_capture">Can’t take screenshots</string>
    <!-- Title for dialog displayed to tell user that the app was suspended by an admin [CHAR LIMIT=50] -->
    <string name="disabled_by_policy_title_suspend_packages">Can’t open this app</string>
    <!-- Dialog title. This dialog lets a user know that a specific setting is blocked by their credit provider. Since the user purchased the device from the credit provider, the credit provider controls what they can access. [CHAR LIMIT=50] -->
    <string name="disabled_by_policy_title_financed_device">Blocked by your credit provider</string>
    <!-- Shown when the user tries to change phone settings that are blocked by their IT admin [CHAR LIMIT=200] -->
    <string name="default_admin_support_msg">If you have questions, contact your IT admin</string>
    <!-- Shown in dialog to allow user to see more information about the device admin [CHAR LIMIT=30] -->
    <string name="admin_support_more_info">More details</string>
    <!-- Shown in admin details page to warn user about policies the admin can set in a work profile. [CHAR LIMIT=NONE] -->
+26 −82
Original line number Diff line number Diff line
@@ -16,21 +16,17 @@

package com.android.settings.enterprise;

import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED;

import android.annotation.NonNull;
import android.annotation.UserIdInt;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Process;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.IconDrawableFactory;
import android.view.LayoutInflater;
import android.view.View;
@@ -42,12 +38,12 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;

import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.Utils;
import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.enterprise.ActionDisabledByAdminController;
import com.android.settingslib.enterprise.ActionDisabledByAdminControllerFactory;

import java.util.Objects;

@@ -60,10 +56,16 @@ public class ActionDisabledByAdminDialogHelper {
    @VisibleForTesting EnforcedAdmin mEnforcedAdmin;
    private ViewGroup mDialogView;
    private String mRestriction = null;
    private Activity mActivity;
    private final Activity mActivity;
    private final ActionDisabledByAdminController mActionDisabledByAdminController;

    public ActionDisabledByAdminDialogHelper(Activity activity) {
        mActivity = activity;
        mActionDisabledByAdminController =
                ActionDisabledByAdminControllerFactory.createInstance(
                        mActivity.getSystemService(DevicePolicyManager.class),
                        new ActionDisabledLearnMoreButtonLauncherImpl(),
                        new DeviceAdminStringProviderImpl(mActivity));
    }

    private @UserIdInt int getEnforcementAdminUserId(@NonNull EnforcedAdmin admin) {
@@ -83,10 +85,10 @@ public class ActionDisabledByAdminDialogHelper {
        mEnforcedAdmin = enforcedAdmin;
        mRestriction = restriction;
        final AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
        mDialogView = (ViewGroup) LayoutInflater.from(builder.getContext()).inflate(
        mDialogView = (ViewGroup) LayoutInflater.from(mActivity).inflate(
                R.layout.admin_support_details_dialog, null);
        initializeDialogViews(mDialogView, mEnforcedAdmin.component, getEnforcementAdminUserId(),
                mRestriction);
        initializeDialogViews(mDialogView, mEnforcedAdmin, getEnforcementAdminUserId(),
                mRestriction, mActionDisabledByAdminController);
        builder.setPositiveButton(R.string.okay, null).setView(mDialogView);
        maybeSetLearnMoreButton(builder);
        return builder;
@@ -94,16 +96,7 @@ public class ActionDisabledByAdminDialogHelper {

    @VisibleForTesting
    void maybeSetLearnMoreButton(AlertDialog.Builder builder) {
        // 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(mActivity.getApplicationContext());
        if (um.isSameProfileGroup(getEnforcementAdminUserId(mEnforcedAdmin), um.getUserHandle())) {
            builder.setNeutralButton(R.string.learn_more, (dialog, which) -> {
                showAdminPolicies(mEnforcedAdmin, mActivity);
                mActivity.finish();
            });
        }
        mActionDisabledByAdminController.setupLearnMoreButton(mActivity, builder);
    }

    public void updateDialog(String restriction, EnforcedAdmin admin) {
@@ -112,16 +105,18 @@ public class ActionDisabledByAdminDialogHelper {
        }
        mEnforcedAdmin = admin;
        mRestriction = restriction;
        initializeDialogViews(mDialogView, mEnforcedAdmin.component, getEnforcementAdminUserId(),
                mRestriction);
        initializeDialogViews(mDialogView, mEnforcedAdmin, getEnforcementAdminUserId(),
                mRestriction, mActionDisabledByAdminController);
    }

    private void initializeDialogViews(View root, ComponentName admin, int userId,
            String restriction) {
    private void initializeDialogViews(View root, EnforcedAdmin enforcedAdmin, int userId,
            String restriction, ActionDisabledByAdminController controller) {
        ComponentName admin = enforcedAdmin.component;
        if (admin == null) {
            return;
        }

        controller.updateEnforcedAdmin(enforcedAdmin, userId);
        setAdminSupportIcon(root, admin, userId);

        if (isNotCurrentUserOrProfile(admin, userId)) {
@@ -171,37 +166,8 @@ public class ActionDisabledByAdminDialogHelper {
        if (titleView == null) {
            return;
        }
        if (isFinancedDevice()) {
            titleView.setText(R.string.disabled_by_policy_title_financed_device);
            return;
        }
        if (restriction == null) {
            titleView.setText(R.string.disabled_by_policy_title);
            return;
        }
        switch (restriction) {
            case UserManager.DISALLOW_ADJUST_VOLUME:
                titleView.setText(R.string.disabled_by_policy_title_adjust_volume);
                break;
            case UserManager.DISALLOW_OUTGOING_CALLS:
                titleView.setText(R.string.disabled_by_policy_title_outgoing_calls);
                break;
            case UserManager.DISALLOW_SMS:
                titleView.setText(R.string.disabled_by_policy_title_sms);
                break;
            case DevicePolicyManager.POLICY_DISABLE_CAMERA:
                titleView.setText(R.string.disabled_by_policy_title_camera);
                break;
            case DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE:
                titleView.setText(R.string.disabled_by_policy_title_screen_capture);
                break;
            case DevicePolicyManager.POLICY_SUSPEND_PACKAGES:
                titleView.setText(R.string.disabled_by_policy_title_suspend_packages);
                break;
            default:
                // Use general text if no specialized title applies
                titleView.setText(R.string.disabled_by_policy_title);
        }
        titleView.setText(
                mActionDisabledByAdminController.getAdminSupportTitle(restriction));
    }

    @VisibleForTesting
@@ -227,34 +193,12 @@ public class ActionDisabledByAdminDialogHelper {
                        getEnforcementAdminUserId(enforcedAdmin));
            }
        }
        final CharSequence supportContentString =
                mActionDisabledByAdminController.getAdminSupportContentString(
                        mActivity, supportMessage);
        final TextView textView = root.findViewById(R.id.admin_support_msg);
        if (supportMessage != null) {
            textView.setText(supportMessage);
        if (supportContentString != null) {
            textView.setText(supportContentString);
        }
    }

    @VisibleForTesting
    void showAdminPolicies(final EnforcedAdmin enforcedAdmin, final 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);
        }
    }

    private boolean isFinancedDevice() {
        final DevicePolicyManager dpm = mActivity.getSystemService(DevicePolicyManager.class);
        return dpm.isDeviceManaged() && dpm.getDeviceOwnerType(
                dpm.getDeviceOwnerComponentOnAnyUser()) == DEVICE_OWNER_TYPE_FINANCED;
    }
}
+121 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2021 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.settings.enterprise;

import static java.util.Objects.requireNonNull;

import android.app.Activity;
import android.app.admin.DevicePolicyManager;
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 {

    static final BiConsumer<Activity, EnforcedAdmin> SHOW_ADMIN_POLICIES =
            (activity, enforcedAdmin) -> {
                showAdminPolicies(enforcedAdmin, activity);
                activity.finish();
            };

    static final BiConsumer<Activity, String> LAUNCH_HELP_PAGE = (activity, url) -> {
        launchLearnMoreHelpPage(activity, url);
        activity.finish();
    };

    @Override
    public void setupLearnMoreButtonToShowAdminPolicies(
            Activity activity,
            AlertDialog.Builder builder,
            int enforcementAdminUserId,
            EnforcedAdmin enforcedAdmin) {
        requireNonNull(activity);
        requireNonNull(builder);
        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);
        if (um.isSameProfileGroup(enforcementAdminUserId, um.getUserHandle())) {
            setupLearnMoreButton(builder, () ->
                    SHOW_ADMIN_POLICIES.accept(activity, enforcedAdmin));
        }
    }

    @Override
    public void setupLearnMoreButtonToLaunchHelpPage(
            Activity activity,
            AlertDialog.Builder builder,
            String url) {
        requireNonNull(activity);
        requireNonNull(builder);
        requireNonNull(url);
        setupLearnMoreButton(builder, () -> LAUNCH_HELP_PAGE.accept(activity, url));
    }

    private void setupLearnMoreButton(AlertDialog.Builder builder, Runnable runnable) {
        builder.setNeutralButton(R.string.learn_more, (dialog, which) -> {
            runnable.run();
        });
    }

    private static void launchLearnMoreHelpPage(Activity activity, String url) {
        activity.startActivityAsUser(createLearnMoreIntent(url), UserHandle.SYSTEM);
    }

    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);
        }
    }
}
+82 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2021 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.settings.enterprise;

import static java.util.Objects.requireNonNull;

import android.content.Context;

import com.android.settings.R;
import com.android.settingslib.enterprise.DeviceAdminStringProvider;

class DeviceAdminStringProviderImpl implements DeviceAdminStringProvider {
    private final Context mContext;

    DeviceAdminStringProviderImpl(Context context) {
        mContext = requireNonNull(context);
    }

    @Override
    public String getDefaultDisabledByPolicyTitle() {
        return mContext.getString(R.string.disabled_by_policy_title);
    }

    @Override
    public String getDisallowAdjustVolumeTitle() {
        return mContext.getString(R.string.disabled_by_policy_title_adjust_volume);
    }

    @Override
    public String getDisallowOutgoingCallsTitle() {
        return mContext.getString(R.string.disabled_by_policy_title_outgoing_calls);
    }

    @Override
    public String getDisallowSmsTitle() {
        return mContext.getString(R.string.disabled_by_policy_title_sms);
    }

    @Override
    public String getDisableCameraTitle() {
        return mContext.getString(R.string.disabled_by_policy_title_camera);
    }

    @Override
    public String getDisableScreenCaptureTitle() {
        return mContext.getString(R.string.disabled_by_policy_title_screen_capture);
    }

    @Override
    public String getSuspendPackagesTitle() {
        return mContext.getString(R.string.disabled_by_policy_title_suspend_packages);
    }

    @Override
    public String getDefaultDisabledByPolicyContent() {
        return mContext.getString(R.string.default_admin_support_msg);
    }

    @Override
    public String getLearnMoreHelpPageUrl() {
        return mContext.getString(R.string.help_url_action_disabled_by_it_admin);
    }

    @Override
    public String getDisabledByPolicyTitleForFinancedDevice() {
        return mContext.getString(R.string.disabled_by_policy_title_financed_device);
    }
}
+2 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ android_robolectric_test {
        "androidx.test.core",
        "androidx.test.runner",
        "androidx.test.ext.junit",
        "androidx.test.espresso.core",
    ],

    libs: [
Loading