diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-03-14 22:40:56 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-03-14 22:40:56 +0100 |
| commit | b1a3d09ca6a4be59b57e2f7b1cdc8a245d60a858 (patch) | |
| tree | ca6d7f5eafd7bbe3deff4e9ad7a1f4a9a0a77bf3 /res | |
| parent | 4e4a767743a62d1f88814e5cf024bf983772df2c (diff) | |
use conference subject to identiy room
Diffstat (limited to '')
| -rw-r--r-- | res/layout/otr_fingerprint.xml | 1 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/res/layout/otr_fingerprint.xml b/res/layout/otr_fingerprint.xml index 28b6a555..666dadcd 100644 --- a/res/layout/otr_fingerprint.xml +++ b/res/layout/otr_fingerprint.xml @@ -10,7 +10,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="20sp" - android:textStyle="bold" android:typeface="monospace" android:text="@string/no_otr_fingerprint"/> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index f47439c8..904ea07e 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -49,5 +49,10 @@ android:title="Use Phones self contact picture" android:summary="You may no longer be able to distinguish which account you are using in a conversation" android:defaultValue="true"/> + <CheckBoxPreference + android:key="use_subject_in_muc" + android:title="Conference Name" + android:summary="Use room’s subject to identify Conferences" + android:defaultValue="true"/> </PreferenceCategory> </PreferenceScreen> |