diff options
| author | Andrew Dolgov <[email protected]> | 2014-11-25 12:33:09 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-11-25 12:33:09 +0300 |
| commit | 2b6c8116b805098bf9e735533688bed70770aa8d (patch) | |
| tree | eacdc6bd23b50b104dc9c9bef97ddca3402a9dd7 /org.fox.ttrss/src/main/res | |
| parent | 716d84195fa6e1f037ae751ee221caa0647662b3 (diff) | |
| parent | 40c88ee240924ebb894c2f48e685b2ea9fbe0a32 (diff) | |
Merge branch 'master' into fsvideo-test
Diffstat (limited to 'org.fox.ttrss/src/main/res')
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout/article_images_image.xml | 2 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout/article_images_pager.xml | 5 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/xml/preferences.xml | 5 |
3 files changed, 3 insertions, 9 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/article_images_image.xml b/org.fox.ttrss/src/main/res/layout/article_images_image.xml index c5adadc6..2b6d5856 100644 --- a/org.fox.ttrss/src/main/res/layout/article_images_image.xml +++ b/org.fox.ttrss/src/main/res/layout/article_images_image.xml @@ -18,7 +18,7 @@ android:layout_gravity="center" android:id="@+id/flavor_image_progress" /> - <org.fox.ttrss.util.EnlargingImageView + <it.sephiroth.android.library.imagezoom.ImageViewTouch android:id="@+id/flavor_image" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml index 28f71458..52791932 100644 --- a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml @@ -10,12 +10,11 @@ android:paddingTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"> */ - <android.support.v4.view.ViewPager + <org.fox.ttrss.ArticleImagesPager android:id="@+id/article_images_pager" android:layout_alignParentTop="true" android:layout_width="fill_parent" - android:layout_height="fill_parent" > - </android.support.v4.view.ViewPager> + android:layout_height="fill_parent" /> <com.viewpagerindicator.UnderlinePageIndicator android:id="@+id/article_images_indicator" diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index fbaec0d2..b9087b22 100644 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -145,11 +145,6 @@ android:title="@string/use_volume_keys" /> <CheckBoxPreference android:defaultValue="false" - android:key="dim_status_bar" - android:summary="@string/prefs_dim_status_bar_long" - android:title="@string/prefs_dim_status_bar" /> - <CheckBoxPreference - android:defaultValue="false" android:key="full_screen_mode" android:title="@string/prefs_fullscreen_mode" /> <CheckBoxPreference |