Updated ActionBarSherlock to 4.2.0

android/AndroidManifest.xml

@@ -22,7 +22,7 @@
 	android:versionCode="154"
 	android:installLocation="auto">
 	
-	<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="13" />
+	<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16" />
 	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" 
 		android:xlargeScreens="true" android:anyDensity="true" />
 	<uses-permission android:name="android.permission.INTERNET" />
@@ -36,6 +36,7 @@
 		android:label="Transdroid Torrent Manager" 
 		android:description="@string/description"
 		android:theme="@style/Theme.Transdroid"
+		android:logo="@drawable/pixel"
 		android:hardwareAccelerated="false">
 
 		<activity 

android/project.properties

@@ -10,6 +10,6 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-13
+target=android-16
 apk-configurations=
 android.library.reference.1=../external/JakeWharton-ActionBarSherlock/library

android/res/values-v11/themes.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+	<style name="Theme.Transdroid" parent="@style/Theme.Sherlock">
+	    <item name="android:windowBackground">@color/WindowBackgroundColor</item>
+		<item name="android:actionBarStyle">@style/Widget.Styled.ActionBar</item>
+		<item name="actionBarStyle">@style/Widget.Styled.ActionBar</item>
+        <item name="actionBarItemBackground">@drawable/title_button</item>
+	</style>
+	<style name="Theme.Transdroid.NoTitle" parent="@style/Theme.Sherlock">
+		<item name="android:windowNoTitle">true</item>
+	</style>
+	<style name="Widget.Styled.ActionBar" parent="Widget.Sherlock.Light.ActionBar">
+		<item name="android:displayOptions">useLogo|showHome</item>
+		<item name="displayOptions">useLogo|showHome</item>
+		<item name="background">@color/TitleBackgroundColor</item>
+		<item name="android:background">@color/TitleBackgroundColor</item>
+		<item name="android:textAppearance">@style/WindowTitleText</item>
+	</style>
+</resources>

android/res/values-v14/themes.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+	<style name="Theme.Transdroid" parent="@style/Theme.Sherlock">
+	    <item name="android:windowBackground">@color/WindowBackgroundColor</item>
+		<item name="android:actionBarStyle">@style/Widget.Styled.ActionBar</item>
+		<item name="actionBarStyle">@style/Widget.Styled.ActionBar</item>
+        <item name="android:actionBarItemBackground">@drawable/title_button</item>
+        <item name="actionBarItemBackground">@drawable/title_button</item>
+	</style>
+	<style name="Theme.Transdroid.NoTitle" parent="@style/Theme.Sherlock">
+		<item name="android:windowNoTitle">true</item>
+	</style>
+	<style name="Widget.Styled.ActionBar" parent="Widget.Sherlock.Light.ActionBar">
+		<item name="android:displayOptions">useLogo|showHome</item>
+		<item name="displayOptions">useLogo|showHome</item>
+		<item name="background">@color/TitleBackgroundColor</item>
+		<item name="android:background">@color/TitleBackgroundColor</item>
+		<item name="android:textAppearance">@style/WindowTitleText</item>
+	</style>
+</resources>

android/res/values/themes.xml

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 	<style name="Theme.Transdroid" parent="@style/Theme.Sherlock">
 	    <item name="android:windowBackground">@color/WindowBackgroundColor</item>
-	    <item name="abLogo">@drawable/pixel</item>
-		<item name="abTitleTextStyle">@style/WindowTitleText</item>
-		<item name="abDisplayOptions">showHome|useLogo</item>
-		<item name="abBackground">@color/TitleBackgroundColor</item>
-		<item name="actionSpinnerItemStyle">@style/WindowTitleText</item>
-		<item name="selectableItemBackground">@drawable/title_button</item>
+		<item name="actionBarStyle">@style/Widget.Styled.ActionBar</item>
+        <item name="actionBarItemBackground">@drawable/title_button</item>
 	</style>
 	<style name="Theme.Transdroid.NoTitle" parent="@style/Theme.Sherlock">
 		<item name="android:windowNoTitle">true</item>
 	</style>
+	<style name="Widget.Styled.ActionBar" parent="Widget.Sherlock.Light.ActionBar">
+		<item name="displayOptions">useLogo|showHome</item>
+		<item name="background">@color/TitleBackgroundColor</item>
+		<item name="android:background">@color/TitleBackgroundColor</item>
+		<item name="android:textAppearance">@style/WindowTitleText</item>
+	</style>
 </resources>

android/src/org/transdroid/gui/Details.java

@@ -22,10 +22,11 @@ import org.transdroid.daemon.Torrent;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
 
