diff --git a/res/values/strings.xml b/res/values/strings.xml index 2a5ec6dc..1af925e4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -126,4 +126,5 @@ Close Please select the donation Donate! + Swipe between articles \ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 44d41d65..588510d8 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -92,6 +92,11 @@ android:key="combined_mode" android:summary="@string/combined_mode_summary" android:title="@string/combined_mode" /> + + diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 5d7ecd09..84cac492 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -1709,7 +1709,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices { Fragment frag; - if (m_smallScreenMode) { + if (m_smallScreenMode || m_prefs.getBoolean("tablet_article_swipe", false)) { frag = new ArticlePager(article); } else { frag = new ArticleFragment(article); diff --git a/src/org/fox/ttrss/PreferencesActivity.java b/src/org/fox/ttrss/PreferencesActivity.java index 5d538fc0..742320f7 100644 --- a/src/org/fox/ttrss/PreferencesActivity.java +++ b/src/org/fox/ttrss/PreferencesActivity.java @@ -1,14 +1,20 @@ package org.fox.ttrss; +import android.content.res.Configuration; import android.os.Bundle; import android.preference.PreferenceActivity; public class PreferencesActivity extends PreferenceActivity { - + @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - addPreferencesFromResource(R.xml.preferences); - } + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.preferences); + + if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) != Configuration.SCREENLAYOUT_SIZE_XLARGE) { + getPreferenceScreen().removePreference( + findPreference("tablet_article_swipe")); + } + } }