norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

remove legacy preferences activities

Browse Source
This commit is contained in:
Adrian Ulrich 2015-04-12 14:11:47 +02:00
parent cf30845599
commit cffbb1b3f8
4 changed files with 4 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AndroidManifest.xml
View File

@ -138,17 +138,6 @@ THE SOFTWARE.
<activity <activity
android:name="PreferencesActivity" android:name="PreferencesActivity"
android:theme="@style/BackActionBar" /> android:theme="@style/BackActionBar" />
<activity
android:name="PreferencesActivity$ReplayGainActivity"
android:theme="@style/BackActionBar" />
<activity android:name="PreferencesActivity$AudioActivity" />
<activity android:name="PreferencesActivity$PlaybackActivity" />
<activity android:name="PreferencesActivity$LibraryActivity" />
<activity android:name="PreferencesActivity$NotificationsActivity" />
<activity android:name="PreferencesActivity$ShakeActivity" />
<activity android:name="PreferencesActivity$CoverArtActivity" />
<activity android:name="PreferencesActivity$MiscActivity" />
<activity android:name="PreferencesActivity$AboutActivity" />
<activity <activity
android:name="TabOrderActivity" android:name="TabOrderActivity"
android:theme="@style/BackActionBar" /> android:theme="@style/BackActionBar" />

5
res/xml/preference_audio.xml
View File

@ -49,11 +49,10 @@ THE SOFTWARE.
android:defaultValue="false" android:defaultValue="false"
android:summary="@string/readahead_summary" /> android:summary="@string/readahead_summary" />
<PreferenceScreen <PreferenceScreen
android:fragment="ch.blinkenlights.android.vanilla.PreferencesActivity$ReplayGainFragment"
android:title="@string/replaygain" android:title="@string/replaygain"
android:summary="@string/replaygain_summary"> android:summary="@string/replaygain_summary">
<intent
android:targetPackage="ch.blinkenlights.android.vanilla"
android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$ReplayGainActivity" />
</PreferenceScreen> </PreferenceScreen>
</PreferenceScreen> </PreferenceScreen>

72
res/xml/preferences.xml
View File

@ -1,72 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<!--
Copyright (C) 2012 Christopher Eby <kreed@kreed.org>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen
android:title="@string/audio">
<intent
android:targetPackage="ch.blinkenlights.android.vanilla"
android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$AudioActivity" />
</PreferenceScreen>
<PreferenceScreen
android:title="@string/playback_screen">
<intent
android:targetPackage="ch.blinkenlights.android.vanilla"
android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$PlaybackActivity" />
</PreferenceScreen>
<PreferenceScreen
android:title="@string/library_screen">
<intent
android:targetPackage="ch.blinkenlights.android.vanilla"
android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$LibraryActivity" />
</PreferenceScreen>
<PreferenceScreen
android:title="@string/notifications">
<intent
android:targetPackage="ch.blinkenlights.android.vanilla"
android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$NotificationsActivity" />
</PreferenceScreen>
<PreferenceScreen
android:title="@string/accelerometer_shake">
<intent
android:targetPackage="ch.blinkenlights.android.vanilla"
android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$ShakeActivity" />
</PreferenceScreen>
<PreferenceScreen
android:title="@string/cover_art">
<intent
android:targetPackage="ch.blinkenlights.android.vanilla"
android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$CoverArtActivity" />
</PreferenceScreen>
<PreferenceScreen
android:title="@string/misc_features">
<intent
android:targetPackage="ch.blinkenlights.android.vanilla"
android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$MiscActivity" />
</PreferenceScreen>
<PreferenceScreen
android:title="@string/about">
<intent
android:targetPackage="ch.blinkenlights.android.vanilla"
android:targetClass="ch.blinkenlights.android.vanilla.PreferencesActivity$AboutActivity" />
</PreferenceScreen>
</PreferenceScreen>

105
src/ch/blinkenlights/android/vanilla/PreferencesActivity.java
View File

@ -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 { public static class AudioFragment extends PreferenceFragment {
@Override @Override
public void onCreate(Bundle savedInstanceState) public void onCreate(Bundle savedInstanceState)
@ -90,9 +80,7 @@ public class PreferencesActivity extends PreferenceActivity {
} }
} }
public static class ReplayGainActivity extends PreferenceActivity { public static class ReplayGainFragment extends PreferenceFragment {
@SuppressWarnings("deprecation")
CheckBoxPreference cbTrackReplayGain; CheckBoxPreference cbTrackReplayGain;
CheckBoxPreference cbAlbumReplayGain; CheckBoxPreference cbAlbumReplayGain;
SeekBarPreference sbGainBump; SeekBarPreference sbGainBump;
@ -102,7 +90,6 @@ public class PreferencesActivity extends PreferenceActivity {
public void onCreate(Bundle savedInstanceState) public void onCreate(Bundle savedInstanceState)
{ {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setTitle(R.string.replaygain);
addPreferencesFromResource(R.xml.preference_replaygain); addPreferencesFromResource(R.xml.preference_replaygain);
cbTrackReplayGain = (CheckBoxPreference)findPreference(PrefKeys.ENABLE_TRACK_REPLAYGAIN); cbTrackReplayGain = (CheckBoxPreference)findPreference(PrefKeys.ENABLE_TRACK_REPLAYGAIN);
@ -122,13 +109,6 @@ public class PreferencesActivity extends PreferenceActivity {
updateConfigWidgets(); updateConfigWidgets();
} }
@Override
public boolean onOptionsItemSelected(MenuItem item)
{
finish();
return true;
}
private void updateConfigWidgets() { private void updateConfigWidgets() {
boolean rgOn = (cbTrackReplayGain.isChecked() || cbAlbumReplayGain.isChecked()); boolean rgOn = (cbTrackReplayGain.isChecked() || cbAlbumReplayGain.isChecked());
sbGainBump.setEnabled(rgOn); 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 { public static class PlaybackFragment extends PreferenceFragment {
@Override @Override
public void onCreate(Bundle savedInstanceState) 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 { public static class LibraryFragment extends PreferenceFragment {
@Override @Override
public void onCreate(Bundle savedInstanceState) 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 { public static class NotificationsFragment extends PreferenceFragment {
@Override @Override
public void onCreate(Bundle savedInstanceState) 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 { public static class ShakeFragment extends PreferenceFragment {
@Override @Override
public void onCreate(Bundle savedInstanceState) 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 { public static class CoverArtFragment extends PreferenceFragment {
@Override @Override
public void onCreate(Bundle savedInstanceState) 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 { public static class MiscFragment extends PreferenceFragment {
@Override @Override
public void onCreate(Bundle savedInstanceState) 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 { public static class AboutFragment extends WebViewFragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)