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

Commit 2afa837b authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge "Fix security dialog bug" into tm-qpr-dev

parents 1d3ecebe aeae9af5

packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooterUtils.java

+5 −5
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ public class QSSecurityFooterUtils implements DialogInterface.OnClickListener { 
        mShouldUseSettingsButton.set(false);

        mBgHandler.post(() -> {

            String settingsButtonText = getSettingsButton();

            final View dialogView = createDialogView();

            final View dialogView = createDialogView(quickSettingsContext);

            mMainHandler.post(() -> {

                mDialog = new SystemUIDialog(quickSettingsContext, 0);

                mDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -469,14 +469,14 @@ public class QSSecurityFooterUtils implements DialogInterface.OnClickListener { 
    }



    @VisibleForTesting

    View createDialogView() {

    View createDialogView(Context quickSettingsContext) {

        if (mSecurityController.isParentalControlsEnabled()) {

            return createParentalControlsDialogView();

        }

        return createOrganizationDialogView();

        return createOrganizationDialogView(quickSettingsContext);

    }



    private View createOrganizationDialogView() {

    private View createOrganizationDialogView(Context quickSettingsContext) {

        final boolean isDeviceManaged = mSecurityController.isDeviceManaged();

        final boolean hasWorkProfile = mSecurityController.hasWorkProfile();

        final CharSequence deviceOwnerOrganization =
@@ -487,7 +487,7 @@ public class QSSecurityFooterUtils implements DialogInterface.OnClickListener { 
        final String vpnName = mSecurityController.getPrimaryVpnName();

        final String vpnNameWorkProfile = mSecurityController.getWorkProfileVpnName();



        View dialogView = LayoutInflater.from(mContext)

        View dialogView = LayoutInflater.from(quickSettingsContext)

                .inflate(R.layout.quick_settings_footer_dialog, null, false);



        // device management section

packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java

+2 −2
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ public class QSSecurityFooterTest extends SysuiTestCase { 
        when(mSecurityController.isParentalControlsEnabled()).thenReturn(true);

        when(mSecurityController.getLabel(any())).thenReturn(PARENTAL_CONTROLS_LABEL);



        View view = mFooterUtils.createDialogView();

        View view = mFooterUtils.createDialogView(getContext());

        TextView textView = (TextView) view.findViewById(R.id.parental_controls_title);

        assertEquals(PARENTAL_CONTROLS_LABEL, textView.getText());

    }
@@ -749,7 +749,7 @@ public class QSSecurityFooterTest extends SysuiTestCase { 
        when(mSecurityController.getDeviceOwnerType(DEVICE_OWNER_COMPONENT))

                .thenReturn(DEVICE_OWNER_TYPE_FINANCED);



        View view = mFooterUtils.createDialogView();

        View view = mFooterUtils.createDialogView(getContext());



        TextView managementSubtitle = view.findViewById(R.id.device_management_subtitle);

        assertEquals(View.VISIBLE, managementSubtitle.getVisibility());