[new downloader][android] fix: Images updated.

android/res/layout-land/fragment_suggest_country_download.xml

@@ -12,8 +12,9 @@
 
     <LinearLayout
       android:id="@+id/ll__select_download"
-      android:layout_width="match_parent"
+      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:layout_gravity="center"
       android:gravity="center_horizontal"
       android:orientation="vertical"
       android:paddingLeft="@dimen/margin_base"
@@ -22,7 +23,7 @@
       tools:ignore="UnusedAttribute">
 
       <TextView
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/search_without_internet_advertisement"
@@ -30,7 +31,7 @@
 
       <LinearLayout
         android:id="@+id/ll__location_determined"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:gravity="center_horizontal">
@@ -41,7 +42,8 @@
           android:layout_height="@dimen/height_block_base"
           android:layout_marginTop="@dimen/margin_half"
           android:gravity="center"
-          android:textAppearance="@style/MwmTextAppearance.Title"/>
+          android:textAppearance="@style/MwmTextAppearance.Title"
+          tools:text="Some country"/>
 
         <Button
           android:id="@+id/btn__download_map"

android/res/layout/fragment_migrate.xml

@@ -16,13 +16,13 @@
     <ImageView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:src="@drawable/img_no_map_light"
+      android:layout_marginBottom="@dimen/margin_base"
+      android:src="@drawable/img_news_migration"
       android:tag="@string/tag_height_limited"/>
 
     <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/margin_base"
       android:layout_marginBottom="@dimen/margin_base"
       android:gravity="center"
       android:text="@string/youve_been_asking"

android/res/layout/fragment_suggest_country_download.xml

@@ -1,94 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<com.mapswithme.maps.widget.HeightLimitedFrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:wheel="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="?windowBackgroundForced">
-  <ScrollView
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+  <LinearLayout
+    android:id="@+id/ll__select_download"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/margin_double_and_half"
+    android:paddingRight="@dimen/margin_double_and_half"
+    tools:ignore="UnusedAttribute">
+    <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:gravity="center"
+      android:text="@string/search_without_internet_advertisement"
+      android:textAppearance="@style/MwmTextAppearance.Body2"/>
+
+    <ImageView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/margin_half"
+      android:src="@drawable/img_search_no_maps"
+      android:tag="@string/tag_height_limited"/>
+
     <LinearLayout
-      android:id="@+id/ll__select_download"
+      android:id="@+id/ll__location_determined"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:gravity="center_horizontal"
+      android:orientation="vertical">
+      <TextView
+        android:id="@+id/tv__country_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_half"
+        android:paddingTop="@dimen/margin_half"
+        android:paddingBottom="@dimen/margin_half"
+        android:gravity="center"
+        android:textAppearance="@style/MwmTextAppearance.Title"
+        tools:text="Some country name"/>
+
+      <Button
+        android:id="@+id/btn__download_map"
+        style="@style/MwmWidget.Button.Accent"
+        android:layout_marginTop="@dimen/margin_half"
+        android:text="@string/downloader_download_map"
+        android:textAppearance="@style/MwmTextAppearance.Body1"/>
+    </LinearLayout>
+
+    <LinearLayout
+      android:id="@+id/ll__location_unknown"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
       android:orientation="vertical"
-      android:padding="@dimen/margin_double_and_half"
-      tools:ignore="UnusedAttribute">
+      android:gravity="center_horizontal"
+      android:visibility="gone"
+      tools:visibility="visible">
       <TextView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_base_plus"
+        android:layout_height="@dimen/height_block_base"
+        android:layout_marginTop="@dimen/margin_half"
         android:gravity="center"
-        android:text="@string/search_without_internet_advertisement"
-        android:textAppearance="@style/MwmTextAppearance.Body2"/>
+        android:text="@string/unknown_current_position"
+        android:textAppearance="@style/MwmTextAppearance.Body3"/>
 
