From a5d587209429c7f633b6fe5a2a72b50c07a2649d Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Tue, 16 Apr 2013 11:47:47 +0200 Subject: [PATCH] Only show 3 pane layout if screen is at least 900dp width. --- .../activity_torrents.xml | 0 .../transdroid/core/gui/DetailsFragment.java | 2 ++ .../transdroid/core/gui/TorrentsActivity.java | 17 +++++++++++------ 3 files changed, 13 insertions(+), 6 deletions(-) rename core/res/{layout-w720dp => layout-w900dp}/activity_torrents.xml (100%) diff --git a/core/res/layout-w720dp/activity_torrents.xml b/core/res/layout-w900dp/activity_torrents.xml similarity index 100% rename from core/res/layout-w720dp/activity_torrents.xml rename to core/res/layout-w900dp/activity_torrents.xml diff --git a/core/src/org/transdroid/core/gui/DetailsFragment.java b/core/src/org/transdroid/core/gui/DetailsFragment.java index 0ee3386a..96d0606f 100644 --- a/core/src/org/transdroid/core/gui/DetailsFragment.java +++ b/core/src/org/transdroid/core/gui/DetailsFragment.java @@ -5,6 +5,7 @@ import java.util.List; import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.EFragment; +import org.androidannotations.annotations.FragmentArg; import org.androidannotations.annotations.InstanceState; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; @@ -36,6 +37,7 @@ public class DetailsFragment extends SherlockFragment { // Local data @InstanceState + @FragmentArg protected Torrent torrent = null; @InstanceState protected TorrentDetails torrentDetails = null; diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java index 32bbc76f..ef6f5b7d 100644 --- a/core/src/org/transdroid/core/gui/TorrentsActivity.java +++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java @@ -24,12 +24,20 @@ import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.ServerSetting; import org.transdroid.core.gui.lists.LocalTorrent; import org.transdroid.core.gui.lists.SimpleListItem; -import org.transdroid.core.gui.log.*; -import org.transdroid.core.gui.navigation.*; +import org.transdroid.core.gui.log.Log; +import org.transdroid.core.gui.log.Log_; +import org.transdroid.core.gui.navigation.FilterListAdapter; +import org.transdroid.core.gui.navigation.FilterListAdapter_; +import org.transdroid.core.gui.navigation.FilterListDropDownAdapter; +import org.transdroid.core.gui.navigation.FilterListDropDownAdapter_; +import org.transdroid.core.gui.navigation.Label; +import org.transdroid.core.gui.navigation.NavigationFilter; +import org.transdroid.core.gui.navigation.NavigationHelper; +import org.transdroid.core.gui.navigation.StatusType; import org.transdroid.core.gui.search.BarcodeHelper; import org.transdroid.core.gui.search.FilePickerHelper; import org.transdroid.core.gui.search.UrlEntryDialog; -import org.transdroid.core.gui.settings.*; +import org.transdroid.core.gui.settings.MainSettingsActivity_; import org.transdroid.daemon.Daemon; import org.transdroid.daemon.IDaemonAdapter; import org.transdroid.daemon.Torrent; @@ -461,9 +469,6 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi public void openDetails(Torrent torrent) { if (fragmentDetails != null) { fragmentDetails.updateTorrent(torrent); - } else if (filtersList != null) { - getSupportFragmentManager().beginTransaction().add(R.id.torrent_list, DetailsFragment_.builder().build()) - .addToBackStack(null).commit(); } else { DetailsActivity_.intent(this).torrent(torrent).start(); }