From b18231c25dc118a20020aaf237be384a33374553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 6 Apr 2015 18:12:56 +0200
Subject: [PATCH] Don't shadow PreferenceFragment class name

I chose PreferencesFragment (plural) in concordance with PreferencesActivity.
---
 F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java     | 7 ++++---
 .../{PreferenceFragment.java => PreferencesFragment.java}  | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)
 rename F-Droid/src/org/fdroid/fdroid/views/fragments/{PreferenceFragment.java => PreferencesFragment.java} (99%)

diff --git a/F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java b/F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java
index 2f0dfc977..acb116138 100644
--- a/F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java
@@ -24,7 +24,8 @@ import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBarActivity;
 import android.view.MenuItem;
 import android.widget.LinearLayout;
-import org.fdroid.fdroid.views.fragments.PreferenceFragment;
+
+import org.fdroid.fdroid.views.fragments.PreferencesFragment;
 
 public class PreferencesActivity extends ActionBarActivity {
 
@@ -45,9 +46,9 @@ public class PreferencesActivity extends ActionBarActivity {
             // http://blog.perpetumdesign.com/2011/08/strange-case-of-dr-action-and-mr-bar.html
             setContentView(new LinearLayout(this));
 
-            PreferenceFragment preferenceFragment = new PreferenceFragment();
+            PreferencesFragment preferencesFragment = new PreferencesFragment();
             fm.beginTransaction()
-                    .add(android.R.id.content, preferenceFragment)
+                    .add(android.R.id.content, preferencesFragment)
                     .commit();
         }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
similarity index 99%
rename from F-Droid/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
rename to F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
index 275d379af..c17c9b887 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
@@ -9,14 +9,15 @@ import android.preference.ListPreference;
 import android.preference.Preference;
 import android.text.TextUtils;
 
+import android.support.v4.preference.PreferenceFragment;
+
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.PreferencesActivity;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.installer.CheckRootAsyncTask;
 import org.fdroid.fdroid.installer.Installer;
 
-public class PreferenceFragment
-        extends android.support.v4.preference.PreferenceFragment
+public class PreferencesFragment extends PreferenceFragment
         implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     private static final String[] summariesToUpdate = {