-      <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:contentDescription="@null"/>
+      <Button
+        android:id="@+id/btn__select_map"
+        style="@style/MwmWidget.Button.Accent"
+        android:layout_marginTop="@dimen/margin_half"
+        android:text="@string/search_select_map"
+        android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
-      <LinearLayout
-        android:id="@+id/ll__location_determined"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-        <TextView
-          android:id="@+id/tv__country_name"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="@dimen/margin_half"
-          android:paddingTop="@dimen/margin_half"
-          android:paddingBottom="@dimen/margin_half"
-          android:gravity="center"
-          android:textAppearance="@style/MwmTextAppearance.Title"
-          tools:text="Some country name"/>
-
-        <Button
-          android:id="@+id/btn__download_map"
-          style="@style/MwmWidget.Button.Accent"
-          android:layout_marginTop="@dimen/margin_half"
-          android:text="@string/downloader_download_map"
-          android:textAppearance="@style/MwmTextAppearance.Body1"/>
-      </LinearLayout>
-
-      <LinearLayout
-        android:id="@+id/ll__location_unknown"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center_horizontal"
-        android:visibility="gone"
-        tools:visibility="visible">
-        <TextView
-          android:layout_width="match_parent"
-          android:layout_height="@dimen/height_block_base"
-          android:layout_marginTop="@dimen/margin_half"
-          android:gravity="center"
-          android:text="@string/unknown_current_position"
-          android:textAppearance="@style/MwmTextAppearance.Body3"/>
-
-        <Button
-          android:id="@+id/btn__select_map"
-          style="@style/MwmWidget.Button.Accent"
-          android:layout_marginTop="@dimen/margin_half"
-          android:text="@string/search_select_map"
-          android:textAppearance="@style/MwmTextAppearance.Body1"/>
-
-        <Button
-          android:id="@+id/btn__select_other_map"
-          style="@style/MwmWidget.Button"
-          android:layout_marginTop="@dimen/margin_base_plus"
-          android:text="@string/search_select_other_map"
-          android:textAppearance="@style/MwmTextAppearance.Body3"
-          android:textColor="?colorAccent"/>
-      </LinearLayout>
+      <Button
+        android:id="@+id/btn__select_other_map"
+        style="@style/MwmWidget.Button"
+        android:layout_marginTop="@dimen/margin_base_plus"
+        android:text="@string/search_select_other_map"
+        android:textAppearance="@style/MwmTextAppearance.Body3"
+        android:textColor="?colorAccent"/>
     </LinearLayout>
-  </ScrollView>
+  </LinearLayout>
 
   <LinearLayout
     android:id="@+id/ll__active_download"
@@ -97,7 +95,8 @@
     android:layout_gravity="center"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    android:padding="@dimen/margin_double_and_half"
+    android:paddingLeft="@dimen/margin_double_and_half"
+    android:paddingRight="@dimen/margin_double_and_half"
     android:visibility="gone">
     <TextView
       android:id="@+id/tv__active_country_name"
@@ -115,4 +114,4 @@
       wheel:wheelSecondaryColor="?dividerHorizontal"
       wheel:wheelThickness="@dimen/margin_quarter"/>
   </LinearLayout>
-</FrameLayout>
+</com.mapswithme.maps.widget.HeightLimitedFrameLayout>

android/res/values/arrays.xml

@@ -60,10 +60,9 @@
   </array>
 
   <!-- First start screen -->
-  <!-- TODO: Replace with actual texts and images -->
   <integer-array name="first_start_images">
-    <item>@drawable/img_smile</item>
-    <item>@drawable/img_no_map_light</item>
+    <item>@drawable/img_first_start_offline</item>
+    <item>@drawable/img_first_start_navigation</item>
   </integer-array>
 
   <string-array name="first_start_titles">
@@ -88,7 +87,9 @@
 
   <!-- What's new -->
   <integer-array name="news_images">
-    <item>@drawable/img_news_night</item>
+    <item>@drawable/img_news_migration</item>
+    <item>@drawable/img_news_editor</item>
+    <item>@drawable/img_news_search</item>
   </integer-array>
 
   <string-array name="news_titles">