Merge "Add non system overlay flag to InstallCaCertificateWarning" into sc-v2-dev (86cee743) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/security/InstallCaCertificateWarning.java

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

		@@ -57,6 +61,7 @@ public class InstallCaCertificateWarning extends Activity {
		.setTheme(R.style.SudGlifButton_Secondary)
		.build()
		);
		mixin.getSecondaryButtonView().setFilterTouchesWhenObscured(true);

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

		private View.OnClickListener installCaCertificate() {