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

Commit fca5cb37 authored by Alex Johnston's avatar Alex Johnston Committed by Rubin Xu
Browse files

Add non system overlay flag to InstallCaCertificateWarning

Bug: 196969991
Test: Manual testing with Settings
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
(cherry picked from commit 2f193c81)
parent c5447d70
Loading
Loading
Loading
Loading
+6 −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.content.Intent;
@@ -41,6 +43,8 @@ public class InstallCaCertificateWarning extends Activity {
        super.onCreate(savedInstanceState);

        setContentView(R.layout.ca_certificate_warning_dialog);
        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        final GlifLayout layout = findViewById(R.id.setup_wizard_layout);

        final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
@@ -52,6 +56,7 @@ public class InstallCaCertificateWarning extends Activity {
                        .setTheme(R.style.SudGlifButton_Secondary)
                        .build()
        );
        mixin.getSecondaryButtonView().setFilterTouchesWhenObscured(true);

        mixin.setPrimaryButton(
                new FooterButton.Builder(this)
@@ -61,6 +66,7 @@ public class InstallCaCertificateWarning extends Activity {
                        .setTheme(R.style.SudGlifButton_Primary)
                        .build()
        );
        mixin.getPrimaryButtonView().setFilterTouchesWhenObscured(true);
    }

    private View.OnClickListener installCaCertificate() {