From b8ee3dab39193c38323439c8d455a2e4929a51db Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 19 Oct 2013 10:13:51 +0400 Subject: do no ttry setting web software rendering before api 11 reimplement titlewebview as an alternative rendering option bump version --- .../fox/ttrss/offline/OfflineArticleFragment.java | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/org/fox/ttrss/offline') diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index dd7dde5e..b9d9f0de 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -123,7 +123,9 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector. m_articleId = savedInstanceState.getInt("articleId"); } - View view = inflater.inflate(R.layout.article_fragment, container, false); + boolean useTitleWebView = m_prefs.getBoolean("article_compat_view", false); + + View view = inflater.inflate(useTitleWebView ? R.layout.article_fragment_compat : R.layout.article_fragment, container, false); m_cursor = m_activity.getReadableDb().query("articles LEFT JOIN feeds ON (feed_id = feeds."+BaseColumns._ID+")", new String[] { "articles.*", "feeds.title AS feed_title" }, "articles." + BaseColumns._ID + "=?", @@ -212,8 +214,10 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector. getActivity().getTheme().resolveAttribute(R.attr.linkColor, tv, true); // prevent flicker in ics - if (!m_prefs.getBoolean("webview_hardware_accel", true)) { - web.setLayerType(View.LAYER_TYPE_SOFTWARE, null); + if (!m_prefs.getBoolean("webview_hardware_accel", true) || useTitleWebView) { + if (android.os.Build.VERSION.SDK_INT >= 11) { + web.setLayerType(View.LAYER_TYPE_SOFTWARE, null); + } } String theme = m_prefs.getString("theme", "THEME_DARK"); @@ -282,8 +286,14 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector. cssOverride + "" + "" + - "" + articleContent + ""; - + "" + articleContent; + + if (useTitleWebView) { + content += "

"; + } + + content += ""; + try { String baseUrl = null; -- cgit v1.2.3-54-g00ecf