X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FSettingsActivity.java;h=2687ab1facfae4082212401a83b589653d26b7cc;hp=ddeb7b7bbad496c3dade63b0c350ff41b562bfd4;hb=ba40295dffd761ccdc95d3b46ca7acbad1f00d5e;hpb=61a76e491469916f2f30aebb47b98cda7cceb557 diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java index ddeb7b7b..2687ab1f 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,19 +20,32 @@ package com.stoutner.privacybrowser.activities; import android.os.Bundle; -import android.preference.PreferenceFragment; -import android.support.v7.app.AppCompatActivity; +import android.view.WindowManager; +import androidx.appcompat.app.AppCompatActivity; + +import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.fragments.SettingsFragment; public class SettingsActivity extends AppCompatActivity { - @Override protected void onCreate(Bundle savedInstanceState) { + // Disable screenshots if not allowed. + if (!MainWebViewActivity.allowScreenshots) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); + } + + // Set the activity theme. + if (MainWebViewActivity.darkTheme) { + setTheme(R.style.PrivacyBrowserSettingsDark); + } else { + setTheme(R.style.PrivacyBrowserSettingsLight); + } + + // Run the default commands. super.onCreate(savedInstanceState); - // Display SettingsFragment. - PreferenceFragment settingsFragment = new SettingsFragment(); - getFragmentManager().beginTransaction().replace(android.R.id.content, settingsFragment).commit(); + // Display the settings fragment. + getFragmentManager().beginTransaction().replace(android.R.id.content, new SettingsFragment()).commit(); } }