diff --git a/OsmAnd/res/drawable-v21/btn_round.xml b/OsmAnd/res/drawable-v21/btn_round.xml
new file mode 100644
index 0000000000..7c353e1ec7
--- /dev/null
+++ b/OsmAnd/res/drawable-v21/btn_round.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout-xlarge/first_usage_fragment.xml b/OsmAnd/res/layout-xlarge/first_usage_fragment.xml
index 5204891e04..7471bb1bc4 100644
--- a/OsmAnd/res/layout-xlarge/first_usage_fragment.xml
+++ b/OsmAnd/res/layout-xlarge/first_usage_fragment.xml
@@ -4,6 +4,7 @@
xmlns:osmand="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools"
android:clickable="true"
android:theme="@style/OsmandLightTheme">
@@ -51,7 +52,7 @@
@@ -87,6 +88,9 @@
android:id="@+id/skip_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ tools:text="skip skip skip"
+ android:padding="12dp"
+ android:background="@drawable/btn_round"
android:layout_gravity="center"
android:text="@string/shared_string_skip"
android:textColor="@color/dashboard_general_button_text_light"/>
diff --git a/OsmAnd/res/layout/first_usage_fragment.xml b/OsmAnd/res/layout/first_usage_fragment.xml
index 9cb8366ebe..573a2e6bf8 100644
--- a/OsmAnd/res/layout/first_usage_fragment.xml
+++ b/OsmAnd/res/layout/first_usage_fragment.xml
@@ -4,6 +4,7 @@
xmlns:osmand="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools"
android:clickable="true"
android:theme="@style/OsmandLightTheme">
@@ -51,7 +52,7 @@
@@ -69,8 +70,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="12dp"
+ android:layout_marginRight="12dp"
android:background="@null"
- android:drawableLeft="@drawable/ic_action_search_dark"
+ tools:drawableLeft="@drawable/ic_action_search_dark"
android:drawablePadding="12dp"
android:gravity="center_vertical"
android:hint="Enter country name"
@@ -88,6 +90,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
+ tools:text="skip skip skip"
+ android:padding="12dp"
+ android:background="@drawable/btn_round"
android:text="@string/shared_string_skip"
android:textColor="@color/dashboard_general_button_text_light"/>
diff --git a/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java
index 7355e85838..b6abe32cce 100644
--- a/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java
@@ -94,6 +94,7 @@ public class DataStoragePlaceDialogFragment extends DialogFragment {
closeImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ isInterestedInFirstTime = false;
dismiss();
}
});