diff options
author | Andrew Dolgov <[email protected]> | 2015-06-11 18:23:30 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-11 18:23:30 +0300 |
commit | e947eb7b8ee2a7b99c3d119453e019d9df104a1c (patch) | |
tree | 96c44d725c5e21a292fc9b94fc693dddd071c00b /org.fox.ttrss/src/main/res | |
parent | f114539024d0769edb6c25d0268fef6cd558c845 (diff) |
Revert "use dialogwhenlarge theme for image pager"
This reverts commit f114539024d0769edb6c25d0268fef6cd558c845.
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/article_images_pager.xml (renamed from org.fox.ttrss/src/main/res/layout/activity_images_pager.xml) | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/style.xml | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/activity_images_pager.xml b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml index 8e754bf7..8744af67 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/activity_images_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml @@ -1,7 +1,9 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:fitsSystemWindows="true" android:id="@+id/article_images" android:layout_width="fill_parent" android:animateLayoutChanges="true" + android:background="?headlinesBackground" android:layout_height="fill_parent"> <org.fox.ttrss.ArticleImagesPager @@ -35,4 +37,6 @@ android:visibility="invisible" /> + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + </RelativeLayout> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 25084641..a02ee887 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -123,12 +123,4 @@ <item name="floatingActionButtonColor">?colorPrimaryDark</item> </style> - <style name="ImagePagerTheme" parent="Theme.AppCompat.DialogWhenLarge"> - <item name="windowActionBarOverlay">true</item> - - <item name="colorPrimary">#607D8B</item> - <item name="colorPrimaryDark">#455A64</item> - <item name="colorAccent">#D84315</item> - </style> - </resources>
\ No newline at end of file |