Browse Source

Updated ActionBarSherlock to 4.2.0

pull/11/head
Eric Kok 12 years ago
parent
commit
7e7e3f89ce
  1. 3
      android/AndroidManifest.xml
  2. 2
      android/project.properties
  3. 19
      android/res/values-v11/themes.xml
  4. 20
      android/res/values-v14/themes.xml
  5. 16
      android/res/values/themes.xml
  6. 5
      android/src/org/transdroid/gui/Details.java
  7. 33
      android/src/org/transdroid/gui/DetailsFragment.java
  8. 7
      android/src/org/transdroid/gui/Torrents.java
  9. 50
      android/src/org/transdroid/gui/TorrentsFragment.java
  10. 5
      android/src/org/transdroid/gui/rss/RssFeeds.java
  11. 18
      android/src/org/transdroid/gui/rss/RssFeedsFragment.java
  12. 6
      android/src/org/transdroid/gui/rss/RssListing.java
  13. 39
      android/src/org/transdroid/gui/rss/RssListingFragment.java
  14. 12
      android/src/org/transdroid/gui/search/Search.java
  15. 190
      external/JakeWharton-ActionBarSherlock/CHANGELOG.md
  16. 11
      external/JakeWharton-ActionBarSherlock/CONTRIBUTING.md
  17. 35
      external/JakeWharton-ActionBarSherlock/README.md
  18. 16
      external/JakeWharton-ActionBarSherlock/checkstyle.xml
  19. 2
      external/JakeWharton-ActionBarSherlock/library/.classpath
  20. 12
      external/JakeWharton-ActionBarSherlock/library/.settings/org.eclipse.jdt.core.prefs
  21. 11
      external/JakeWharton-ActionBarSherlock/library/AndroidManifest.xml
  22. 4
      external/JakeWharton-ActionBarSherlock/library/README.md
  23. 3
      external/JakeWharton-ActionBarSherlock/library/default.properties
  24. BIN
      external/JakeWharton-ActionBarSherlock/library/libs/android-support-v4.jar
  25. 77
      external/JakeWharton-ActionBarSherlock/library/pom.xml
  26. 2
      external/JakeWharton-ActionBarSherlock/library/project.properties
  27. 14
      external/JakeWharton-ActionBarSherlock/library/res/color/abs__item_bg.xml
  28. 20
      external/JakeWharton-ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_dark.xml
  29. 21
      external/JakeWharton-ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_light.xml
  30. 24
      external/JakeWharton-ActionBarSherlock/library/res/color/abs__primary_text_holo_dark.xml
  31. 26
      external/JakeWharton-ActionBarSherlock/library/res/color/abs__primary_text_holo_light.xml
  32. 8
      external/JakeWharton-ActionBarSherlock/library/res/color/abs__tab_text_color_dark.xml
  33. 8
      external/JakeWharton-ActionBarSherlock/library/res/color/abs__tab_text_color_light.xml
  34. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
  35. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
  36. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
  37. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
  38. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
  39. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
  40. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
  41. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
  42. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
  43. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
  44. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
  45. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
  46. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
  47. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
  48. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
  49. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
  50. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
  51. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
  52. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
  53. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
  54. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
  55. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
  56. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
  57. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
  58. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_holo_dark.9.png
  59. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_holo_light.9.png
  60. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
  61. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
  62. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_ic_close_focused_holo.png
  63. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_ic_close_normal_holo.png
  64. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_ic_close_pressed_holo.png
  65. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
  66. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
  67. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
  68. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
  69. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
  70. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
  71. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_disabled.png
  72. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_normal.png
  73. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png
  74. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png
  75. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go.png
  76. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png
  77. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
  78. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
  79. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
  80. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
  81. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search.png
  82. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search_api_holo_light.png
  83. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search.png
  84. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png
  85. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_activated_holo.9.png
  86. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
  87. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_light.9.png
  88. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_focused_holo.9.png
  89. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_longpressed_holo.9.png
  90. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
  91. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
  92. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
  93. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
  94. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
  95. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
  96. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
  97. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
  98. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
  99. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
  100. BIN
      external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_48_inner_holo.png
  101. Some files were not shown because too many files have changed in this diff Show More

3
android/AndroidManifest.xml

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

2
android/project.properties

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

19
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>

20
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>

16
android/res/values/themes.xml

@ -1,15 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <style name="Theme.Transdroid" parent="@style/Theme.Sherlock">
<item name="android:windowBackground">@color/WindowBackgroundColor</item> <item name="android:windowBackground">@color/WindowBackgroundColor</item>
<item name="abLogo">@drawable/pixel</item> <item name="actionBarStyle">@style/Widget.Styled.ActionBar</item>
<item name="abTitleTextStyle">@style/WindowTitleText</item> <item name="actionBarItemBackground">@drawable/title_button</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>
</style> </style>
<style name="Theme.Transdroid.NoTitle" parent="@style/Theme.Sherlock"> <style name="Theme.Transdroid.NoTitle" parent="@style/Theme.Sherlock">
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
</style> </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> </resources>

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

