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

Commit 6f8ba573 authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Add non system overlay flag to InstallCaCertificateWarning am: fca5cb37

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I1a2d3a106cfedb8cb43b2eae446e1de9efef955c
parents 1bb96ff4 fca5cb37
Loading
Loading
Loading
Loading
+6 −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.content.Intent;
import android.content.Intent;
@@ -41,6 +43,8 @@ public class InstallCaCertificateWarning extends Activity {
        super.onCreate(savedInstanceState);
        super.onCreate(savedInstanceState);


        setContentView(R.layout.ca_certificate_warning_dialog);
        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 GlifLayout layout = findViewById(R.id.setup_wizard_layout);


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


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


    private View.OnClickListener installCaCertificate() {
    private View.OnClickListener installCaCertificate() {