diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-06-07 15:22:51 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-06-07 15:22:51 +0200 |
| commit | f7d2e1560377b36d3730922a2fadaee05a570b49 (patch) | |
| tree | 1c99bd75d863d82a82495fabe434892ee76b9842 /src/main/AndroidManifest.xml | |
| parent | c5c5b417ddd66b4611b0493c0e0a8349adbd34a4 (diff) | |
Related to FS#140, Logo implementation moved to FloatingActionButton
- Appcompat v7 dependency added
- References adjusted to work correctly with appcompat v7
Diffstat (limited to 'src/main/AndroidManifest.xml')
| -rw-r--r-- | src/main/AndroidManifest.xml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index ca369a5d..f2d0a51e 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -25,7 +25,7 @@ android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@style/ConversationsTheme" + android:theme="@style/ConversationsPlusTheme" tools:replace="android:label" android:name="de.thedevstack.conversationsplus.ConversationsPlusApplication"> <service android:name=".services.XmppConnectionService" /> @@ -43,7 +43,8 @@ android:name=".ui.ConversationActivity" android:label="@string/app_name" android:launchMode="singleTask" - android:windowSoftInputMode="stateHidden"> + android:windowSoftInputMode="stateHidden" + android:theme="@style/ConversationsPlusTheme.NoActionBar"> <intent-filter> <action android:name="android.intent.action.MAIN"/> @@ -54,7 +55,8 @@ android:name=".ui.StartConversationActivity" android:configChanges="orientation|screenSize" android:label="@string/title_activity_start_conversation" - android:launchMode="singleTask"> + android:launchMode="singleTask" + android:theme="@style/ConversationsPlusTheme.ActionBar"> <intent-filter> <action android:name="android.intent.action.SENDTO"/> @@ -81,7 +83,8 @@ </activity> <activity android:name=".ui.SettingsActivity" - android:label="@string/title_activity_settings"/> + android:label="@string/title_activity_settings" + android:theme="@style/ConversationsPlusTheme.ActionBar"/> <activity android:name=".ui.ChooseContactActivity" android:label="@string/title_activity_choose_contact"/> |