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

Commit 0e0247e5 authored by Salud Lemus's avatar Salud Lemus
Browse files

Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device

Bug: 182839352
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest

Change-Id: I42bb9ce9a624fa20cd755af2d323b4c4f94048f7
parent 50527b1f
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -141,17 +141,14 @@ public class ActionDisabledByAdminDialogHelper {
    }

    private boolean isNotCurrentUserOrProfile(ComponentName admin, int userId) {
        return !isFinancedDevice()
                && (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)
                        || !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId));
        return !RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)
                || !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId);
    }

    @VisibleForTesting
    void setAdminSupportIcon(View root, ComponentName admin, int userId) {
        ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);
        if (isFinancedDevice()) {
            supportIconView.setVisibility(View.GONE);
        } else if (isNotCurrentUserOrProfile(admin, userId)) {
        if (isNotCurrentUserOrProfile(admin, userId)) {
            supportIconView.setImageDrawable(
                    mActivity.getDrawable(com.android.internal.R.drawable.ic_info));

+0 −24
Original line number Diff line number Diff line
@@ -36,10 +36,8 @@ import android.content.pm.UserInfo;
import android.os.Process;
import android.os.UserHandle;
import android.os.UserManager;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;

import androidx.appcompat.app.AlertDialog;
@@ -108,20 +106,6 @@ public class ActionDisabledByAdminDialogHelperTest {
                Settings.DeviceAdminSettingsActivity.class.getName()));
    }

    @Test
    public void testSetAdminSupportIconForFinancedDevice_adminSupportIconIsGone() {
        final ShadowDevicePolicyManager dpmShadow = ShadowDevicePolicyManager.getShadow();
        final ViewGroup view = new FrameLayout(mActivity);
        final ImageView supportIconImageView = createAdminSupportIconImageView(view, mActivity);
        final ComponentName component = new ComponentName("some.package.name",
                "some.package.name.SomeClass");
        setupFinancedDevice(dpmShadow);

        mHelper.setAdminSupportIcon(view, component, 123);

        assertEquals(View.GONE, supportIconImageView.getVisibility());
    }

    @Test
    public void testSetAdminSupportTitle() {
        final ViewGroup view = new FrameLayout(mActivity);
@@ -260,14 +244,6 @@ public class ActionDisabledByAdminDialogHelperTest {
        verify(builder, never()).setNeutralButton(anyInt(), any());
    }

    private static ImageView createAdminSupportIconImageView(final ViewGroup view,
            final Activity activity) {
        final ImageView supportIconView = new ImageView(activity);
        supportIconView.setId(R.id.admin_support_icon);
        view.addView(supportIconView);
        return supportIconView;
    }

    private static TextView createAdminSupportDialogTitleTextView(final ViewGroup view,
            final Activity activity) {
        final TextView textView = new TextView(activity);