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

Commit 378fcf65 authored by Rajeev Kumar's avatar Rajeev Kumar Committed by Automerger Merge Worker
Browse files

Merge "Undo making Image icon's visibility to GONE in Action Not Allowed... 

Merge "Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device" into sc-dev am: 81555818

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

Change-Id: I6dd1b17fcaecc628fa93a87cafdafc77a5774a82
parents b77cf0af 81555818

src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java

+3 −6
Original line number Original line Diff line number Diff line
@@ -141,17 +141,14 @@ public class ActionDisabledByAdminDialogHelper { 
    }

    }





    private boolean isNotCurrentUserOrProfile(ComponentName admin, int userId) {

    private boolean isNotCurrentUserOrProfile(ComponentName admin, int userId) {

        return !isFinancedDevice()

        return !RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)

                && (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)

                || !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId);

                        || !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId));

    }

    }





    @VisibleForTesting

    @VisibleForTesting

    void setAdminSupportIcon(View root, ComponentName admin, int userId) {

    void setAdminSupportIcon(View root, ComponentName admin, int userId) {

        ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);

        ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);

        if (isFinancedDevice()) {

        if (isNotCurrentUserOrProfile(admin, userId)) {

            supportIconView.setVisibility(View.GONE);

        } else if (isNotCurrentUserOrProfile(admin, userId)) {

            supportIconView.setImageDrawable(

            supportIconView.setImageDrawable(

                    mActivity.getDrawable(com.android.internal.R.drawable.ic_info));

                    mActivity.getDrawable(com.android.internal.R.drawable.ic_info));

tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java

+0 −24
Original line number Original line Diff line number Diff line
@@ -36,10 +36,8 @@ import android.content.pm.UserInfo; 
import android.os.Process;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManager;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;

import android.widget.FrameLayout;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.TextView;

import android.widget.TextView;





import androidx.appcompat.app.AlertDialog;

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

                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

    @Test

    public void testSetAdminSupportTitle() {

    public void testSetAdminSupportTitle() {

        final ViewGroup view = new FrameLayout(mActivity);

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

        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,

    private static TextView createAdminSupportDialogTitleTextView(final ViewGroup view,

            final Activity activity) {

            final Activity activity) {

        final TextView textView = new TextView(activity);

        final TextView textView = new TextView(activity);