diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2012-06-24 15:57:58 +0400 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2012-06-24 15:57:58 +0400 |
| commit | 12de7c7973ccbb6f0e229c2f7d88e82bd2d88e5e (patch) | |
| tree | c4df6a4c96927d3f4f7d509e0b756c0ed2706f23 /src/org/fox/ttrss/offline/OfflineActivity.java | |
| parent | 4101ecebeed206f639f836fae76be60c39e6670f (diff) | |
simplify back stack handling a bit
disable feed fragments selected state in small screen mode
Diffstat (limited to 'src/org/fox/ttrss/offline/OfflineActivity.java')
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineActivity.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java index 9240bd44..ad243f16 100644 --- a/src/org/fox/ttrss/offline/OfflineActivity.java +++ b/src/org/fox/ttrss/offline/OfflineActivity.java @@ -502,7 +502,7 @@ public class OfflineActivity extends FragmentActivity implements } else { if (m_selectedArticleId != 0) { closeArticle(); - } else if (m_activeFeedId != 0) { + /* } else if (m_activeFeedId != 0) { m_activeFeedId = 0; OfflineFeedsFragment ff = (OfflineFeedsFragment) getSupportFragmentManager() @@ -524,7 +524,7 @@ public class OfflineActivity extends FragmentActivity implements } refreshViews(); - initMainMenu(); + initMainMenu(); */ } else if (m_activeCatId != -1) { closeCategory(); } else if (allowQuit) { @@ -1033,11 +1033,11 @@ public class OfflineActivity extends FragmentActivity implements getActionBar().setTitle(R.string.app_name); } - //if (!m_smallScreenMode) { - // getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticleId != 0); - //} else { + if (m_smallScreenMode) { getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticleId != 0 || m_activeFeedId != 0 || m_activeCatId != -1); - //} + } else { + getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticleId != 0 || m_activeCatId != -1); + } if (android.os.Build.VERSION.SDK_INT >= 14) { ShareActionProvider shareProvider = (ShareActionProvider) m_menu.findItem(R.id.share_article).getActionProvider(); |