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/activity_trust_keys.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/activity_trust_keys.xml')
-rw-r--r-- | src/main/res/layout/activity_trust_keys.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml index 431348f19..b2c03ed8e 100644 --- a/src/main/res/layout/activity_trust_keys.xml +++ b/src/main/res/layout/activity_trust_keys.xml @@ -6,11 +6,15 @@ android:layout_height="match_parent" android:background="?attr/color_background_secondary"> + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_above="@+id/button_bar" - android:layout_alignParentTop="true"> + android:layout_below="@id/toolbar"> <LinearLayout android:layout_width="match_parent" |