[android] autoupdate layout is updated.

2 files changed, 40 insertions, 80 deletions

diff --git a/android/res/layout/fragment_updater.xml b/android/res/layout/fragment_updater.xml
index 5646e045a3..15702d62eb 100644
--- a/android/res/layout/fragment_updater.xml
+++ b/android/res/layout/fragment_updater.xml
@@ -8,7 +8,11 @@
   <LinearLayout
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:layout_marginLeft="@dimen/margin_base"
+    android:layout_marginRight="@dimen/margin_base"
+    android:layout_marginStart="@dimen/margin_base"
+    android:layout_marginEnd="@dimen/margin_base">
     <LinearLayout
       android:id="@+id/update_widget"
       android:layout_width="match_parent"
@@ -27,8 +31,6 @@
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/margin_base"
-        android:layout_marginRight="@dimen/margin_base"
         android:layout_marginBottom="@dimen/margin_base"
         android:textAppearance="@style/MwmTextAppearance.Title"
         android:layout_gravity="center_horizontal"
@@ -39,116 +41,74 @@
       <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/margin_base"
-        android:layout_marginRight="@dimen/margin_base"
         android:layout_marginBottom="@dimen/margin_base"
         android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
         android:layout_gravity="center_horizontal"
         android:gravity="center_horizontal"
         android:text="@string/whats_new_auto_update_message"/>
+    </LinearLayout>
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
       <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/margin_base"
-        android:layout_marginRight="@dimen/margin_base"
+        android:layout_height="@dimen/autoupdate_item_size"
         android:layout_marginBottom="@dimen/margin_half"
         android:layout_gravity="center_horizontal">
         <TextView
           android:id="@+id/update_btn"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
-          android:padding="@dimen/margin_base"
-          android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
+          android:textAppearance="@style/MwmTextAppearance.Button"
           android:textColor="?accentButtonTextColor"
           android:background="?accentButtonBackground"
           android:gravity="center"
           android:visibility="gone"
           tools:text="@string/whats_new_auto_update_button_size"
           tools:visibility="visible"/>
-        <com.mapswithme.maps.widget.WheelProgressView
-          android:id="@+id/progress"
-          android:layout_width="@dimen/autoupdate_progress_size"
-          android:layout_height="@dimen/autoupdate_progress_size"
-          android:layout_gravity="center"
-          app:wheelProgressColor="?colorAccent"
-          app:wheelSecondaryColor="?dividerHorizontal"
-          app:wheelThickness="@dimen/margin_eighth"
-          android:visibility="gone"
-          tools:visibility="visible"/>
-      </FrameLayout>
-      <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/margin_base"
-        android:layout_marginRight="@dimen/margin_base"
-        android:layout_marginBottom="@dimen/margin_base">
-        <TextView
-          android:id="@+id/later_btn"
-          android:layout_width="match_parent"
-          android:layout_height="@dimen/height_block_base"
-          android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
-          android:textColor="?buttonDialogTextColor"
-          android:layout_gravity="center_horizontal"
-          android:gravity="center"
-          android:background="?clickableBackground"
-          tools:text="@string/whats_new_auto_update_button_later"
-          tools:visibility="gone"/>
         <LinearLayout
           android:id="@+id/info"
           android:layout_width="match_parent"
-          android:layout_height="@dimen/height_block_base"
-          android:orientation="vertical"
+          android:layout_height="match_parent"
+          android:orientation="horizontal"
+          android:layout_gravity="center"
+          android:gravity="center"
           android:visibility="gone"
           tools:visibility="visible">
+          <com.mapswithme.maps.widget.WheelProgressView
+            android:id="@+id/progress"
+            android:layout_width="@dimen/autoupdate_item_size"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            app:wheelProgressColor="?colorAccent"
+            app:wheelSecondaryColor="?dividerHorizontal"
+            app:wheelThickness="@dimen/margin_eighth"
+            android:visibility="gone"
+            tools:visibility="visible"/>
           <TextView
             android:id="@+id/relative_status"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
+            android:layout_marginLeft="@dimen/margin_half"
+            android:layout_marginStart="@dimen/margin_half"
+            android:layout_gravity="center_vertical"
             android:gravity="center"
             android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
             tools:text="@string/downloader_percent"/>
-          <TextView
-            android:id="@+id/common_status"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
-            tools:text="@string/downloader_process"/>
         </LinearLayout>
       </FrameLayout>
-    </LinearLayout>
-    <RelativeLayout
-      android:id="@+id/frame_btn"
-      android:orientation="horizontal"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/margin_double_plus"
-      android:layout_marginTop="@dimen/margin_base_plus"
-      android:paddingTop="@dimen/margin_quarter_plus"
-      android:paddingBottom="@dimen/margin_quarter_plus"
-      android:paddingRight="@dimen/margin_half"
-      android:paddingLeft="@dimen/margin_half"
-      android:background="?accentButtonBackground"
-      android:visibility="gone"
-      tools:visibility="visible">
       <TextView
-        android:id="@+id/hide_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:paddingLeft="@dimen/margin_half"
-        android:paddingRight="@dimen/margin_half"
+        android:id="@+id/later_btn"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/autoupdate_item_size"
+        android:layout_marginBottom="@dimen/margin_half"
         android:textAppearance="@style/MwmTextAppearance.Button"
-        android:textColor="?accentButtonTextColor"
-        android:fontFamily="@string/robotoMedium"
-        android:text="@string/downloader_hide_screen"
-        android:gravity="center_vertical"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
+        android:textColor="?buttonDialogTextColor"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
         android:background="?clickableBackground"
-        tools:targetApi="jelly_bean"/>
-    </RelativeLayout>
+        tools:text="@string/whats_new_auto_update_button_later"/>
+    </LinearLayout>
   </LinearLayout>
 </com.mapswithme.maps.widget.HeightLimitedFrameLayout>
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 41a88b4893..8540dddd93 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -45,7 +45,7 @@
   <dimen name="downloader_status_size">40dp</dimen>
   <dimen name="downloader_ad_icon_size">@dimen/downloader_status_size</dimen>
   <dimen name="search_progress_size">32dp</dimen>
-  <dimen name="autoupdate_progress_size">36dp</dimen>
+  <dimen name="autoupdate_item_size">36dp</dimen>
 
   <dimen name="panel_width">360dp</dimen>
   <dimen name="button_width">240dp</dimen>