diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/layout/activity_about.xml | 2 | ||||
| -rw-r--r-- | src/main/res/layout/contact_key.xml | 1 | ||||
| -rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 8 |
5 files changed, 8 insertions, 9 deletions
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index 142087c0..8f1113ad 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -1,6 +1,6 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - tools:context="de.thedevstack.conversationsplus.ui.AboutActivity" + tools:context="eu.siacs.conversations.ui.AboutActivity" android:background="@color/grey50" android:layout_width="fill_parent" android:layout_height="fill_parent"> diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index bf818001..03246ccb 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -55,7 +55,6 @@ android:src="?attr/icon_remove" android:visibility="gone" /> - <Switch android:id="@+id/tgl_trust" android:visibility="invisible" diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index c5a6595c..dd102177 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -39,7 +39,7 @@ android:layout_alignParentLeft="true" android:background="@color/grey50" > - <de.thedevstack.conversationsplus.ui.EditMessage + <eu.siacs.conversations.ui.EditMessage android:id="@+id/textinput" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -59,7 +59,7 @@ app:emojiconSize="?attr/EmojiconSizeInput" > <requestFocus /> - </de.thedevstack.conversationsplus.ui.EditMessage> + </eu.siacs.conversations.ui.EditMessage> <ImageButton android:id="@+id/textSendButton" diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 59bf0b9c..3e939114 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name" translatable="false">Conversations+</string> + <string name="app_name" translatable="false">Conversations</string> <string name="action_settings">Settings</string> <string name="action_add">New conversation</string> <string name="action_accounts">Manage accounts</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 17c56bf7..f0de762b 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -99,13 +99,13 @@ android:key="enable_quiet_hours" android:summary="@string/pref_quiet_hours_summary" android:title="@string/title_pref_enable_quiet_hours" /> - <de.thedevstack.conversationsplus.ui.TimePreference + <eu.siacs.conversations.ui.TimePreference android:dependency="enable_quiet_hours" android:key="quiet_hours_start" android:negativeButtonText="@string/cancel" android:positiveButtonText="@string/set" android:title="@string/title_pref_quiet_hours_start_time" /> - <de.thedevstack.conversationsplus.ui.TimePreference + <eu.siacs.conversations.ui.TimePreference android:dependency="enable_quiet_hours" android:key="quiet_hours_end" android:negativeButtonText="@string/cancel" @@ -243,7 +243,7 @@ android:key="keep_foreground_service" android:summary="@string/pref_keep_foreground_service_summary" android:title="@string/pref_keep_foreground_service"/> - <de.thedevstack.conversationsplus.ui.ExportLogsPreference + <eu.siacs.conversations.ui.ExportLogsPreference android:key="export_logs" android:summary="@string/pref_export_logs_summary" android:title="@string/pref_export_logs"/> @@ -264,7 +264,7 @@ android:summary="@string/pref_never_send_crash_summary" android:title="@string/pref_never_send_crash"/> </PreferenceCategory> - <de.thedevstack.conversationsplus.ui.AboutPreference + <eu.siacs.conversations.ui.AboutPreference android:summary="@string/pref_about_conversations_summary" android:title="@string/title_activity_about"/> </PreferenceScreen> |