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 | |
| parent | 8e45b14c6158deaab5f0f67c90103896fdc2fdc1 (diff) | |
add optional article swiping for xlarge devices
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 5 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/PreferencesActivity.java | 18 |
4 files changed, 19 insertions, 7 deletions
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 @@ <string name="dialog_close">Close</string> <string name="donate_select">Please select the donation</string> <string name="donate_do">Donate!</string> + <string name="tablet_article_swipe">Swipe between articles</string> </resources>
\ 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" />
+
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="tablet_article_swipe"
+ android:title="@string/tablet_article_swipe" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/offline_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"));
+ }
+ }
}
|