diff options
| author | Andrew Dolgov <[email protected]> | 2015-06-04 00:30:35 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-06-04 00:30:35 +0300 |
| commit | c54d13e072968fe74f0e3c43ec664a12b115bdfa (patch) | |
| tree | 9e151bd9be7102854c1d6dd825172e56cf47d0a1 /org.fox.ttrss/src/main/res/layout-sw600dp-land | |
| parent | 6b6107b2764003af19162e85d16a49a4bd42f930 (diff) | |
move to v7 toolbar widget instead of old-style actionbar
Diffstat (limited to 'org.fox.ttrss/src/main/res/layout-sw600dp-land')
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml | 18 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml index ad4bd653..9c4b76f1 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml @@ -1,16 +1,23 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/main" android:fitsSystemWindows="true" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > + android:layout_height="fill_parent"> + + <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> + +<LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:layout_below="@+id/actionbar_toolbar"> <FrameLayout android:id="@+id/sw600dp_anchor" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" > - </FrameLayout> <LinearLayout @@ -38,4 +45,5 @@ </FrameLayout> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml index f4ff2c59..008efa4c 100755 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml @@ -5,6 +5,8 @@ android:layout_height="fill_parent" android:orientation="vertical" > + <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> + <FrameLayout android:id="@+id/sw600dp_anchor" android:layout_width="match_parent" |