X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FSettingsActivity.java;h=390513823abb9a7b19ad439019eb93f5939b4028;hb=7d632afdd10cad5b4d62fce37707eaceebe260cb;hp=287237bea587a7ab7f8358778cd94c5712e98e84;hpb=81aeaac4229700db3255a6d6c02a8bda18b403e6;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java
index 287237be..39051382 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java
@@ -1,7 +1,7 @@
 /**
  * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser.
+ * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
  * Privacy Browser is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,16 +20,17 @@
 package com.stoutner.privacybrowser;
 
 import android.os.Bundle;
-import android.preference.PreferenceActivity;
-import android.support.v7.widget.Toolbar;
+import android.preference.PreferenceFragment;
+import android.support.v7.app.AppCompatActivity;
+
+public class SettingsActivity extends AppCompatActivity {
 
-// Once the minimum API is >= 11 we can switch from the deprecated PreferenceActivity to using a PreferenceFragment.
-public class SettingsActivity extends PreferenceActivity {
     @Override
-    // Until minumum API is >= 11 we needs to use the deprecated addPreferenceFromResource from PreferenceActivity.
-    @SuppressWarnings("deprecation")
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.preferences);
+
+        // Display SettingsFragment.
+        PreferenceFragment settingsFragment = new SettingsFragment();
+        getFragmentManager().beginTransaction().replace(android.R.id.content, settingsFragment).commit();
     }
 }