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_edit_account.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 '')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 0c64832f5..6050a72ab 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -8,11 +8,15 @@ android:layout_height="wrap_content" 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:id="@+id/account_main_layout" @@ -612,19 +616,19 @@ android:orientation="vertical" android:padding="@dimen/card_padding_list"> - <TextView - android:id="@+id/other_device_keys_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/list_padding" - android:text="@string/other_devices" - android:textAppearance="@style/TextAppearance.AppCompat.Title" /> + <TextView + android:id="@+id/other_device_keys_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/list_padding" + android:text="@string/other_devices" + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> - <LinearLayout - android:id="@+id/other_device_keys" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"/> + <LinearLayout + android:id="@+id/other_device_keys" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> <Button android:id="@+id/clear_devices" |