-public class Details extends FragmentActivity {
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
+public class Details extends SherlockFragmentActivity {
 
 	//private static final String LOG_NAME = "Details";
 

android/src/org/transdroid/gui/DetailsFragment.java

@@ -42,6 +42,7 @@ import org.transdroid.gui.util.SelectableArrayAdapter.OnSelectedChangedListener;
 import org.transdroid.preferences.Preferences;
 import org.transdroid.util.TLog;
 
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -50,27 +51,29 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
-import android.view.MenuInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.Toast;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.AdapterView.OnItemClickListener;
 
-public class DetailsFragment extends Fragment implements IDaemonCallback, OnSelectedChangedListener {
+import com.actionbarsherlock.app.SherlockFragment;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+
+@SuppressLint("ValidFragment")
+public class DetailsFragment extends SherlockFragment implements IDaemonCallback, OnSelectedChangedListener {
 
 	private static final String LOG_NAME = "Details fragment";
 
@@ -172,7 +175,7 @@ public class DetailsFragment extends Fragment implements IDaemonCallback, OnSele
 
 		// Show the torrent details
 		getListView().setAdapter(new DetailsListAdapter(this, torrent, fineDetails));
-		getSupportActivity().setTitle(torrent.getName());
+		getSherlockActivity().setTitle(torrent.getName());
 
 		if (Daemon.supportsFileListing(daemon.getType())) {
 
@@ -675,11 +678,11 @@ public class DetailsFragment extends Fragment implements IDaemonCallback, OnSele
 			}
 			// Close this details fragment
 			if (torrentsFragment != null) {
-				FragmentTransaction ft = getSupportActivity().getSupportFragmentManager().beginTransaction();
+				FragmentTransaction ft = getSherlockActivity().getSupportFragmentManager().beginTransaction();
 				ft.remove(this);
 				ft.commit();
 			} else {
-				getSupportActivity().getSupportFragmentManager().popBackStack();
+				getSherlockActivity().getSupportFragmentManager().popBackStack();
 			}
 			break;
 
@@ -804,14 +807,14 @@ public class DetailsFragment extends Fragment implements IDaemonCallback, OnSele
 	}
 
 	public void showDialog(int id) {
-		new DialogWrapper(onCreateDialog(id)).show(getSupportActivity().getSupportFragmentManager(), DialogWrapper.TAG
+		new DialogWrapper(onCreateDialog(id)).show(getSherlockActivity().getSupportFragmentManager(), DialogWrapper.TAG
 			+ id);
 	}
 
 	protected void dismissDialog(int id) {
 		// Remove the dialog wrapper fragment for the dialog's ID
-		getSupportActivity().getSupportFragmentManager().beginTransaction().remove(
-			getSupportActivity().getSupportFragmentManager().findFragmentByTag(DialogWrapper.TAG + id)).commit();
+		getSherlockActivity().getSupportFragmentManager().beginTransaction().remove(
+				getSherlockActivity().getSupportFragmentManager().findFragmentByTag(DialogWrapper.TAG + id)).commit();
 	}
 
 }

android/src/org/transdroid/gui/Torrents.java

@@ -21,17 +21,18 @@ import org.transdroid.R;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.ActionBar;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
 
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
 /**
  * Activity that loads the torrents fragment and, on tablet interfaces, hosts
  * the details fragment.
  * 
  * @author erickok
  */
-public class Torrents extends FragmentActivity {
+public class Torrents extends SherlockFragmentActivity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

android/src/org/transdroid/gui/TorrentsFragment.java

@@ -92,18 +92,13 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActionBar.OnNavigationListener;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
-import android.support.v4.view.SubMenu;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.LayoutInflater;
-import android.view.MenuInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -123,6 +118,13 @@ import android.widget.TableLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
+import com.actionbarsherlock.app.SherlockFragment;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.view.SubMenu;
+
 /**
  * The main screen for the Transdroid application and provides most on-the-surface functionality 
  * as well. Server daemon and search engine communication is wrapped in adapters.
@@ -130,7 +132,7 @@ import android.widget.Toast;
  * @author erickok
  *
  */
-public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTouchListener {
+public class TorrentsFragment extends SherlockFragment implements IDaemonCallback, OnTouchListener {
 
 	private static final String LOG_NAME = "Main";
 	
@@ -468,7 +470,7 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 
     	// Update the navigation list of the action bar
     	ignoreFirstListNavigation = true;
-    	getSupportActivity().getSupportActionBar().setListNavigationCallbacks(buildServerListAdapter(), onServerChanged );
+    	getSherlockActivity().getSupportActionBar().setListNavigationCallbacks(buildServerListAdapter(), onServerChanged );
     	
     }
     
@@ -485,7 +487,7 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
         	
     		// Show which server configuration is currently active
         	ignoreFirstListNavigation = true;
-        	getSupportActivity().getSupportActionBar().setSelectedNavigationItem(lastUsedDaemonSettings);
+        	getSherlockActivity().getSupportActionBar().setSelectedNavigationItem(lastUsedDaemonSettings);
         	
 			// Show the control bar
         	startsettings.setVisibility(View.GONE);
@@ -493,7 +495,7 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 			statusBox.setVisibility(View.GONE);
 			activeLabel = null;
 			inAlternativeMode = false; // TODO: Actually this should be retrieved from the server's session
-			getSupportActivity().invalidateOptionsMenu();
+			getSherlockActivity().supportInvalidateOptionsMenu();
 
         } else {
         	
@@ -504,7 +506,7 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
         	
 			// Show that no server configuration is currently active
         	ignoreFirstListNavigation = true;
-        	getSupportActivity().getSupportActionBar().setListNavigationCallbacks(null, onServerChanged);
+        	getSherlockActivity().getSupportActionBar().setListNavigationCallbacks(null, onServerChanged);
         	statusBox.setVisibility(View.GONE);
 			viewtype.setText("");
 
@@ -512,7 +514,7 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
         	startsettings.setVisibility(View.VISIBLE);
         	controlbar.setVisibility(View.GONE);
 			activeLabel = null;
-			getSupportActivity().invalidateOptionsMenu();
+			getSherlockActivity().supportInvalidateOptionsMenu();
 			
         }
 
@@ -790,7 +792,7 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(android.support.v4.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 
 		// Check connection first (when not opening the settings)
 		if (item.getItemId() != MENU_SETTINGS_ID && 
@@ -815,7 +817,7 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 			break;
 			
 		case MENU_SEARCH_ID:
-			getSupportActivity().onSearchRequested();
+			getSherlockActivity().onSearchRequested();
 			break;
 			
 		case MENU_ALTMODE_ID:
@@ -1009,7 +1011,7 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 	    		
 		    	// Show the details in the right of the screen (tablet interface) or separately
 		    	if (useTabletInterface) {
-		    		FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+		    		FragmentTransaction ft = getSherlockActivity().getSupportFragmentManager().beginTransaction();
 		    		ft.replace(R.id.details, new DetailsFragment(TorrentsFragment.this, lastUsedDaemonSettings, tor, 
 		    				buildLabelTexts(false)));
 		    		ft.commit();
@@ -1429,9 +1431,9 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 
 	private void refreshActivity() {
 		updateTorrentList();
-		if (getSupportFragmentManager().findFragmentById(R.id.details) != null) {
+		if (getSherlockActivity().getSupportFragmentManager().findFragmentById(R.id.details) != null) {
 			// Marshal the refresh button click to the fragment
-			((DetailsFragment)getSupportFragmentManager().findFragmentById(R.id.details)).refreshActivity();
+			((DetailsFragment)getSherlockActivity().getSupportFragmentManager().findFragmentById(R.id.details)).refreshActivity();
 		}
 	}
 
@@ -1855,7 +1857,7 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 
 	private void updateAlternativeModeIcon() {
 		// By invalidation the options menu it gets redrawn and the turtle icon gets updated
-		getSupportActivity().invalidateOptionsMenu();
+		getSherlockActivity().supportInvalidateOptionsMenu();
 	}
 	
 	/**
@@ -1987,9 +1989,9 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 		
 		// Clear the old details fragment
 		if (useTabletInterface) {
-			Fragment f = getSupportFragmentManager().findFragmentById(R.id.details);
+			Fragment f = getSherlockActivity().getSupportFragmentManager().findFragmentById(R.id.details);
 			if (f != null) {
-				FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+				FragmentTransaction ft = getSherlockActivity().getSupportFragmentManager().beginTransaction();
 				ft.remove(f);
 				ft.commit();
 			}
@@ -2118,8 +2120,8 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 
 	private void setProgressBar(boolean b) {
 		inProgress  = b;
-		if (getSupportActivity() != null)
-			getSupportActivity().invalidateOptionsMenu();
+		if (getSherlockActivity() != null)
+			getSherlockActivity().supportInvalidateOptionsMenu();
 	}
 
 	protected View findViewById(int id) {
@@ -2154,13 +2156,13 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 	}
 
 	public void showDialog(int id) {
-		new DialogWrapper(onCreateDialog(id)).show(getSupportActivity().getSupportFragmentManager(), DialogWrapper.TAG + id);
+		new DialogWrapper(onCreateDialog(id)).show(getSherlockActivity().getSupportFragmentManager(), DialogWrapper.TAG + id);
 	}
 
 	protected void dismissDialog(int id) {
 		// Remove the dialog wrapper fragment for the dialog's ID
-		getSupportActivity().getSupportFragmentManager().beginTransaction().remove(
-			getSupportActivity().getSupportFragmentManager().findFragmentByTag(DialogWrapper.TAG + id)).commit();
+		getSherlockActivity().getSupportFragmentManager().beginTransaction().remove(
+				getSherlockActivity().getSupportFragmentManager().findFragmentByTag(DialogWrapper.TAG + id)).commit();
 	}
 
     /**

android/src/org/transdroid/gui/rss/RssFeeds.java

@@ -20,10 +20,11 @@
 import org.transdroid.R;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
 
-public class RssFeeds extends FragmentActivity {
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
+public class RssFeeds extends SherlockFragmentActivity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

android/src/org/transdroid/gui/rss/RssFeedsFragment.java

@@ -25,23 +25,25 @@ import org.transdroid.preferences.Preferences;
 import org.transdroid.preferences.PreferencesRss;
 import org.transdroid.rss.RssFeedSettings;
 
+import com.actionbarsherlock.app.SherlockFragment;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
 import android.view.LayoutInflater;
-import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.AdapterView.OnItemClickListener;
 
-public class RssFeedsFragment extends Fragment {
+public class RssFeedsFragment extends SherlockFragment {
 
 	// private static final String LOG_NAME = "Transdroid RSS feeds";
 
@@ -69,10 +71,10 @@ public class RssFeedsFragment extends Fragment {
 
 		useTabletInterface = Transdroid.isTablet(getResources());
 		registerForContextMenu(getView().findViewById(android.R.id.list));
-		getSupportActivity().getSupportActionBar().setTitle(R.string.rss);
+		getSherlockActivity().getSupportActionBar().setTitle(R.string.rss);
 		getListView().setOnItemClickListener(onFeedClicked);
 
-		getSupportActivity().setTitle(R.string.rss);
+		getSherlockActivity().setTitle(R.string.rss);
 		
 		loadFeeds();
 
@@ -107,7 +109,7 @@ public class RssFeedsFragment extends Fragment {
 
 	    	// Show the feed items in the right of the screen (tablet interface) or separately
 	    	if (useTabletInterface) {
-	    		FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+	    		FragmentTransaction ft = getSherlockActivity().getSupportFragmentManager().beginTransaction();
 	    		ft.replace(R.id.listing, new RssListingFragment(getListAdapter().getItem(position)));
 	    		ft.commit();
 	    	} else {
@@ -122,7 +124,7 @@ public class RssFeedsFragment extends Fragment {
 	};
 
 	@Override
-	public boolean onOptionsItemSelected(android.support.v4.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 		case MENU_REFRESH_ID:
 			loadFeeds();

android/src/org/transdroid/gui/rss/RssListing.java

@@ -21,13 +21,15 @@ import org.transdroid.R;
 import org.transdroid.preferences.Preferences;
 import org.transdroid.rss.RssFeedSettings;
 
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActionBar;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
 
-public class RssListing extends FragmentActivity {
+public class RssListing extends SherlockFragmentActivity {
 
 	public static final String RSSFEED_LISTING_KEY = "RSSFEED_LISTING_KEY";
 

android/src/org/transdroid/gui/rss/RssListingFragment.java

@@ -33,6 +33,7 @@ import org.transdroid.preferences.Preferences;
 import org.transdroid.rss.RssFeedSettings;
 import org.transdroid.util.TLog;
 
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.SearchManager;
@@ -44,17 +45,12 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActionBar.OnNavigationListener;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
 import android.text.Html;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.LayoutInflater;
-import android.view.MenuInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -71,7 +67,14 @@ import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class RssListingFragment extends Fragment implements OnTouchListener, OnSelectedChangedListener {
+import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
+import com.actionbarsherlock.app.SherlockFragment;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+
+@SuppressLint("ValidFragment")
+public class RssListingFragment extends SherlockFragment implements OnTouchListener, OnSelectedChangedListener {
 
 	private static final String LOG_NAME = "RSS listing";
 
@@ -121,14 +124,14 @@ public class RssListingFragment extends Fragment implements OnTouchListener, OnS
         addSelectedButton.setOnClickListener(addSelectedClicked);
         // Swiping or flinging between server configurations
         gestureDetector = new GestureDetector(new RssScreenGestureListener());
-        getSupportActivity().getSupportActionBar().setTitle(R.string.rss);
+        getSherlockActivity().getSupportActionBar().setTitle(R.string.rss);
         
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
         allFeeds = Preferences.readAllRssFeedSettings(prefs);
         
     	ignoreFirstListNavigation = true;
         if (getActivity() instanceof RssListing) {
-        	getSupportActivity().getSupportActionBar().setListNavigationCallbacks(buildFeedsAdapter(), onFeedSelected);
+        	getSherlockActivity().getSupportActionBar().setListNavigationCallbacks(buildFeedsAdapter(), onFeedSelected);
         }
         if (lastLoadedItems == null || feedSettings == null) {
         	// Start loading the items
@@ -136,7 +139,7 @@ public class RssListingFragment extends Fragment implements OnTouchListener, OnS
         } else {
         	// Set items from the retained instance state
         	if (getActivity() instanceof RssListing) {
-        		getSupportActivity().getSupportActionBar().setSelectedNavigationItem(feedSettingsIndex(feedSettings));
+        		getSherlockActivity().getSupportActionBar().setSelectedNavigationItem(feedSettingsIndex(feedSettings));
         		setListAdapter(new RssItemListAdapter(getActivity(), RssListingFragment.this, lastLoadedItems, true, feedSettings.getLastNew()));
         	}
         }
@@ -169,7 +172,7 @@ public class RssListingFragment extends Fragment implements OnTouchListener, OnS
 		// Show the (newly) selected feed
 		if (getActivity() instanceof RssListing && feedSettings.getName() != null && !feedSettings.getName().equals("")) {
 	    	ignoreFirstListNavigation = true;
-	    	getSupportActivity().getSupportActionBar().setSelectedNavigationItem(feedSettingsIndex(feedSettings));
+	    	getSherlockActivity().getSupportActionBar().setSelectedNavigationItem(feedSettingsIndex(feedSettings));
 		}
 		
 		// Read the RSS items asynchronously
@@ -326,7 +329,7 @@ public class RssListingFragment extends Fragment implements OnTouchListener, OnS
 	};
 
 	@Override
-	public boolean onOptionsItemSelected(android.support.v4.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 		case MENU_REFRESH_ID:
 			loadItems();
@@ -456,7 +459,7 @@ public class RssListingFragment extends Fragment implements OnTouchListener, OnS
     		// Create a result for the calling activity
     		//setResult(RESULT_OK);
     		startActivity(i);
-    		getSupportFragmentManager().popBackStack();
+    		getSherlockActivity().getSupportFragmentManager().popBackStack();
 
     	} else {
     		
@@ -487,7 +490,7 @@ public class RssListingFragment extends Fragment implements OnTouchListener, OnS
 				// Create a result for the calling activity
 				//setResult(RESULT_OK);
 				startActivity(i);
-				getSupportFragmentManager().popBackStack();
+				getSherlockActivity().getSupportFragmentManager().popBackStack();
 	
 	    	} else {
 	    		
@@ -501,8 +504,8 @@ public class RssListingFragment extends Fragment implements OnTouchListener, OnS
 
 	private void setProgressBar(boolean b) {
 		inProgress = b;
-		if (getSupportActivity() != null) {
-			getSupportActivity().invalidateOptionsMenu();
+		if (getSherlockActivity() != null) {
+			getSherlockActivity().supportInvalidateOptionsMenu();
 		}
 	}
 
@@ -591,13 +594,13 @@ public class RssListingFragment extends Fragment implements OnTouchListener, OnS
 	};
 
 	public void showDialog(int id) {
-		new DialogWrapper(onCreateDialog(id)).show(getSupportActivity().getSupportFragmentManager(), DialogWrapper.TAG + id);
+		new DialogWrapper(onCreateDialog(id)).show(getSherlockActivity().getSupportFragmentManager(), DialogWrapper.TAG + id);
 	}
 
 	protected void dismissDialog(int id) {
 		// Remove the dialog wrapper fragment for the dialog's ID
-		getSupportActivity().getSupportFragmentManager().beginTransaction().remove(
-			getSupportActivity().getSupportFragmentManager().findFragmentByTag(DialogWrapper.TAG + id)).commit();
+		getSherlockActivity().getSupportFragmentManager().beginTransaction().remove(
+				getSherlockActivity().getSupportFragmentManager().findFragmentByTag(DialogWrapper.TAG + id)).commit();
 	}
 
 	protected ListView getListView() {

android/src/org/transdroid/gui/search/Search.java

@@ -30,6 +30,12 @@ import org.transdroid.gui.util.SelectableArrayAdapter.OnSelectedChangedListener;
 import org.transdroid.preferences.Preferences;
 import org.transdroid.util.TLog;
 
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.SearchManager;
@@ -42,11 +48,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.SearchRecentSuggestions;
-import android.support.v4.app.ActionBar;
-import android.support.v4.app.ActionBar.OnNavigationListener;
 import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.GestureDetector;
@@ -76,7 +78,7 @@ import android.widget.Toast;
  * @author erickok
  *
  */
-public class Search extends FragmentActivity implements OnTouchListener, OnSelectedChangedListener {
+public class Search extends SherlockFragmentActivity implements OnTouchListener, OnSelectedChangedListener {
 
 	private static final String LOG_NAME = "Search";
 	private final static Uri TTS_MARKET_URI = Uri.parse("http://www.transdroid.org/latest-search");

external/JakeWharton-ActionBarSherlock/CHANGELOG.md

@@ -1,6 +1,196 @@
 Change Log
 ===============================================================================
 
+Version 4.2.0 *(2012-10-07)*
+----------------------------
+
+**Maven `artifactId` is now to 'actionbarsherlock'.**
+
+Note: The `.Dialog` themes are now deprecated. These will be removed in a future
+version of the library.
+
+ * Add `SearchView` widget for standard search interaction (API 8+ only)
+ * Fix: `ShareActionProvider` in the split action bar no longer fills the entire
+   screen.
+ * Fix: `ShareActionProvider` now does file I/O on a background thread.
+ * Fix: Automatically correct `ColorDrawable` not respecting bounds when used as
+   a stacked background.
+ * Fix: Ensure fragments collection is present before dispatching events.
+ * Fix: XML-defined `onClick` searches the correct context for the declared
+   method.
+ * Fix: Ensure action mode start/finish callbacks are invoked on the activity
+   for the native action bar.
+ * Fix: Allow tab callbacks to have a fragment transaction instance for any
+   `FragmentActivity`.
+ * Fix: Ensure `CollapsibleActionView` callbacks are dispatched in both native
+   and compatbility action bars.
+ * Fix: Remove `.ForceOverflow` themes. These never should have been included.
+
+
+Version 4.1.0 *(2012-05-17)*
+----------------------------
+
+ * Fix: Altered technique used for menu event dispatching through the fragment
+   manager for greater control.
+ * Fix: Do not dispatch menu creation event if the activity has been destroyed.
+ * Fix: Correct potential `NullPointerException` when expanding an action item.
+ * Fix: Correct potential `NullPointerException` when the hardware menu key was
+   pressed in an activity that is forcing the overflow menu.
+ * Fix: Do not set a listener on the native action bar tab wrapper unless a
+   compatibility listener has been set.
+ * Fix: Ensure the compatibility animation framework is always available on
+   views even if they were previously detached from the view hierarchy.
+
+
+Version 4.0.2 *(2012-04-15)*
+----------------------------
+
+ * Upgrade to r7 support library.
+ * Fix: Do not trigger menu creation after `onCreate` if activity is finishing.
+ * Fix: Prevent overflow from displaying if there are no overflow action items.
+ * Fix: Long-pressing menu key no longer triggers overflow.
+ * Fix: Use proper tab state-list drawable to mimic ICS.
+ * Fix: Ensure dispatching menu creation and preparation to fragments can
+   properly return `false` when appropriate to avoid rendering artifacts.
+ * Fix: Properly save and fetch action mode tag on ICS.
+ * Fix: Add missing density-specific resources for certain asssets and remove
+   unused assets.
+
+
+Version 4.0.1 *(2012-03-25)*
+----------------------------
+
+ * Add `ShareActionProvider` widget for use as action items.
+ * Re-add 'Styled' sample to provide a more comprehensive theming example.
+ * Fix: Do not dispatch options item selection to fragments if the activity
+   handles the callback.
+ * Fix: Prevent menu key from opening the overflow menu when an action mode is
+   currently displayed.
+ * Fix: Ensure fragment transaction instance is not `null` on initial tab
+   selection callback.
+ * Fix: Displaying an action mode while using stacked tab navigation no longer
+   throws an exception.
+ * Fix: Using expandable action item callbacks no longer results in a possible
+   exception on older devices.
+
+
+Version 4.0.0 *(2012-03-07)*
+----------------------------
+
+Complete rewrite of the library to backport the Android 4.0 action bar.
+
+ * The minimum supported version of Android is now 2.1 (API 7).
+ * New base activities are provided (e.g., `SherlockActivity` and
+   `SherlockFragmentActivity`) which extend from the native activities.
+ * The support library sources are no longer included in the library. You must
+   include `android-support-v4.jar` in your project separately.
+ * Theming now mirrors that of the native action bar through the use of multiple
+   styles rather than through `ab`- and `am`-prefixed attributes in the theme.
+ * The action bar can be statically attached to an activity view without the
+   requirement of using one of the provided base activities.
+
+
+Version 3.5.1 *(2012-01-03)*
+----------------------------
+
+ * Fix: `NullPointerException` in `FragmentManager` can no longer occur when an
+   attempt is being made to save to a `Bundle` that has not yet been created.
+ * Fix: Pre-3.0 action item submenu dialogs now properly dismiss themselves when
+   an item of theirs is selected.
+
+
+Version 3.5.0 *(2011-12-18)*
+----------------------------
+
+ *  Library now uses the `r6` version of the compatibility library for its base.
+    Ice Cream Sandwich-specific implementations are currently disabled, however,
+    but will be added in a future version of the library.
+
+    `MenuCompat`, `MenuItemCompat`, and `ActivityCompat` have be added back in
+    to ease transition to this library but all their methods and the classes
+    themselves have been deprecated.
+ *  Rewritten menu and action item support from Ice Cream Sandwich.
+
+    * Removed the need for the custom `Window.FEATURE_ACTION_ITEM_TEXT` flag.
+      You should now use the `showAsAction` attribute and/or the
+      `setShowAsAction(int)` method on each `MenuItem` to control whether or
+      not text is shown
+    * Action item dividers are now added automatically only when necessary
+      to distinguish possible confusion between action items.
+    * Fix: Action views now properly size themselves within the bounded space
+      of the menu.
+
+ *  Fix: List navigation no longer becomes unusable on certain device
+    configurations.
+ *  Fix: `SubMenu`'s `findItem(int)` method now properly returns the support
+    version of `MenuItem`.
+ *  Fix: Invisible sub-menu items are no longer shown on the pre-3.0 popup list.
+
+
+Version 3.4.2 *(2001-11-09)*
+----------------------------
+
+ * Fix: Stacked action bar now properly sets the tab bar background based on
+   the theme.
+
+
+Version 3.4.1 *(2011-11-09)*
+----------------------------
+
+ * The `makeFragmentName` method in `FragmentPagerAdapter` has been changed to
+   `public` scope to allow for easier access to your fragments that it is
+   managing.
+ * Action bar will now animate when calling `show()` or `hide()`.
+ * `SherlockPreferenceActivity` now provides full fragment and loader support.
+ * Examples for the plugins are now in their own sample application.
+ * Fix: Home icon no longer erroneously clipped when it exceeds the size of the
+   action bar.
+ * Fix: Tabs will now scroll horizontally to mimic the native action bar
+   behavior.
+ * Fix: Plugins now properly DO NOT inline their `R.java` integer constants.
+ * Fix: Tabs below the action bar are now styled with a default background so
+   that they do not incorrectly inherit an applied background unless explicity
+   declared.
+
+
+Version 3.4.0 *(2011-10-30)*
+----------------------------
+
+ * Library now uses the `r4` version of the compatibility library for its base.
+   Ice Cream Sandwich-specific implementations are currently disabled, however,
+   but will be added in a future version of the library.
+ * Context menu callbacks now use the support version of `MenuItem` to maintain
+   consistency.
+ * Added preference plugin which provides an action bar enhanced preference
+   screen.
+ * Fix: `abHomeLayout` theme attribute is now honored.
+ * Fix: `onPrepareOptionsMenu` is now properly dispatched upon menu
+   invalidation.
+
+
+Version 3.3.1 *(2011-10-20)*
+----------------------------
+
+ADT 14 is now required. Maven 3 is required if building from the command line.
+
+ * XML-defined `onClick` attributes will now check for an `onClick` method that
+   takes an `android.support.v4.view.MenuItem` instance.
+ * Tabs on medium screens in landscape now display inline rather than below the
+   action bar to mirror how Android 4.0 behaves with the same configuration.
+ * Fix: Menu inflater properly checks activity context for `onClick` method
+   declared in the XML.
+ * Fix: Dialog fragment properly saves its `showDialog` state when not being
+   used as a popup.
+ * Fix: Return `-1` when in tab navigation but no tab is selected. This brings
+   the library in line with the post-3.0 behavior.
+ * Fix: Removing a menu group no longer throws an `IndexOutOfBoundsException`.
+ * Fix: `getSelectedTab` and `getTabAt` no longer throw `NullPointerException`s
+   on post-3.0 when no tab was selected or no tab existed at the specified
+   position, respectively.
+ * Fix: `findFragmentById` now properly returns fragments attached to
+   `android.R.id.content` when run on pre-3.0 devices.
+
+
 Version 3.3.0 *(2011-10-11)*
 ----------------------------
 
@@ -11,7 +201,7 @@ Version 3.3.0 *(2011-10-11)*
    [StackOverflow](http://stackoverflow.com/questions/5637894/dialogfragments-with-devices-api-level-11/7560686#7560686)
    for more information.
  * Fix: Popping a fragment off of the back stack now properly assigns its parent
-   activity. 
+   activity.
  * Fix: An activity result no longer causes a `NullPointerException` when the
    target fragment no longer exists.
  * Fix: Action item dividers are now properly initially hidden when their

external/JakeWharton-ActionBarSherlock/CONTRIBUTING.md

@@ -0,0 +1,11 @@
+Contributing
+============
+
+If you would like to contribute code to ActionBarSherlock you can do so through
+GitHub by forking the repository and sending a pull request.
+
+When submitting code, please make every effort to follow existing conventions
+and style in order to keep the code as readable as possible. Please also make
+sure your code compiles by running `mvn clean verify`. Checkstyle failures
+during compilation indicate errors in your style and can be viewed in the
+`checkstyle-result.xml` file.

external/JakeWharton-ActionBarSherlock/README.md

@@ -1,22 +1,26 @@
-Action Bar Sherlock
-===================
+ActionBarSherlock
+=================
 
-ActionBarSherlock is an extension of the [compatibility library][1] designed
-to facilitate the use of the action bar design pattern across all versions of
-Android through a single API.
+ActionBarSherlock is an standalone library designed to facilitate the use of
+the action bar design pattern across all versions of Android through a single
+API.
 
-The class will automatically use the [native ActionBar][2] implementation on
-Android 3.0 or later. For previous versions which do not include ActionBar, a
-custom action bar implementation will automatically be wrapped around the
-layout. Support for this goes all the way back to Android 1.6.
-
-Try out the sample applications on the Android Market: [Feature Demos][4],
-[Shakespeare][5], and [Styled Action Bar][6].
+The library will automatically use the [native ActionBar][2] implementation on
+Android 4.0 or later. For previous versions which do not include ActionBar, a
+custom action bar implementation based on the sources of Ice Cream Sandwich
+will automatically be wrapped around the layout. This allows you to easily
+develop an application with an action bar for every version of Android from 2.x
+and up.
 
 **See http://actionbarsherlock.com for more information.**
 
 ![Example Image][3]
 
+Try out the sample applications on the Android Market: [Feature Demos][4],
+[Fragments][5], and [RoboGuice][6].
+
+Continuous integration is provided by [Travis CI][7].
+
 
 
 Developed By
@@ -29,7 +33,7 @@ Developed By
 License
 =======
 
-    Copyright 2011 Jake Wharton
+    Copyright 2012 Jake Wharton
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -50,6 +54,7 @@ License
  [1]: http://android-developers.blogspot.com/2011/03/fragments-for-all.html
  [2]: http://developer.android.com/guide/topics/ui/actionbar.html
  [3]: http://actionbarsherlock.com/static/feature.png
- [4]: https://market.android.com/details?id=com.actionbarsherlock.sample.demos
- [5]: https://market.android.com/details?id=com.actionbarsherlock.sample.shakespeare
- [6]: https://market.android.com/details?id=com.actionbarsherlock.sample.styledactionbar
+ [4]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.demos
+ [5]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.fragments
+ [6]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.roboguice
+ [7]: https://travis-ci.org/JakeWharton/ActionBarSherlock

external/JakeWharton-ActionBarSherlock/checkstyle.xml

@@ -30,9 +30,9 @@
         <!--module name="ConstantName"/-->
         <!--module name="LocalFinalVariableName"/-->
         <!--module name="LocalVariableName"/-->
-        <!--module name="MemberName"/-->
+        <module name="MemberName"/>
         <!--module name="MethodName"/-->
-        <!--module name="PackageName"/-->
+        <module name="PackageName"/>
         <!--module name="ParameterName"/-->
         <!--module name="StaticVariableName"/-->
         <!--module name="TypeName"/-->
@@ -84,7 +84,7 @@
         <!-- Checks for common coding problems               -->
         <!-- See http://checkstyle.sf.net/config_coding.html -->
         <!--module name="AvoidInlineConditionals"/-->
-        <!--module name="DoubleCheckedLocking"/-->    <!-- MY FAVOURITE -->
+        <module name="DoubleCheckedLocking"/>
         <!--module name="EmptyStatement"/-->
         <!--module name="EqualsHashCode"/-->
         <!--module name="HiddenField"/-->
@@ -92,9 +92,15 @@
         <!--module name="InnerAssignment"/-->
         <!--module name="MagicNumber"/-->
         <!--module name="MissingSwitchDefault"/-->
-        <!--module name="RedundantThrows"/-->
+        <module name="RedundantThrows"/>
         <!--module name="SimplifyBooleanExpression"/-->
         <!--module name="SimplifyBooleanReturn"/-->
+        <module name="StringLiteralEquality"/>
+        <module name="CovariantEquals"/>
+        <!--module name="NoClone"/-->
+        <module name="NoFinalizer"/>
+        <module name="PackageDeclaration"/>
+        <!--module name="FallThrough"/-->
 
         <!-- Checks for class design                         -->
         <!-- See http://checkstyle.sf.net/config_design.html -->
@@ -110,6 +116,6 @@
         <!--module name="ArrayTypeStyle"/-->
         <!--module name="FinalParameters"/-->
         <!--module name="TodoComment"/-->
-        <!--module name="UpperEll"/-->
+        <module name="UpperEll"/>
     </module>
 </module>

external/JakeWharton-ActionBarSherlock/library/.classpath

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

external/JakeWharton-ActionBarSherlock/library/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +0,0 @@
-#Tue Nov 01 09:28:45 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6

external/JakeWharton-ActionBarSherlock/library/AndroidManifest.xml

@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="100" android:versionName="4.2.0" package="com.actionbarsherlock">
 
-<manifest
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.actionbarsherlock"
-	android:versionCode="20"
-	android:versionName="3.3.0">
-	
-    <uses-sdk
-    	android:minSdkVersion="4"
-    	android:targetSdkVersion="13" />
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
 
 </manifest>

external/JakeWharton-ActionBarSherlock/library/README.md

@@ -5,11 +5,11 @@ This folder contains the main library which should be linked against as an
 Android library project in your application.
 
 For more information see the "Including In Your Project" section of the
-[download page][1].
+[usage page][1].
 
 
 
 
 
 
- [1]: http://actionbarsherlock.com/download.html
+ [1]: http://actionbarsherlock.com/usage.html

external/JakeWharton-ActionBarSherlock/library/default.properties

@@ -1,3 +0,0 @@
-android.library=true
-# Project target.
-target=android-13

external/JakeWharton-ActionBarSherlock/library/pom.xml

@@ -3,34 +3,47 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.actionbarsherlock</groupId>
-	<artifactId>library</artifactId>
+	<artifactId>actionbarsherlock</artifactId>
 	<name>ActionBarSherlock</name>
 	<packaging>apklib</packaging>
 
 	<parent>
 		<groupId>com.actionbarsherlock</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.3.0</version>
+		<version>4.2.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
-	
+
 	<dependencies>
 		<dependency>
-			<groupId>android</groupId>
+			<groupId>com.google.android</groupId>
 			<artifactId>android</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>support-v4</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>test</testSourceDirectory>
 
 		<plugins>
 			<plugin>
 				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>maven-android-plugin</artifactId>
+				<artifactId>android-maven-plugin</artifactId>
 				<extensions>true</extensions>
+				<configuration>
+					<nativeLibrariesDirectory>ignored</nativeLibrariesDirectory>
+				</configuration>
 			</plugin>
 
 			<plugin>
@@ -41,11 +54,33 @@
 				</configuration>
 			</plugin>
 
+			<plugin>
+				<groupId>com.google.code.maven-replacer-plugin</groupId>
+				<artifactId>maven-replacer-plugin</artifactId>
+				<version>1.4.0</version>
+				<executions>
+					<execution>
+						<phase>process-sources</phase>
+						<goals>
+							<goal>replace</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<ignoreMissingFile>false</ignoreMissingFile>
+					<file>target/generated-sources/r/com/actionbarsherlock/R.java</file>
+					<outputFile>target/generated-sources/r/com/actionbarsherlock/R.java</outputFile>
+					<regex>false</regex>
+					<token>static final int</token>
+					<value>static int</value>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
 				<configuration>
-					<configLocation>${project.basedir}/checkstyle.xml</configLocation>
+					<configLocation>../checkstyle.xml</configLocation>
 				</configuration>
 				<executions>
 					<execution>
@@ -79,5 +114,35 @@
 				</executions>
 			</plugin>
 		</plugins>
+
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>com.google.code.maven-replacer-plugin</groupId>
+										<artifactId>maven-replacer-plugin</artifactId>
+										<versionRange>[1.4.0,)</versionRange>
+										<goals>
+											<goal>replace</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 </project>

external/JakeWharton-ActionBarSherlock/library/project.properties

@@ -9,4 +9,4 @@
 
 android.library=true
 # Project target.
-target=android-13
+target=android-16

external/JakeWharton-ActionBarSherlock/library/res/color/abs__item_bg.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="false" android:state_pressed="false" android:state_focused="false" android:drawable="@android:color/transparent" />
-    <item android:state_selected="false" android:state_pressed="false" android:state_focused="true"  android:drawable="@color/abs__item_focused" />
-    <item android:state_selected="false" android:state_pressed="true"  android:state_focused="false" android:drawable="@color/abs__item_focused" />
-    <item android:state_selected="false" android:state_pressed="true"  android:state_focused="true"  android:drawable="@color/abs__item_focused" />
-    <item android:state_selected="true"  android:state_pressed="false" android:state_focused="false" android:drawable="@android:color/transparent" />
-    <item android:state_selected="true"  android:state_pressed="false" android:state_focused="true"  android:drawable="@color/abs__item_focused" />
-    <item android:state_selected="true"  android:state_pressed="true"  android:state_focused="false" android:drawable="@color/abs__item_focused" />
-    <item android:state_selected="true"  android:state_pressed="true"  android:state_focused="true"  android:drawable="@color/abs__item_focused" />
-    <item android:state_selected="true"  android:state_pressed="false" android:state_focused="false" android:drawable="@android:color/transparent" />
-    <item android:drawable="@android:color/transparent" />
-</selector>

external/JakeWharton-ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_dark.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/abs__bright_foreground_disabled_holo_dark"/>
+    <item android:color="@color/abs__bright_foreground_holo_dark"/> <!-- not selected -->
+</selector>

external/JakeWharton-ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_light.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/abs__bright_foreground_disabled_holo_light"/>
+    <item android:color="@color/abs__bright_foreground_holo_light"/> <!-- not selected -->
+</selector>
+

external/JakeWharton-ActionBarSherlock/library/res/color/abs__primary_text_holo_dark.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/abs__bright_foreground_disabled_holo_dark"/>
+    <item android:state_window_focused="false" android:color="@color/abs__bright_foreground_holo_dark"/>
+    <item android:state_pressed="true" android:color="@color/abs__bright_foreground_holo_dark"/>
+    <item android:state_selected="true" android:color="@color/abs__bright_foreground_holo_dark"/>
+    <item android:state_activated="true" android:color="@color/abs__bright_foreground_holo_dark"/>
+    <item android:color="@color/abs__bright_foreground_holo_dark"/> <!-- not selected -->
+</selector>

external/JakeWharton-ActionBarSherlock/library/res/color/abs__primary_text_holo_light.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/abs__bright_foreground_disabled_holo_light"/>
+    <item android:state_window_focused="false" android:color="@color/abs__bright_foreground_holo_light"/>
+    <item android:state_pressed="true" android:color="@color/abs__bright_foreground_holo_light"/>
+    <item android:state_selected="true" android:color="@color/abs__bright_foreground_holo_light"/>
+    <item android:state_activated="true" android:color="@color/abs__bright_foreground_holo_light"/>
+    <item android:color="@color/abs__bright_foreground_holo_light"/> <!-- not selected -->
+    
+</selector>
+

external/JakeWharton-ActionBarSherlock/library/res/color/abs__tab_text_color_dark.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="@android:color/primary_text_dark" />
-    <item android:state_focused="true"  android:color="@android:color/primary_text_dark" />
-    <item android:state_pressed="true"  android:color="@android:color/primary_text_dark" />
-    <item android:color="@android:color/primary_text_dark" />
-</selector>

external/JakeWharton-ActionBarSherlock/library/res/color/abs__tab_text_color_light.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="#000" />
-    <item android:state_focused="true"  android:color="#000" />
-    <item android:state_pressed="true"  android:color="#000" />
-    <item android:color="#000" />
-</selector>