diff options
author | Andrew Dolgov <[email protected]> | 2013-04-18 16:37:38 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-04-18 16:40:57 +0400 |
commit | aadfbbc18b7126011d879754b1b3d11056519b01 (patch) | |
tree | ef531963c7881aacf6403aa5cab2bdeb14eb3ee3 /res/xml | |
parent | 490f53e6d088cc8c09a1a9ea933d24db4afae5d1 (diff) | |
parent | f012d88a7e2a4a30b91f6617480dbb5d658454ee (diff) |
Merge branch 'master' of git://github.com/dalingrin/Tiny-Tiny-RSS-for-Honeycomb
Conflicts:
res/values/strings.xml
res/xml/preferences.xml
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/preferences.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 99ac42aa..e05fc5b6 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -92,13 +92,16 @@ android:key="headlines_show_content"
android:summary="@string/pref_headlines_show_content_long"
android:title="@string/pref_headlines_show_content" />
-
<CheckBoxPreference
android:defaultValue="false"
android:key="oldest_first"
android:summary="@string/requires_api5"
android:title="@string/offline_oldest_first" />
-
+ <CheckBoxPreference android:key="headlines_mark_read_scroll"
+ android:title="@string/pref_headlines_mark_read_scroll"
+ android:summary="@string/pref_headlines_mark_read_scroll_long"
+ android:defaultValue="false"/>
+ </PreferenceCategory>
<PreferenceCategory android:title="@string/reading" >
<ListPreference
|