aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-12-30 13:17:45 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-12-30 13:17:45 +0100
commit8c34bb3c6fb2be87eb9103bb2b647e2c7c80bfbc (patch)
tree72185861a27aaa3186e3e104c976c0889b7132bd /src/main/res
parent40a9f70478473e7068185ba03b9acbbadb936525 (diff)
hide inactive devices by default in contact details
Diffstat (limited to '')
-rw-r--r--src/main/res/layout/activity_contact_details.xml27
-rw-r--r--src/main/res/values/strings.xml2
2 files changed, 25 insertions, 4 deletions
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index ce62081e..f739eca6 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -109,7 +109,6 @@
</RelativeLayout>
<LinearLayout
- android:id="@+id/details_contact_keys"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
@@ -117,10 +116,30 @@
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:background="?attr/infocard_border"
- android:divider="?android:dividerHorizontal"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding"
- android:showDividers="middle" >
+ android:padding="@dimen/infocard_padding">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <LinearLayout
+ android:id="@+id/details_contact_keys"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:divider="?android:dividerHorizontal"
+ android:orientation="vertical"
+ android:showDividers="middle" >
+ </LinearLayout>
+ <Button
+ android:layout_marginTop="8dp"
+ android:id="@+id/show_inactive_devices"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/show_inactive_devices"
+ android:layout_gravity="center_horizontal"
+ android:textColor="@color/accent"/>
+ </LinearLayout>
</LinearLayout>
</LinearLayout>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6f27a8b1..be3b262d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -723,4 +723,6 @@
<string name="i_followed_this_link_from_a_trusted_source">I followed this link from a trusted source</string>
<string name="verifying_omemo_keys_trusted_source">You are about to verify the OMEMO keys of %1$s after clicking a link. This is only secure if you followed this link from a trusted source where only %2$s could have published this link.</string>
<string name="verify_omemo_keys">Verify OMEMO keys</string>
+ <string name="show_inactive_devices">Show inactive devices</string>
+ <string name="hide_inactive_devices">Hide inactive devices</string>
</resources>