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

Commit ff07f8c3 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-dev

parents fad8ac95 db9333ba
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@


package com.android.settings.security;
package com.android.settings.security;


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

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


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


        dontAllowButton.setOnClickListener(b -> {
        dontAllowButton.setOnClickListener(b -> {
            DevicePolicyEventLogger
            DevicePolicyEventLogger