PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add non system overlay flag to InstallCaCertificateWarning" into sc-v2-dev am: 86cee74361 am: 62ab8f5847

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

Change-Id: I73b5e496f4a2d8f206f23e775816a70ff20fc0a7
This commit is contained in:
Alex Johnston
2021-12-02 16:05:03 +00:00
committed by Automerger Merge Worker
parent 4c450d6b4c 62ab8f5847
commit a0ddbe36d6
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/security/InstallCaCertificateWarning.java
View File

@@ -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;
@@ -45,6 +47,8 @@ public class InstallCaCertificateWarning extends Activity {
setTheme(SetupWizardUtils.getTheme(this, getIntent())); setTheme(SetupWizardUtils.getTheme(this, getIntent()));
ThemeHelper.trySetDynamicColor(this); ThemeHelper.trySetDynamicColor(this);
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);
layout.setHeaderText(R.string.ca_certificate_warning_title); layout.setHeaderText(R.string.ca_certificate_warning_title);
@@ -57,6 +61,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)
@@ -66,6 +71,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() {