diff --git a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
index 3c837b945..59d58db5f 100644
--- a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
@@ -1,5 +1,6 @@
package eu.siacs.conversations.ui;
+import android.app.ActionBar;
import android.app.Activity;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -16,6 +17,11 @@ public class WelcomeActivity extends Activity {
if (getResources().getBoolean(R.bool.portrait_only)) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}
+ final ActionBar ab = getActionBar();
+ if (ab != null) {
+ ab.setDisplayShowHomeEnabled(false);
+ ab.setDisplayHomeAsUpEnabled(false);
+ }
super.onCreate(savedInstanceState);
setContentView(R.layout.welcome);
final Button createAccount = (Button) findViewById(R.id.create_account);
diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml
index e21ce5c02..a7f62747f 100644
--- a/src/main/res/layout/magic_create.xml
+++ b/src/main/res/layout/magic_create.xml
@@ -17,7 +17,7 @@
android:layout_alignParentStart="true"
android:minHeight="256dp"
android:orientation="vertical"
- android:paddingBottom="8dp"
+ android:paddingBottom="10dp"
android:paddingLeft="16dp"
android:paddingRight="16dp">
+
\ No newline at end of file
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index 3d618675e..a8278187f 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -17,7 +17,7 @@
android:layout_alignParentStart="true"
android:minHeight="256dp"
android:orientation="vertical"
- android:paddingBottom="8dp"
+ android:paddingBottom="10dp"
android:paddingLeft="16dp"
android:paddingRight="16dp">
+
\ No newline at end of file
diff --git a/src/main/res/values-w360dp/fineprint.xml b/src/main/res/values-w360dp/fineprint.xml
new file mode 100644
index 000000000..ca44db986
--- /dev/null
+++ b/src/main/res/values-w360dp/fineprint.xml
@@ -0,0 +1,4 @@
+
+
+ ¹ 8 Euro a year. First 6 month free. App remains free of charge.
+
\ No newline at end of file
diff --git a/src/main/res/values/fineprint.xml b/src/main/res/values/fineprint.xml
new file mode 100644
index 000000000..bbe52fdd0
--- /dev/null
+++ b/src/main/res/values/fineprint.xml
@@ -0,0 +1,4 @@
+
+
+ ¹ 8 Euro a year. First 6 month free. App remains free.
+
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c7c791dfb..170cbfffa 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -629,8 +629,8 @@
No application found to share URI
Share URI with…
Join the Conversation
- XMPP is a provider independent protocol. You can use this client with what ever XMPP server you choose.\nHowever for your convenience we made it easy to create an account on conversations.im; a provider specially suited for the use with Conversations.
- We will guide you through the process of creating an account on conversations.im.\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full Jabber ID.
+ XMPP is a provider independent protocol. You can use this client with what ever XMPP server you choose.\nHowever for your convenience we made it easy to create an account on conversations.im¹; a provider specially suited for the use with Conversations.
+ We will guide you through the process of creating an account on conversations.im.¹\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full Jabber ID.
Your full Jabber ID will be: %s
Create Account
Use my own provider