diff options
| author | Andrew Dolgov <[email protected]> | 2013-05-28 15:52:54 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-05-28 15:52:54 +0400 |
| commit | 7e03ca0e736db9c1f6fc96345fe0c2e74412ecc2 (patch) | |
| tree | 7d7628a5bc0fca5061bd3b670ffa957c694ee09a | |
| parent | e84345ce5a744a72879087566621232896c52e10 (diff) | |
fix wrong backgrounds being used by tablet headline views
properly reset feedisselected flag when menu is shown
| -rw-r--r-- | res/layout-sw600dp-land/headlines.xml | 1 | ||||
| -rw-r--r-- | res/layout-sw600dp-port/headlines.xml | 1 | ||||
| -rw-r--r-- | res/layout-sw700dp/headlines.xml | 1 | ||||
| -rw-r--r-- | src/org/fox/ttrss/FeedsActivity.java | 1 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineFeedsActivity.java | 1 |
5 files changed, 2 insertions, 3 deletions
diff --git a/res/layout-sw600dp-land/headlines.xml b/res/layout-sw600dp-land/headlines.xml index 93324ebb..9acfd86b 100644 --- a/res/layout-sw600dp-land/headlines.xml +++ b/res/layout-sw600dp-land/headlines.xml @@ -2,7 +2,6 @@ android:id="@+id/main"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="?headlinesBackgroundSolid"
android:orientation="vertical" >
<FrameLayout
diff --git a/res/layout-sw600dp-port/headlines.xml b/res/layout-sw600dp-port/headlines.xml index 866c31a6..bc636d13 100644 --- a/res/layout-sw600dp-port/headlines.xml +++ b/res/layout-sw600dp-port/headlines.xml @@ -27,7 +27,6 @@ <FrameLayout
android:id="@+id/headlines_fragment"
- android:background="?smallScreenBackground"
android:layout_width="match_parent"
android:layout_height="match_parent" >
</FrameLayout>
diff --git a/res/layout-sw700dp/headlines.xml b/res/layout-sw700dp/headlines.xml index 93324ebb..9acfd86b 100644 --- a/res/layout-sw700dp/headlines.xml +++ b/res/layout-sw700dp/headlines.xml @@ -2,7 +2,6 @@ android:id="@+id/main"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="?headlinesBackgroundSolid"
android:orientation="vertical" >
<FrameLayout
diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java index 47781cce..e0b82739 100644 --- a/src/org/fox/ttrss/FeedsActivity.java +++ b/src/org/fox/ttrss/FeedsActivity.java @@ -73,6 +73,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe public void onOpened() { if (m_actionbarRevertDepth == 0) { m_actionbarUpEnabled = false; + m_feedIsSelected = false; getSupportActionBar().setDisplayHomeAsUpEnabled(false); initMenu(); } diff --git a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java index 507e08ef..99bbdac8 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java +++ b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java @@ -63,6 +63,7 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead public void onOpened() { if (m_actionbarRevertDepth == 0) { m_actionbarUpEnabled = false; + m_feedIsSelected = false; getSupportActionBar().setDisplayHomeAsUpEnabled(false); initMenu(); } |