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

Commit 3ab85fbd authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Add non system overlay flag to RequestManageCredentials" into sc-v2-dev

parents 6437b859 04c66a0a
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@

package com.android.settings.security;

import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

import android.annotation.Nullable;
import android.app.Activity;
import android.app.admin.DevicePolicyEventLogger;
@@ -120,6 +122,7 @@ public class RequestManageCredentials extends Activity {
                .setStrings(mCredentialManagerPackage)
                .write();
        setContentView(R.layout.request_manage_credentials);
        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
        mIsLandscapeMode = getResources().getConfiguration().orientation
                == Configuration.ORIENTATION_LANDSCAPE;

@@ -211,7 +214,9 @@ public class RequestManageCredentials extends Activity {
    private void loadButtons() {
        mButtonPanel = findViewById(R.id.button_panel);
        Button dontAllowButton = findViewById(R.id.dont_allow_button);
        dontAllowButton.setFilterTouchesWhenObscured(true);
        Button allowButton = findViewById(R.id.allow_button);
        allowButton.setFilterTouchesWhenObscured(true);

        dontAllowButton.setOnClickListener(b -> {
            DevicePolicyEventLogger