Fixed the rest of the compiler type errors with the new version of actionbarsherlock (untested)

Conflicts:

	astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java

Author: sbosley

actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockListFragment.java

@@ -59,10 +59,20 @@ public void onPrepareOptionsMenu(Menu menu) {
     public final boolean onOptionsItemSelected(android.view.MenuItem item) {
         return onOptionsItemSelected(new MenuItemWrapper(item));
     }
+    
+    @Override
+    public final boolean onContextItemSelected(android.view.MenuItem item) {
+    	return onContextItemSelected(new MenuItemWrapper(item));
+    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         //Nothing to see here.
         return false;
     }
+
+    public boolean onContextItemSelected(MenuItem item) {
+    	//Nothing to see here.
+    	return false;
+    }
 }

astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java

@@ -22,7 +22,6 @@
 import android.graphics.PixelFormat;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
 import android.text.InputType;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -41,6 +40,7 @@
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.facebook.android.AsyncFacebookRunner;
 import com.facebook.android.AsyncFacebookRunner.RequestListener;
 import com.facebook.android.AuthListener;
@@ -97,7 +97,7 @@
  * @author Tim Su <[email protected]>
  *
  */
-public class ActFmLoginActivity extends FragmentActivity implements AuthListener {
+public class ActFmLoginActivity extends SherlockFragmentActivity implements AuthListener {
 
     public static final String APP_ID = "183862944961271"; //$NON-NLS-1$
 

astrid/plugin-src/com/todoroo/astrid/actfm/CommentsActivity.java

@@ -6,12 +6,12 @@
 package com.todoroo.astrid.actfm;
 
 import android.os.Bundle;
-import android.support.v4.app.ActionBar;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.MenuItem;
 import android.widget.TextView;
 
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.view.MenuItem;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.activity.AstridActivity;

astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java

@@ -13,15 +13,10 @@
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.v4.app.ActionBar;
-import android.support.v4.app.ListFragment;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.MenuInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -34,6 +29,11 @@
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockListFragment;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -50,7 +50,7 @@
 import com.todoroo.astrid.helper.ImageDiskCache;
 import com.todoroo.astrid.service.StatisticsService;
 
-public abstract class CommentsFragment extends ListFragment {
+public abstract class CommentsFragment extends SherlockListFragment {
 
 //    private TagData tagData;
     protected UpdateAdapter updateAdapter;

astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java

@@ -16,10 +16,6 @@
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.ActionBar;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -31,6 +27,10 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
@@ -70,7 +70,7 @@
 import com.todoroo.astrid.utility.ResourceDrawableCache;
 import com.todoroo.astrid.welcome.HelpInfoPopover;
 
-public class TagSettingsActivity extends FragmentActivity {
+public class TagSettingsActivity extends SherlockFragmentActivity {
 
     public static final String TOKEN_NEW_FILTER = "newFilter"; //$NON-NLS-1$
 

astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java

@@ -18,8 +18,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
@@ -32,6 +30,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;

astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java

@@ -22,20 +22,20 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.app.ActionBar;
-import android.support.v4.app.FragmentActivity;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnCreateContextMenuListener;
 import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.MenuItem;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.Property.CountProperty;
 import com.todoroo.andlib.service.Autowired;
@@ -66,7 +66,7 @@
  * @author Tim Su <[email protected]>
  *
  */
-public class CustomFilterActivity extends FragmentActivity {
+public class CustomFilterActivity extends SherlockFragmentActivity {
 
     private static final String IDENTIFIER_TITLE = "title"; //$NON-NLS-1$
     private static final String IDENTIFIER_IMPORTANCE = "importance"; //$NON-NLS-1$
@@ -519,7 +519,7 @@ private <V> V getNth(int index, Map<?,V> map) {
     }
 
     @Override
-    public boolean onOptionsItemSelected(android.support.v4.view.MenuItem item) {
+    public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             finish();
             return true;
@@ -528,7 +528,7 @@ public boolean onOptionsItemSelected(android.support.v4.view.MenuItem item) {
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem item) {
+    public boolean onContextItemSelected(android.view.MenuItem item) {
         if(item.getGroupId() == MENU_GROUP_FILTER) {
             // give an initial value for the row before adding it
             CustomFilterCriterion criterion = getNth(item.getItemId(), criteria);

astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java

@@ -9,9 +9,9 @@
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.view.Menu;
 import android.widget.TextView;
 
+import com.actionbarsherlock.view.Menu;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;

astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java

@@ -8,12 +8,12 @@
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Intent;
-import android.support.v4.view.Menu;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.actionbarsherlock.view.Menu;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.DateUtilities;

astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java

@@ -5,15 +5,15 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
 import android.text.TextUtils;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;

astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java

@@ -30,9 +30,6 @@
 import android.os.Handler;
 import android.os.Message;
 import android.provider.Settings;
-import android.support.v4.app.ActionBar;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.MenuItem;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
@@ -51,6 +48,9 @@
 import android.widget.PopupWindow.OnDismissListener;
 import android.widget.TextView;
 
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.MenuItem;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -73,7 +73,7 @@
 import com.todoroo.astrid.ui.FragmentPopover;
 import com.todoroo.astrid.welcome.HelpInfoPopover;
 
-public class TaskRabbitActivity extends FragmentActivity {
+public class TaskRabbitActivity extends SherlockFragmentActivity {
 
 
     public interface TaskRabbitSetListener {

astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitOAuthLoginActivity.java

@@ -9,11 +9,11 @@
 import android.content.Intent;
 import android.net.http.SslError;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -28,7 +28,7 @@
  * @author timsu
  *
  */
-public class TaskRabbitOAuthLoginActivity extends FragmentActivity {
+public class TaskRabbitOAuthLoginActivity extends SherlockFragmentActivity {
 
     /**
      * URL to display

astrid/src/com/todoroo/astrid/activity/AddOnActivity.java

@@ -12,15 +12,15 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.ActionBar;
-import android.support.v4.app.ActionBar.Tab;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.MenuItem;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ListView;
 
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.ActionBar.Tab;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.MenuItem;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -37,7 +37,7 @@
  * @author Tim Su <[email protected]>
  *
  */
-public class AddOnActivity extends FragmentActivity {
+public class AddOnActivity extends SherlockFragmentActivity {
 
     /** boolean: whether to start on available page */
     public static final String TOKEN_START_WITH_AVAILABLE = "av"; //$NON-NLS-1$

astrid/src/com/todoroo/astrid/activity/AstridActivity.java

@@ -12,14 +12,14 @@
 import android.os.Bundle;
 import android.speech.SpeechRecognizer;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.view.View;
 import android.view.WindowManager.BadTokenException;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.timsu.astrid.R;
 import com.todoroo.aacenc.RecognizerApi.RecognizerApiListener;
 import com.todoroo.andlib.service.Autowired;
@@ -60,7 +60,7 @@
  * @author Arne
  *
  */
-public class AstridActivity extends FragmentActivity
+public class AstridActivity extends SherlockFragmentActivity
     implements FilterListFragment.OnFilterItemClickedListener,
     TaskListFragment.OnTaskListItemClickedListener,
     RecognizerApiListener {

astrid/src/com/todoroo/astrid/activity/FilterListFragment.java

@@ -18,11 +18,6 @@
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.SupportActivity;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
 import android.util.DisplayMetrics;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -43,6 +38,9 @@
 import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
 
+import com.actionbarsherlock.app.SherlockListFragment;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -68,7 +66,7 @@
  * @author Tim Su <[email protected]>
  *
  */
-public class FilterListFragment extends ListFragment {
+public class FilterListFragment extends SherlockListFragment {
 
     public static final String TAG_FILTERLIST_FRAGMENT = "filterlist_fragment"; //$NON-NLS-1$
 
@@ -115,7 +113,7 @@ public FilterListFragment() {
     }
 
     @Override
-    public void onAttach(SupportActivity activity) {
+    public void onAttach(Activity activity) {
         super.onAttach(activity);
         // Check that the container activity has implemented the callback interface
         try {
@@ -395,7 +393,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                 return true;
             }
             default: {
-                Fragment tasklist = getSupportFragmentManager().findFragmentByTag(TaskListFragment.TAG_TASKLIST_FRAGMENT);
+                TaskListFragment tasklist = (TaskListFragment) getActivity().getSupportFragmentManager().findFragmentByTag(TaskListFragment.TAG_TASKLIST_FRAGMENT);
                 if (tasklist != null && tasklist.isInLayout())
                     return tasklist.onOptionsItemSelected(item);
             }