diff options
| author | Andrew Dolgov <[email protected]> | 2013-10-16 18:52:04 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-10-16 18:52:04 +0400 |
| commit | ced4e4b089100920fe937cf4863553e504a35b90 (patch) | |
| tree | 7695a53b1850cad04dfa9dbc735c8c44f50c5feb | |
| parent | d6e1597e7360859e0250d71231538c6b993cb9b4 (diff) | |
bump version, target api 18
make webview software layer optional
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 5 | ||||
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineArticleFragment.java | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2fccf1e5..2f7e5aee 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="205" + android:versionCode="206" android:versionName="1.16" > <uses-sdk android:minSdkVersion="8" - android:targetSdkVersion="17" /> + android:targetSdkVersion="18" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index f6b0798e..b6831d6d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -202,4 +202,6 @@ <string name="pref_headline_font_size">Headline text size</string> <string name="context_confirm_catchup">Mark all articles in %1$s as read?</string> <string name="theme_system">Device Default</string> + <string name="accel_webview_summary">Disable if you see flicker or visual glitches.</string> + <string name="accel_webview_title">Accelerate web views</string> </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index b098b394..7f247d92 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -162,6 +162,11 @@ </PreferenceCategory>
<PreferenceCategory android:title="@string/debugging" >
<CheckBoxPreference
+ android:defaultValue="true"
+ android:key="webview_hardware_accel"
+ android:summary="@string/accel_webview_summary"
+ android:title="@string/accel_webview_title" />
+ <CheckBoxPreference
android:defaultValue="false"
android:key="transport_debugging"
android:title="@string/transport_debugging" />
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 75ba2164..ea1a1205 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -164,7 +164,7 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl registerForContextMenu(web); // prevent flicker in ics - if (android.os.Build.VERSION.SDK_INT >= 11 && android.os.Build.VERSION.SDK_INT < 14) { + if (!m_prefs.getBoolean("webview_hardware_accel", true)) { web.setLayerType(View.LAYER_TYPE_SOFTWARE, null); } diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index f8876f99..b8f60bd7 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -211,7 +211,7 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector. getActivity().getTheme().resolveAttribute(R.attr.linkColor, tv, true); // prevent flicker in ics - if (android.os.Build.VERSION.SDK_INT >= 11 && android.os.Build.VERSION.SDK_INT < 14) { + if (!m_prefs.getBoolean("webview_hardware_accel", true)) { web.setLayerType(View.LAYER_TYPE_SOFTWARE, null); } |