aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-07-29 19:52:37 +0200
committerChristian Schneppe <christian@pix-art.de>2016-07-29 19:52:37 +0200
commit94933e21cd08c53a23e5ec6c12bc1dc383b1f3ce (patch)
tree4fa096547d0917f603252c9a279e4208ba4ef711 /src/main/res
parent50889004f3c679387d95ba9c49a53a8f882ba33c (diff)
changed package id inside manifest and project
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/activity_about.xml2
-rw-r--r--src/main/res/layout/activity_updater.xml2
-rw-r--r--src/main/res/layout/contact_key.xml2
-rw-r--r--src/main/res/layout/fragment_conversation.xml4
-rw-r--r--src/main/res/xml/preferences.xml8
5 files changed, 9 insertions, 9 deletions
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index 247e96e59..47204b430 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="eu.siacs.conversations.ui.AboutActivity"
+ tools:context="de.pixart.messenger.ui.AboutActivity"
android:background="@color/grey50"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml
index 4005ff180..ccc147361 100644
--- a/src/main/res/layout/activity_updater.xml
+++ b/src/main/res/layout/activity_updater.xml
@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="eu.siacs.conversations.ui.UpdaterActivity">
+ tools:context="de.pixart.messenger.ui.UpdaterActivity">
<TextView android:id="@+id/updater" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_alignParentLeft="true"
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index a4fd29e97..53a599fd3 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -56,7 +56,7 @@
android:visibility="gone" />
- <eu.siacs.conversations.ui.widget.Switch
+ <de.pixart.messenger.ui.widget.Switch
android:id="@+id/tgl_trust"
android:visibility="invisible"
android:layout_width="wrap_content"
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index a8ec03d4f..c0debe3a8 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -34,7 +34,7 @@
android:paddingLeft="2dp"
android:paddingBottom="2dp">
- <eu.siacs.conversations.ui.EditMessage
+ <de.pixart.messenger.ui.EditMessage
android:id="@+id/textinput"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
android:textColor="@color/black87">
<requestFocus />
- </eu.siacs.conversations.ui.EditMessage>
+ </de.pixart.messenger.ui.EditMessage>
<ImageButton
android:id="@+id/textSendButton"
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 6897d6f15..20259f8ce 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -49,13 +49,13 @@
android:key="enable_quiet_hours"
android:summary="@string/pref_quiet_hours_summary"
android:title="@string/title_pref_enable_quiet_hours" />
- <eu.siacs.conversations.ui.TimePreference
+ <de.pixart.messenger.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" />
- <eu.siacs.conversations.ui.TimePreference
+ <de.pixart.messenger.ui.TimePreference
android:dependency="enable_quiet_hours"
android:key="quiet_hours_end"
android:negativeButtonText="@string/cancel"
@@ -229,14 +229,14 @@
android:key="autojoin"
android:summary="@string/pref_autojoin_summary"
android:title="@string/pref_autojoin" />
- <eu.siacs.conversations.ui.ExportLogsPreference
+ <de.pixart.messenger.ui.ExportLogsPreference
android:key="export_logs"
android:summary="@string/pref_export_logs_summary"
android:title="@string/pref_export_logs" />
</PreferenceCategory>
</PreferenceScreen>
<!--About-->
- <eu.siacs.conversations.ui.AboutPreference
+ <de.pixart.messenger.ui.AboutPreference
android:icon="@drawable/ic_help_black_24dp"
android:summary="@string/pref_about_conversations_summary"
android:title="@string/title_activity_about" />