@ -22,10 +22,11 @@ import org.transdroid.daemon.Torrent;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentTransaction; 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"; //private static final String LOG_NAME = "Details";

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

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

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

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

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

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

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

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

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

@ -21,13 +21,15 @@ import org.transdroid.R;
import org.transdroid.preferences.Preferences; import org.transdroid.preferences.Preferences;
import org.transdroid.rss.RssFeedSettings; import org.transdroid.rss.RssFeedSettings;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.ActionBar;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentTransaction; 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"; public static final String RSSFEED_LISTING_KEY = "RSSFEED_LISTING_KEY";

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

12
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.preferences.Preferences;
import org.transdroid.util.TLog; 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.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.SearchManager; import android.app.SearchManager;
@ -42,11 +48,7 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.SearchRecentSuggestions; 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.app.FragmentActivity;
import android.support.v4.view.Menu;
import android.support.v4.view.MenuItem;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo; import android.view.ContextMenu.ContextMenuInfo;
import android.view.GestureDetector; import android.view.GestureDetector;
@ -76,7 +78,7 @@ import android.widget.Toast;
* @author erickok * @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 static final String LOG_NAME = "Search";
private final static Uri TTS_MARKET_URI = Uri.parse("http://www.transdroid.org/latest-search"); private final static Uri TTS_MARKET_URI = Uri.parse("http://www.transdroid.org/latest-search");

190
external/JakeWharton-ActionBarSherlock/CHANGELOG.md vendored

@ -1,6 +1,196 @@
Change Log 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)* Version 3.3.0 *(2011-10-11)*
---------------------------- ----------------------------

11
external/JakeWharton-ActionBarSherlock/CONTRIBUTING.md vendored

@ -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.

35
external/JakeWharton-ActionBarSherlock/README.md vendored

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

16
external/JakeWharton-ActionBarSherlock/library/checkstyle.xml → external/JakeWharton-ActionBarSherlock/checkstyle.xml vendored

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

2
external/JakeWharton-ActionBarSherlock/library/.classpath vendored

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

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

@ -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

11
external/JakeWharton-ActionBarSherlock/library/AndroidManifest.xml vendored

@ -1,13 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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 <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
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" />
</manifest> </manifest>

4
external/JakeWharton-ActionBarSherlock/library/README.md vendored

@ -5,11 +5,11 @@ This folder contains the main library which should be linked against as an
Android library project in your application. Android library project in your application.
For more information see the "Including In Your Project" section of the 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

3
external/JakeWharton-ActionBarSherlock/library/default.properties vendored

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

BIN
external/JakeWharton-ActionBarSherlock/library/libs/android-support-v4.jar vendored

Binary file not shown.

77
external/JakeWharton-ActionBarSherlock/library/pom.xml vendored

@ -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"> <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> <modelVersion>4.0.0</modelVersion>
<groupId>com.actionbarsherlock</groupId> <artifactId>actionbarsherlock</artifactId>
<artifactId>library</artifactId>
<name>ActionBarSherlock</name> <name>ActionBarSherlock</name>
<packaging>apklib</packaging> <packaging>apklib</packaging>
<parent> <parent>
<groupId>com.actionbarsherlock</groupId> <groupId>com.actionbarsherlock</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>3.3.0</version> <version>4.2.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>android</groupId> <groupId>com.google.android</groupId>
<artifactId>android</artifactId> <artifactId>android</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId> <groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>maven-android-plugin</artifactId> <artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<configuration>
<nativeLibrariesDirectory>ignored</nativeLibrariesDirectory>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -41,11 +54,33 @@
</configuration> </configuration>
</plugin> </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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<configuration> <configuration>
<configLocation>${project.basedir}/checkstyle.xml</configLocation> <configLocation>../checkstyle.xml</configLocation>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@ -79,5 +114,35 @@
</executions> </executions>
</plugin> </plugin>
</plugins> </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> </build>
</project> </project>

2
external/JakeWharton-ActionBarSherlock/library/project.properties vendored

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

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_light_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 133 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_holo_dark.9.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_holo_light.9.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_ic_close_focused_holo.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_ic_close_normal_holo.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 957 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__cab_ic_close_pressed_holo.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 938 B

After

Width:  |  Height:  |  Size: 602 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_light.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 975 B

After

Width:  |  Height:  |  Size: 546 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 713 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_light.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 737 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_disabled.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_normal.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 467 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_light.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search_api_holo_light.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_activated_holo.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_focused_holo.9.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 159 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_longpressed_holo.9.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 154 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 159 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_light.9.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 159 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 922 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 178 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 917 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 917 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

BIN
external/JakeWharton-ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_48_inner_holo.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save