aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-23 21:57:53 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-23 21:57:53 +0200
commit25e44cbf52b87f6fbe9b2d491037594d9e406648 (patch)
tree9d16c1f0b6dd55d6ba26f62cd7ec7baf2771f4a7
parentd7656dd420d2215de776b3665760f867aee6bea4 (diff)
new logo
-rw-r--r--AndroidManifest.xml20
-rw-r--r--res/drawable-hdpi/ic_activity.pngbin0 -> 5363 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher.pngbin1615 -> 4416 bytes
-rw-r--r--res/drawable-hdpi/ic_notification.pngbin0 -> 875 bytes
-rw-r--r--res/drawable-mdpi/ic_activity.pngbin0 -> 3202 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher.pngbin1111 -> 2726 bytes
-rw-r--r--res/drawable-mdpi/ic_notification.pngbin0 -> 596 bytes
-rw-r--r--res/drawable-xhdpi/ic_activity.pngbin0 -> 7699 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher.pngbin2146 -> 6503 bytes
-rw-r--r--res/drawable-xhdpi/ic_notification.pngbin0 -> 1161 bytes
-rw-r--r--res/drawable-xxhdpi/ic_launcher.pngbin3272 -> 10481 bytes
-rw-r--r--res/drawable-xxhdpi/ic_notification.pngbin0 -> 2106 bytes
12 files changed, 13 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 70d181549..2de7ca14a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,7 +41,8 @@
android:configChanges="orientation|screenSize"
android:label="@string/title_activity_conversations"
android:windowSoftInputMode="stateHidden"
- android:launchMode="singleTask" >
+ android:launchMode="singleTask"
+ android:logo="@drawable/ic_activity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -51,29 +52,34 @@
<activity
android:name="eu.siacs.conversations.ui.SettingsActivity"
android:label="@string/title_activity_settings"
- android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
+ android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
+ android:logo="@drawable/ic_activity">
</activity>
<activity
android:name="eu.siacs.conversations.ui.ManageAccountActivity"
android:label="@string/title_activity_manage_accounts"
android:configChanges="orientation|screenSize"
- android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
+ android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
+ android:logo="@drawable/ic_activity">
</activity>
<activity
android:name="eu.siacs.conversations.ui.MucDetailsActivity"
android:label="@string/title_activity_conference_details"
- android:windowSoftInputMode="stateHidden" >
+ android:windowSoftInputMode="stateHidden"
+ android:logo="@drawable/ic_activity">
</activity>
<activity
android:name="eu.siacs.conversations.ui.ContactDetailsActivity"
android:label="@string/title_activity_contact_details"
- android:windowSoftInputMode="stateHidden" >
+ android:windowSoftInputMode="stateHidden"
+ android:logo="@drawable/ic_activity">
</activity>
<activity
android:name="eu.siacs.conversations.ui.ContactsActivity"
android:label="@string/title_activity_contacts"
android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
- android:windowSoftInputMode="stateHidden" >
+ android:windowSoftInputMode="stateHidden"
+ android:logo="@drawable/ic_activity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="de.gultsch.chat.ui.ConversationActivity" />
@@ -88,7 +94,7 @@
android:name="eu.siacs.conversations.ui.ShareWithActivity"
android:label="@string/title_activity_conversations"
android:theme="@android:style/Theme.Holo.Light.DialogWhenLarge"
- android:icon="@drawable/ic_launcher">
+ android:icon="@drawable/ic_activity">
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/res/drawable-hdpi/ic_activity.png b/res/drawable-hdpi/ic_activity.png
new file mode 100644
index 000000000..e2b58373c
--- /dev/null
+++ b/res/drawable-hdpi/ic_activity.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
index 3125b12dd..d48df2c38 100644
--- a/res/drawable-hdpi/ic_launcher.png
+++ b/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_notification.png b/res/drawable-hdpi/ic_notification.png
new file mode 100644
index 000000000..f1c6e150b
--- /dev/null
+++ b/res/drawable-hdpi/ic_notification.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_activity.png b/res/drawable-mdpi/ic_activity.png
new file mode 100644
index 000000000..38e7b3e40
--- /dev/null
+++ b/res/drawable-mdpi/ic_activity.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
index b3c9a5e10..200daf4c9 100644
--- a/res/drawable-mdpi/ic_launcher.png
+++ b/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_notification.png b/res/drawable-mdpi/ic_notification.png
new file mode 100644
index 000000000..072e7ba7b
--- /dev/null
+++ b/res/drawable-mdpi/ic_notification.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_activity.png b/res/drawable-xhdpi/ic_activity.png
new file mode 100644
index 000000000..75a1b1111
--- /dev/null
+++ b/res/drawable-xhdpi/ic_activity.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
index 5ef36c2f1..927a2d2a5 100644
--- a/res/drawable-xhdpi/ic_launcher.png
+++ b/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_notification.png b/res/drawable-xhdpi/ic_notification.png
new file mode 100644
index 000000000..0500d3750
--- /dev/null
+++ b/res/drawable-xhdpi/ic_notification.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png
index 9dbbdd971..3f856599c 100644
--- a/res/drawable-xxhdpi/ic_launcher.png
+++ b/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_notification.png b/res/drawable-xxhdpi/ic_notification.png
new file mode 100644
index 000000000..962dc126f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_notification.png
Binary files differ