summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2020-10-03 11:10:09 +0300
committerAndrew Dolgov <[email protected]>2020-10-03 11:10:09 +0300
commite9b10d4bc94aa8aba3fdd495c0fc87b2e9f9974c (patch)
tree2fdfb5b3976f7799e969bbf032dccb58e5f62043
parent00405e2a83e056a20f09ffbeb0564931583a2d05 (diff)
remove preference to disable webview acceleration
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java20
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java7
-rwxr-xr-xorg.fox.ttrss/src/main/res/xml/preferences.xml5
3 files changed, 1 insertions, 31 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 3a5c52a5..c0a55775 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -52,7 +52,6 @@ public class ArticleFragment extends StateSavedFragment {
//protected View m_fab;
protected int m_articleFontSize;
protected int m_articleSmallFontSize;
- protected boolean m_acceleratedWebview = true;
public void initialize(Article article) {
m_article = article;
@@ -354,25 +353,8 @@ public class ArticleFragment extends StateSavedFragment {
}
});
- // prevent flicker in ics
- if (!m_prefs.getBoolean("webview_hardware_accel", true)) {
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
- m_web.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
- m_acceleratedWebview = false;
- }
- }
-
m_web.setVisibility(View.VISIBLE);
- // we no longer use async rendering because chrome 66 webview breaks on it sometimes
-
- /*new Handler().postDelayed(new Runnable() {
- @Override
- public void run() {
- renderContent(savedInstanceState);
- }
- }, 250);*/
-
renderContent(savedInstanceState);
return view;
@@ -485,7 +467,7 @@ public class ArticleFragment extends StateSavedFragment {
//
}
- if (savedInstanceState == null || !m_acceleratedWebview) {
+ if (savedInstanceState == null) {
m_web.loadDataWithBaseURL(baseUrl, content.toString(), "text/html", "utf-8", null);
} else {
WebBackForwardList rc = m_web.restoreState(savedInstanceState);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index 4f328bcb..441ec62b 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -305,13 +305,6 @@ public class OfflineArticleFragment extends Fragment {
}
});
- // prevent flicker in ics
- if (!m_prefs.getBoolean("webview_hardware_accel", true)) {
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
- m_web.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
- }
- }
-
String content;
String cssOverride = "";
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index fb0354fc..5555c28f 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -233,11 +233,6 @@
android:title="@string/logcat_title" />
<org.fox.ttrss.util.LessBrokenSwitchPreference
- android:defaultValue="true"
- android:key="webview_hardware_accel"
- android:summary="@string/accel_webview_summary"
- android:title="@string/accel_webview_title" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
android:defaultValue="false"
android:key="transport_debugging"
android:title="@string/transport_debugging" />