diff options
| author | Andrew Dolgov <[email protected]> | 2013-05-28 19:50:08 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-05-28 19:50:08 +0400 |
| commit | ee687410d8a92dfc9dc93651f2f44967ef75aeb6 (patch) | |
| tree | 6649c9570c10bf664b853fce4a491266c1acd2ab /src | |
| parent | 5189150253c01a5e272dec62318c5093167d45ff (diff) | |
fix for actionbar up button disappearing on rotate when switching
between slide and normal sidebar
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttrss/FeedsActivity.java | 17 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineFeedsActivity.java | 7 |
2 files changed, 17 insertions, 7 deletions
diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java index e0b82739..0925840a 100644 --- a/src/org/fox/ttrss/FeedsActivity.java +++ b/src/org/fox/ttrss/FeedsActivity.java @@ -103,9 +103,18 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe m_actionbarRevertDepth = savedInstanceState.getInt("actionbarRevertDepth"); m_feedIsSelected = savedInstanceState.getBoolean("feedIsSelected"); - if (m_slidingMenu != null && m_feedIsSelected == false) + if (m_slidingMenu != null && m_feedIsSelected == false) { m_slidingMenu.showMenu(); - + } else if (m_slidingMenu != null) { + m_actionbarUpEnabled = true; + } else { + m_actionbarUpEnabled = m_actionbarRevertDepth > 0; + } + + if (m_actionbarUpEnabled) { + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + } + if (!isSmallScreen()) { // temporary hack because FeedsActivity doesn't track whether active feed is open LinearLayout container = (LinearLayout) findViewById(R.id.fragment_container); @@ -113,10 +122,6 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe if (container != null) container.setWeightSum(3f); } - - if (m_actionbarUpEnabled) { - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - } } /* if (!isCompatMode() && !isSmallScreen()) { diff --git a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java index 99bbdac8..608520cb 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java +++ b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java @@ -77,8 +77,13 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead m_actionbarRevertDepth = savedInstanceState.getInt("actionbarRevertDepth"); m_feedIsSelected = savedInstanceState.getBoolean("feedIsSelected"); - if (!m_feedIsSelected && m_slidingMenu != null) + if (m_slidingMenu != null && m_feedIsSelected == false) { m_slidingMenu.showMenu(); + } else if (m_slidingMenu != null) { + m_actionbarUpEnabled = true; + } else { + m_actionbarUpEnabled = m_actionbarRevertDepth > 0; + } if (m_actionbarUpEnabled) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); |