aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-08-12 12:41:13 +0200
committerChristian S <christian@pix-art.de>2015-08-12 12:41:13 +0200
commita0145e779d3caf58b0bfdb6a76587c61b345bf55 (patch)
tree619423e3139836b9ad78dc472e7a6592b0d015ba /src/main/res/layout
parent6ef1f090840eec062f23c3433eaeef77df75f874 (diff)
parent81b7e27a468edb37994225fa7ad3581e26f73c9d (diff)
version 1.6.0 beta 3
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/activity_edit_account.xml10
-rw-r--r--src/main/res/layout/contact_key.xml4
2 files changed, 8 insertions, 6 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 581614c76..4599b3a2f 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -380,7 +380,7 @@
android:layout_height="wrap_content"
android:textColor="@color/black54"
android:textSize="?attr/TextSizeInfo"
- android:text="@string/this_device_axolotl_fingerprint"/>
+ android:text="@string/this_device_omemo_fingerprint"/>
</LinearLayout>
<LinearLayout
@@ -399,16 +399,16 @@
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_copy"
android:visibility="visible"
- android:contentDescription="@string/copy_axolotl_clipboard_description"/>
+ android:contentDescription="@string/copy_omemo_clipboard_description"/>
<ImageButton
- android:id="@+id/action_regenerate_axolotl_key"
+ android:id="@+id/action_regenerate_omemo_key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_refresh"
android:visibility="gone"
- android:contentDescription="@string/regenerate_axolotl_key"/>
+ android:contentDescription="@string/regenerate_omemo_key"/>
</LinearLayout>
</RelativeLayout>
@@ -484,4 +484,4 @@
android:textColor="@color/black54" />
</LinearLayout>
-</RelativeLayout> \ No newline at end of file
+</RelativeLayout>
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 0f61a15f1..a4fd29e97 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -8,7 +8,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:padding="8dp" >
+ android:paddingTop="8dp"
+ android:paddingLeft="8dp"
+ android:paddingBottom="8dp">
<TextView
android:id="@+id/key"