diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 34b22432..554ed881 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -138,17 +138,6 @@ THE SOFTWARE. - - - - - - - - - diff --git a/res/xml/preference_audio.xml b/res/xml/preference_audio.xml index 4354934c..91e57f9d 100644 --- a/res/xml/preference_audio.xml +++ b/res/xml/preference_audio.xml @@ -49,11 +49,10 @@ THE SOFTWARE. android:defaultValue="false" android:summary="@string/readahead_summary" /> - + diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml deleted file mode 100644 index be3816cf..00000000 --- a/res/xml/preferences.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java b/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java index b5bd32f8..6002da2f 100644 --- a/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java +++ b/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java @@ -71,16 +71,6 @@ public class PreferencesActivity extends PreferenceActivity { } } - public static class AudioActivity extends PreferenceActivity { - @SuppressWarnings("deprecation") - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.preference_audio); - } - } - public static class AudioFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) @@ -90,19 +80,16 @@ public class PreferencesActivity extends PreferenceActivity { } } - public static class ReplayGainActivity extends PreferenceActivity { - @SuppressWarnings("deprecation") - + public static class ReplayGainFragment extends PreferenceFragment { CheckBoxPreference cbTrackReplayGain; CheckBoxPreference cbAlbumReplayGain; SeekBarPreference sbGainBump; SeekBarPreference sbUntaggedDebump; - + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setTitle(R.string.replaygain); addPreferencesFromResource(R.xml.preference_replaygain); cbTrackReplayGain = (CheckBoxPreference)findPreference(PrefKeys.ENABLE_TRACK_REPLAYGAIN); @@ -122,13 +109,6 @@ public class PreferencesActivity extends PreferenceActivity { updateConfigWidgets(); } - @Override - public boolean onOptionsItemSelected(MenuItem item) - { - finish(); - return true; - } - private void updateConfigWidgets() { boolean rgOn = (cbTrackReplayGain.isChecked() || cbAlbumReplayGain.isChecked()); sbGainBump.setEnabled(rgOn); @@ -136,25 +116,6 @@ public class PreferencesActivity extends PreferenceActivity { } } - public static class ReplayGainFragment extends PreferenceFragment { - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.preference_replaygain); - } - } - - public static class PlaybackActivity extends PreferenceActivity { - @SuppressWarnings("deprecation") - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.preference_playback); - } - } - public static class PlaybackFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) @@ -164,16 +125,6 @@ public class PreferencesActivity extends PreferenceActivity { } } - public static class LibraryActivity extends PreferenceActivity { - @SuppressWarnings("deprecation") - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.preference_library); - } - } - public static class LibraryFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) @@ -183,16 +134,6 @@ public class PreferencesActivity extends PreferenceActivity { } } - public static class NotificationsActivity extends PreferenceActivity { - @SuppressWarnings("deprecation") - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.preference_notifications); - } - } - public static class NotificationsFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) @@ -202,16 +143,6 @@ public class PreferencesActivity extends PreferenceActivity { } } - public static class ShakeActivity extends PreferenceActivity { - @SuppressWarnings("deprecation") - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.preference_shake); - } - } - public static class ShakeFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) @@ -221,16 +152,6 @@ public class PreferencesActivity extends PreferenceActivity { } } - public static class CoverArtActivity extends PreferenceActivity { - @SuppressWarnings("deprecation") - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.preference_coverart); - } - } - public static class CoverArtFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) @@ -240,16 +161,6 @@ public class PreferencesActivity extends PreferenceActivity { } } - public static class MiscActivity extends PreferenceActivity { - @SuppressWarnings("deprecation") - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.preference_misc); - } - } - public static class MiscFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) @@ -259,20 +170,6 @@ public class PreferencesActivity extends PreferenceActivity { } } - public static class AboutActivity extends Activity { - @Override - public void onCreate(Bundle state) - { - super.onCreate(state); - - WebView view = new WebView(this); - view.getSettings().setJavaScriptEnabled(true); - view.loadUrl("file:///android_asset/about.html"); - view.setBackgroundColor(Color.TRANSPARENT); - setContentView(view); - } - } - public static class AboutFragment extends WebViewFragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)