From a7dd01131d8f18108b355499f02ca90aa15c6f53 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 13 Sep 2012 13:19:04 +0400 Subject: add option to force small tablet mode, move tablet-specific options to separate category, bump version --- src/org/fox/ttrss/CommonActivity.java | 9 ++++++++- src/org/fox/ttrss/PreferencesActivity.java | 5 ----- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java index d88775b3..3e254535 100644 --- a/src/org/fox/ttrss/CommonActivity.java +++ b/src/org/fox/ttrss/CommonActivity.java @@ -2,8 +2,10 @@ package org.fox.ttrss; import org.fox.ttrss.util.DatabaseHelper; +import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; import android.os.Bundle; +import android.preference.PreferenceManager; import android.support.v4.app.FragmentActivity; import android.util.DisplayMetrics; import android.util.FloatMath; @@ -19,6 +21,8 @@ public class CommonActivity extends FragmentActivity { public final static String FRAG_FEEDS = "feeds"; public final static String FRAG_CATS = "cats"; + private SharedPreferences m_prefs; + private SQLiteDatabase m_readableDb; private SQLiteDatabase m_writableDb; @@ -51,7 +55,7 @@ public class CommonActivity extends FragmentActivity { float inDiag = FloatMath.sqrt(inHeight * inHeight + inWidth * inWidth); - if (inDiag < 9) { + if (inDiag < 9 || m_prefs.getBoolean("force_small_tablet_ui", false)) { m_smallTablet = true; } @@ -88,6 +92,9 @@ public class CommonActivity extends FragmentActivity { m_compatMode = android.os.Build.VERSION.SDK_INT <= 10; + m_prefs = PreferenceManager + .getDefaultSharedPreferences(getApplicationContext()); + Log.d(TAG, "m_compatMode=" + m_compatMode); detectSmallTablet(); diff --git a/src/org/fox/ttrss/PreferencesActivity.java b/src/org/fox/ttrss/PreferencesActivity.java index 41fb00f2..017888f9 100644 --- a/src/org/fox/ttrss/PreferencesActivity.java +++ b/src/org/fox/ttrss/PreferencesActivity.java @@ -19,11 +19,6 @@ public class PreferencesActivity extends PreferenceActivity { .getDefaultSharedPreferences(getApplicationContext()); addPreferencesFromResource(R.xml.preferences); - - if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) != Configuration.SCREENLAYOUT_SIZE_XLARGE) { - PreferenceCategory category = (PreferenceCategory)findPreference("category_look_and_feel"); - category.removePreference(findPreference("tablet_article_swipe")); - } findPreference("justify_article_text").setEnabled(!prefs.getBoolean("combined_mode", false)); -- cgit v1.2.3-54-g00ecf