aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-11 23:51:10 +0100
committersteckbrief <steckbrief@chefmail.de>2016-03-11 23:51:10 +0100
commit3041cc74cefb4a25f4d1af7109fcb141ec3293d8 (patch)
tree8eee0b9b56dd6ccbdecc2029a09166f9baf571a0 /src/main/res/layout
parent864bb77883b2f5d9f9122c102faa4af89d589653 (diff)
parenta4444026444c75678db1663e01de05df225cd9ed (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts: src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/widget/Switch.java src/main/res/layout/account_row.xml src/main/res/layout/contact_key.xml
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/account_row.xml3
-rw-r--r--src/main/res/layout/contact_key.xml6
2 files changed, 3 insertions, 6 deletions
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index c6569d5a..d1ec92af 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -46,8 +46,7 @@
android:textStyle="bold" />
</LinearLayout>
- <eu.siacs.conversations.ui.widget.Switch
- style="@style/MD"
+ <Switch
android:id="@+id/tgl_account_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 6d61026d..03246ccb 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -55,15 +55,13 @@
android:src="?attr/icon_remove"
android:visibility="gone" />
-
- <eu.siacs.conversations.ui.widget.Switch
+ <Switch
android:id="@+id/tgl_trust"
android:visibility="invisible"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- style="@style/MD"/>
+ android:layout_centerVertical="true"/>
</RelativeLayout>
</RelativeLayout> \ No newline at end of file