diff options
| author | Andrew Dolgov <[email protected]> | 2012-03-01 11:30:54 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-03-01 11:30:54 +0300 |
| commit | 59a4d3d439ce0a5ff39a94b44fc6886ecdab78a4 (patch) | |
| tree | fd6eaeff1314b508af8db14428cbd59bbac7e0b5 /src/org | |
| parent | 8e45b14c6158deaab5f0f67c90103896fdc2fdc1 (diff) | |
add optional article swiping for xlarge devices
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/PreferencesActivity.java | 18 |
2 files changed, 13 insertions, 7 deletions
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"));
+ }
+ }
}
|