aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/welcome.xml
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-05-31 21:40:45 +0200
committerChristian Schneppe <christian@pix-art.de>2016-05-31 21:40:45 +0200
commit5f8de512f5d14515146d341bc3e0ae0e066837b8 (patch)
tree87f6b90d606db834f2503549b4c82f18bae1a376 /src/main/res/layout/welcome.xml
parentc23642b8cd2c06c5f3e9cf7f88d31ed5c6f78614 (diff)
parent9e724edb42d8cb0fa8745f88a80d914df09f4ff6 (diff)
Merge remote-tracking branch 'refs/remotes/origin/new_version'
Diffstat (limited to 'src/main/res/layout/welcome.xml')
-rw-r--r--src/main/res/layout/welcome.xml20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index 813570759..2fb9667a5 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -43,6 +43,26 @@
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:text="@string/import_text"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ android:visibility="gone"
+ android:id="@id/import_text" />
+
+ <Button
+ android:id="@+id/import_database"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:text="@string/import_database"
+ android:textColor="@color/accent"
+ android:visibility="gone" />
+
<Button
android:id="@+id/create_account"
style="?android:attr/borderlessButtonStyle"