aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-11-20 14:30:16 +0100
committerChristian Schneppe <christian@pix-art.de>2016-11-20 14:30:16 +0100
commit47a46c20ab506988c6c52196b6e15727fb0b4b1f (patch)
tree42ca9328326a5f7ba0ab6ae42245f6a799e5a1bd /src/main/res
parent9d6c146f5c9e0988827cd6184318a1d0d3adf965 (diff)
show 'clear devices' button underneath own devices
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/activity_edit_account.xml13
-rw-r--r--src/main/res/menu/editaccount.xml4
2 files changed, 11 insertions, 6 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 7747055ec..a7c54cdbf 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -612,7 +612,7 @@
android:background="@drawable/infocard_border"
android:orientation="vertical"
android:padding="@dimen/infocard_padding"
- android:visibility="gone">
+ android:visibility="visible">
<TextView
android:id="@+id/other_device_keys_title"
@@ -629,7 +629,16 @@
android:layout_height="wrap_content"
android:divider="?android:dividerHorizontal"
android:orientation="vertical"
- android:showDividers="middle"></LinearLayout>
+ 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 fa53c08de..1e968c2d4 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -51,10 +51,6 @@
android:showAsAction="never"
android:title="@string/mgmt_account_reconnect" />
<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"