diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-11 21:43:38 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-11 21:43:38 +0200 |
commit | 1046acb3e192c940dc99ebb564ec2756493ec987 (patch) | |
tree | 5448f272fd7a0ca261785686ac66dfaf39f1c518 /src/main/res/layout-w945dp/activity_conversations.xml | |
parent | 551f63b73c170a309108c7d3dc8839e6ada86596 (diff) |
replace deprecated action bar with toolbar
* replace deprecated action bar with toolbar
* add toolbar support in each activity
* remove redundant themes made earlier
* add configure action bar method in xmpp activity
* remove android namespace from actionmodeoverlay
* solve bug of scrolling toolbar
Diffstat (limited to 'src/main/res/layout-w945dp/activity_conversations.xml')
-rw-r--r-- | src/main/res/layout-w945dp/activity_conversations.xml | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/src/main/res/layout-w945dp/activity_conversations.xml b/src/main/res/layout-w945dp/activity_conversations.xml index cb5f2ccad..7cd5b36c4 100644 --- a/src/main/res/layout-w945dp/activity_conversations.xml +++ b/src/main/res/layout-w945dp/activity_conversations.xml @@ -3,20 +3,28 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="horizontal"> + android:orientation="vertical"> - <FrameLayout - android:id="@+id/main_fragment" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1000" /> + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> - <FrameLayout - android:id="@+id/secondary_fragment" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1618" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> - </LinearLayout> + <FrameLayout + android:id="@+id/main_fragment" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1000" /> + + <FrameLayout + android:id="@+id/secondary_fragment" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1618" /> + </LinearLayout> + </LinearLayout> </layout>
\ No newline at end of file |