diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-11-18 21:49:52 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-11-18 21:49:52 +0100 |
| commit | 2b9b3be3f1acef278b588c18fd8310920416935b (patch) | |
| tree | 2cf56d4b9877952bfb196694d7faafdf92ad9f20 /src/main/res | |
| parent | a86a36f57008c3a418ddd49a748100e79a25b8f2 (diff) | |
show 'clear devices' button underneath own devices
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 10 | ||||
| -rw-r--r-- | src/main/res/menu/editaccount.xml | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index ea4d49c8..442496bc 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -591,7 +591,7 @@ android:background="?attr/infocard_border" android:orientation="vertical" android:padding="@dimen/infocard_padding" - android:visibility="gone"> + android:visibility="visible"> <TextView android:id="@+id/other_device_keys_title" @@ -610,6 +610,14 @@ android:orientation="vertical" android:showDividers="middle"> </LinearLayout> + <Button + android:id="@+id/clear_devices" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/clear_other_devices" + android:layout_gravity="center_horizontal" + android:textColor="@color/accent"/> </LinearLayout> </LinearLayout> </ScrollView> diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 9ab1788b..5df7ee5b 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -44,10 +44,6 @@ android:title="@string/change_password"/> <item - android:id="@+id/action_clear_devices" - android:showAsAction="never" - android:title="@string/clear_other_devices"/> - <item android:id="@+id/action_settings" android:orderInCategory="100" android:showAsAction="never" |