Browse Source

Fixing screen flow.

pull/11/head
Eric Kok 12 years ago
parent
commit
abe7cc0a89
  1. 3
      external/JakeWharton-ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
  2. 1
      lite/src/org/transdroid/core/gui/TorrentsActivity.java
  3. 3
      lite/src/org/transdroid/core/gui/TorrentsFragment.java

3
external/JakeWharton-ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java vendored

@ -31,6 +31,7 @@ import android.content.pm.ResolveInfo;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcelable; import android.os.Parcelable;
import android.util.SparseArray; import android.util.SparseArray;
@ -352,7 +353,7 @@ public class MenuBuilder implements Menu {
SparseArray<Parcelable> viewStates = states.getSparseParcelableArray( SparseArray<Parcelable> viewStates = states.getSparseParcelableArray(
getActionViewStatesKey()); getActionViewStatesKey());
final int itemCount = size(); final int itemCount = size();
for (int i = 0; i < itemCount; i++) { for (int i = 0; i < itemCount; i++) {
final MenuItem item = getItem(i); final MenuItem item = getItem(i);

1
lite/src/org/transdroid/core/gui/TorrentsActivity.java

@ -115,6 +115,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
// Add status types directly to the action bar spinner // Add status types directly to the action bar spinner
navigationSpinnerAdapter.updateStatusTypes(StatusType.getAllStatusTypes(this)); navigationSpinnerAdapter.updateStatusTypes(StatusType.getAllStatusTypes(this));
} }
currentFilter = StatusType.getShowAllType(this);
// Connect to the last used server // Connect to the last used server
ServerSetting lastUsed = applicationSettings.getLastUsedServer(); ServerSetting lastUsed = applicationSettings.getLastUsedServer();

3
lite/src/org/transdroid/core/gui/TorrentsFragment.java

@ -12,7 +12,6 @@ import org.transdroid.core.R;
import org.transdroid.core.gui.lists.TorrentsAdapter; import org.transdroid.core.gui.lists.TorrentsAdapter;
import org.transdroid.core.gui.lists.TorrentsAdapter_; import org.transdroid.core.gui.lists.TorrentsAdapter_;
import org.transdroid.core.gui.navigation.NavigationFilter; import org.transdroid.core.gui.navigation.NavigationFilter;
import org.transdroid.core.gui.navigation.StatusType;
import org.transdroid.daemon.Torrent; import org.transdroid.daemon.Torrent;
import android.view.View; import android.view.View;
@ -79,8 +78,6 @@ public class TorrentsFragment extends SherlockFragment {
*/ */
public void applyFilter(NavigationFilter currentFilter) { public void applyFilter(NavigationFilter currentFilter) {
this.currentFilter = currentFilter; this.currentFilter = currentFilter;
if (this.currentFilter == null)
this.currentFilter = StatusType.getShowAllType(getActivity());
if (torrents != null) { if (torrents != null) {
// Build a local list of torrents that match the selected navigation filter // Build a local list of torrents that match the selected navigation filter
ArrayList<Torrent> filteredTorrents = new ArrayList<Torrent>(); ArrayList<Torrent> filteredTorrents = new ArrayList<Torrent>();

Loading…
Cancel
Save