Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't shadow PreferenceFragment class name

Browse Source 
I chose PreferencesFragment (plural) in concordance with PreferencesActivity.
This commit is contained in:
Daniel Martí 2015-04-06 18:12:56 +02:00
parent dc86129cca
commit b18231c25d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java
View File

@ -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();
}

5
F-Droid/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java → F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
View File

@ -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 = {