Further Migration to ABS 4.0.1 - Updated remaining Fragments and

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / Preferences.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/Preferences.java b/src/eu/alefzero/owncloud/ui/activity/Preferences.java
index 3677f8a..abb5b8a 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/Preferences.java
+++ b/src/eu/alefzero/owncloud/ui/activity/Preferences.java
@@ -21,12 +21,6 @@ import java.net.URI;
 import java.net.URISyntaxException;\r
 import java.util.Vector;\r
 \r
 import java.net.URISyntaxException;\r
 import java.util.Vector;\r
 \r

-import eu.alefzero.owncloud.OwnCloudSession;\r
-import eu.alefzero.owncloud.R;\r
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
-import eu.alefzero.owncloud.authenticator.AuthUtils;\r
-import eu.alefzero.owncloud.db.DbHandler;\r
-\r

 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.Activity;\r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.Activity;\r


@@ -34,23 +28,30 @@ import android.content.Intent;
 import android.os.Bundle;\r
 import android.preference.ListPreference;\r
 import android.preference.Preference;\r
 import android.os.Bundle;\r
 import android.preference.ListPreference;\r
 import android.preference.Preference;\r

-import android.preference.PreferenceActivity;\r

 import android.preference.PreferenceScreen;\r
 import android.util.Log;\r
 import android.view.ContextMenu;\r
 import android.preference.PreferenceScreen;\r
 import android.util.Log;\r
 import android.view.ContextMenu;\r

-import android.view.Menu;\r
-import android.view.MenuInflater;\r
-import android.view.MenuItem;\r
-import android.view.View;\r

 import android.view.ContextMenu.ContextMenuInfo;\r
 import android.view.ContextMenu.ContextMenuInfo;\r

+import android.view.View;\r

 import android.widget.AdapterView.AdapterContextMenuInfo;\r
 \r
 import android.widget.AdapterView.AdapterContextMenuInfo;\r
 \r

+import com.actionbarsherlock.app.SherlockPreferenceActivity;\r
+import com.actionbarsherlock.view.Menu;\r
+import com.actionbarsherlock.view.MenuInflater;\r
+import com.actionbarsherlock.view.MenuItem;\r
+\r
+import eu.alefzero.owncloud.OwnCloudSession;\r
+import eu.alefzero.owncloud.R;\r
+import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
+import eu.alefzero.owncloud.authenticator.AuthUtils;\r
+import eu.alefzero.owncloud.db.DbHandler;\r
+\r

 /**\r
  * An Activity that allows the user to change the application's settings.\r
  * @author Bartek Przybylski\r
  *\r
  */\r
 /**\r
  * An Activity that allows the user to change the application's settings.\r
  * @author Bartek Przybylski\r
  *\r
  */\r

-public class Preferences extends PreferenceActivity {\r
+public class Preferences extends SherlockPreferenceActivity {\r

   private static final String TAG = "OwnCloudPreferences";\r
   private final int mNewSession = 47;\r
   private final int mEditSession = 48;\r
   private static final String TAG = "OwnCloudPreferences";\r
   private final int mNewSession = 47;\r
   private final int mEditSession = 48;\r


@@ -119,7 +120,7 @@ public class Preferences extends PreferenceActivity {
   @Override\r
   public boolean onCreateOptionsMenu(Menu menu) {\r
     super.onCreateOptionsMenu(menu);\r
   @Override\r
   public boolean onCreateOptionsMenu(Menu menu) {\r
     super.onCreateOptionsMenu(menu);\r

-    MenuInflater inflater = getMenuInflater();\r
+    MenuInflater inflater = getSherlock().getMenuInflater();\r

     inflater.inflate(R.menu.prefs_menu, menu);\r
     return true;\r
   }\r
     inflater.inflate(R.menu.prefs_menu, menu);\r
     return true;\r
   }\r


@@ -183,8 +184,8 @@ public class Preferences extends PreferenceActivity {
     mSelectedMenuItem = info.position-1;\r
     menu.setHeaderTitle(mSessions.get(mSelectedMenuItem).getName());\r
     \r
     mSelectedMenuItem = info.position-1;\r
     menu.setHeaderTitle(mSessions.get(mSelectedMenuItem).getName());\r
     \r

-    MenuInflater inflater = getMenuInflater();\r
-    inflater.inflate(R.menu.session_context_menu, menu);\r
+    MenuInflater inflater = getSherlock().getMenuInflater();\r
+    inflater.inflate(R.menu.session_context_menu, (Menu) menu);\r

     \r
   }\r
   \r
     \r
   }\r
   \r