Revert "added preference fragment at end of main activity"

This reverts commit b6f0fa9.
thasmin · Jul 2, 2012 · 1c5e64b · 1c5e64b
1 parent b6f0fa9
commit 1c5e64b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 282 deletions.
diff --git a/res/layout/preference_list.xml b/res/layout/preference_list.xml
diff --git a/src/com/axelby/podax/ui/MainActivity.java b/src/com/axelby/podax/ui/MainActivity.java
@@ -33,8 +33,7 @@ public class MainActivity extends SherlockFragmentActivity {
 	public static final int TAB_SUBSCRIPTIONS = 2;
 	public static final int TAB_DOWNLOADS = 3;
 	public static final int TAB_ABOUT = 4;
-	public static final int TAB_PREFERENCES = 5;
-	private static final int TAB_COUNT = 6;
+	private static final int TAB_COUNT = 5;
 
 	protected int _focusedPage;
 
@@ -151,8 +150,7 @@ public TabsAdapter(FragmentManager fm) {
 					resources.getString(R.string.queue),
 					resources.getString(R.string.subscriptions),
 					resources.getString(R.string.downloads),
-					resources.getString(R.string.about),
-					resources.getString(R.string.preferences)
+					resources.getString(R.string.about)
 			};
 		}
 
@@ -169,12 +167,6 @@ public Fragment getItem(int item) {
 				return new ActiveDownloadListFragment();
 			case TAB_ABOUT:
 				return new AboutFragment();
-			case TAB_PREFERENCES:
-				Fragment preferenceFragment = new PreferenceFragment();
-				Bundle args = new Bundle();
-				args.putInt("xml", R.xml.preferences);
-				preferenceFragment.setArguments(args);
-				return preferenceFragment;
 			}
 			throw new IllegalArgumentException();
 		}

diff --git a/src/com/axelby/podax/ui/PreferenceFragment.java b/src/com/axelby/podax/ui/PreferenceFragment.java