Further Migration to ABS 4.0.1 - Updated remaining Fragments and

Activities. They now extend the correct classes

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4c1ac1c..2d34a93 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -52,7 +52,8 @@
                 </data>\r
             </intent-filter>\r
         </activity>\r
-        <activity android:name=".ui.activity.Preferences" >\r
+        <activity android:name=".ui.activity.Preferences" \r
+            android:theme="@style/Theme.ownCloud">\r
         </activity>\r
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >\r
         </activity>\r

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
index d8383a3..08710c5 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
@@ -18,20 +18,22 @@
 package eu.alefzero.owncloud.ui.activity;\r
 \r
 \r
-import eu.alefzero.owncloud.R;\r
-import eu.alefzero.owncloud.ui.fragment.FileDetail;\r
 import android.os.Bundle;\r
-import android.support.v4.app.FragmentActivity;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.view.Window;\r
 \r
+import com.actionbarsherlock.app.SherlockFragmentActivity;\r
+\r
+import eu.alefzero.owncloud.R;\r
+import eu.alefzero.owncloud.ui.fragment.FileDetail;\r
+\r
 /**\r
  * This activity displays the details of a file like\r
  * its name, its size and so on.\r
  * @author Bartek Przybylski\r
  *\r
  */\r
-public class FileDetailActivity extends FragmentActivity {\r
+public class FileDetailActivity extends SherlockFragmentActivity {\r
   private FileDetail mFileDetail;\r
   \r
 @Override\r

diff --git a/src/eu/alefzero/owncloud/ui/activity/LandingActivity.java b/src/eu/alefzero/owncloud/ui/activity/LandingActivity.java
index d4301d1..5260a5c 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/LandingActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/LandingActivity.java
@@ -17,6 +17,8 @@
  */\r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
+import com.actionbarsherlock.app.SherlockFragmentActivity;\r
+\r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
@@ -25,7 +27,6 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;\r
 import android.content.Intent;\r
 import android.os.Bundle;\r
-import android.support.v4.app.FragmentActivity;\r
 import android.view.View;\r
 import android.widget.AdapterView;\r
 import android.widget.AdapterView.OnItemClickListener;\r
@@ -40,7 +41,7 @@ import eu.alefzero.owncloud.ui.adapter.LandingScreenAdapter;
  * @author Lennart Rosam\r
  * \r
  */\r
-public class LandingActivity extends FragmentActivity implements OnClickListener, OnItemClickListener {\r
+public class LandingActivity extends SherlockFragmentActivity implements OnClickListener, OnItemClickListener {\r
 \r
        public static final int DIALOG_SETUP_ACCOUNT = 1;\r
        \r

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 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
@@ -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.preference.PreferenceActivity;\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.View;\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
-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
@@ -119,7 +120,7 @@ public class Preferences extends PreferenceActivity {
   @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
@@ -183,8 +184,8 @@ public class Preferences extends PreferenceActivity {
     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

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
index 1f7368e..5e729ff 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
@@ -24,15 +24,17 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
-import android.support.v4.app.Fragment;\r
 import android.view.LayoutInflater;\r
 import android.view.View;\r
-import android.view.ViewGroup;\r
 import android.view.View.OnClickListener;\r
+import android.view.ViewGroup;\r
 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r
 import android.widget.VideoView;\r
+\r
+import com.actionbarsherlock.app.SherlockFragment;\r
+\r
 import eu.alefzero.owncloud.DisplayUtils;\r
 import eu.alefzero.owncloud.FileDownloader;\r
 import eu.alefzero.owncloud.R;\r
@@ -43,7 +45,7 @@ import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
  * @author Bartek Przybylski\r
  *\r
  */\r
-public class FileDetail extends Fragment implements OnClickListener {\r
+public class FileDetail extends SherlockFragment implements OnClickListener {\r
   \r
   private Intent mIntent;\r
   private View mView;\r

diff --git a/src/eu/alefzero/owncloud/ui/fragment/LandingPageFragment.java b/src/eu/alefzero/owncloud/ui/fragment/LandingPageFragment.java
index eaa6f5e..e9dee71 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/LandingPageFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/LandingPageFragment.java
@@ -17,8 +17,9 @@
  */\r
 package eu.alefzero.owncloud.ui.fragment;\r
 \r
+import com.actionbarsherlock.app.SherlockFragment;\r
+\r
 import android.os.Bundle;\r
-import android.support.v4.app.Fragment;\r
 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
@@ -34,7 +35,7 @@ import eu.alefzero.owncloud.ui.adapter.LandingScreenAdapter;
  * @author Lennart Rosam\r
  *\r
  */\r
-public class LandingPageFragment extends Fragment {\r
+public class LandingPageFragment extends SherlockFragment {\r
 \r
        @Override\r
        public View onCreateView(LayoutInflater inflater, ViewGroup container,\r