diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-11 23:51:10 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-11 23:51:10 +0100 |
| commit | 3041cc74cefb4a25f4d1af7109fcb141ec3293d8 (patch) | |
| tree | 8eee0b9b56dd6ccbdecc2029a09166f9baf571a0 /src/main/res/layout/account_row.xml | |
| parent | 864bb77883b2f5d9f9122c102faa4af89d589653 (diff) | |
| parent | a4444026444c75678db1663e01de05df225cd9ed (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/account_row.xml')
| -rw-r--r-- | src/main/res/layout/account_row.xml | 3 |
1 files changed, 1 insertions, 2 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" |