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

Commit f1ccde54 authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Cleanup flag "warning_use_default_dialog_type"" into main

parents 1e31f414 eb01e871

core/java/com/android/internal/accessibility/dialog/AccessibilityServiceWarning.java

+0 −4
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.view.MotionEvent; 
import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.view.accessibility.Flags;

import android.widget.Button;

import android.widget.ImageView;

import android.widget.TextView;
@@ -65,9 +64,6 @@ public class AccessibilityServiceWarning { 
        Window window = ad.getWindow();

        WindowManager.LayoutParams params = window.getAttributes();

        params.privateFlags |= SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

        if (!Flags.warningUseDefaultDialogType()) {

            params.type = WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;

        }

        window.setAttributes(params);

        return ad;

    }

core/tests/coretests/src/com/android/internal/accessibility/dialog/AccessibilityServiceWarningTest.java

+1 −20
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ import android.accessibilityservice.AccessibilityServiceInfo; 
import android.app.AlertDialog;

import android.content.Context;

import android.os.RemoteException;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.testing.AndroidTestingRunner;
@@ -35,7 +33,6 @@ import android.view.InputDevice; 
import android.view.MotionEvent;

import android.view.View;

import android.view.Window;

import android.view.accessibility.Flags;

import android.widget.TextView;



import androidx.test.platform.app.InstrumentationRegistry;
@@ -92,19 +89,7 @@ public class AccessibilityServiceWarningTest { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_WARNING_USE_DEFAULT_DIALOG_TYPE)

    public void createAccessibilityServiceWarningDialog_hasExpectedWindowParams_isSystemDialog() {

        createAccessibilityServiceWarningDialog_hasExpectedWindowParams(true);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_WARNING_USE_DEFAULT_DIALOG_TYPE)

    public void createAccessibilityServiceWarningDialog_hasExpectedWindowParams_notSystemDialog() {

        createAccessibilityServiceWarningDialog_hasExpectedWindowParams(false);

    }



    private void createAccessibilityServiceWarningDialog_hasExpectedWindowParams(

            boolean expectSystemDialog) {

        final AlertDialog dialog =

                AccessibilityServiceWarning.createAccessibilityServiceWarningDialog(

                        mContext,
@@ -116,12 +101,8 @@ public class AccessibilityServiceWarningTest { 
        expect.that(dialogWindow.getAttributes().privateFlags

                & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS).isEqualTo(

                SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        if (expectSystemDialog) {

            expect.that(dialogWindow.getAttributes().type).isEqualTo(TYPE_SYSTEM_DIALOG);

        } else {

        expect.that(dialogWindow.getAttributes().type).isNotEqualTo(TYPE_SYSTEM_DIALOG);

    }

    }



    @Test

    public void createAccessibilityServiceWarningDialog_hasExpectedServiceName() {