Tablet UI corrections.

30 files changed, 105 insertions, 111 deletions

diff --git a/android/res/drawable-hdpi-v11/ic_notification.png b/android/res/drawable-hdpi-v11/ic_notification.png
index 16b31697d8..c054ad48cc 100755..100644
--- a/android/res/drawable-hdpi-v11/ic_notification.png
+++ b/android/res/drawable-hdpi-v11/ic_notification.png
diff --git a/android/res/drawable-hdpi/ic_bg_dim.9.png b/android/res/drawable-hdpi/ic_bg_dim.9.png
new file mode 100644
index 0000000000..9cb9768d7c
--- /dev/null
+++ b/android/res/drawable-hdpi/ic_bg_dim.9.png
diff --git a/android/res/drawable-hdpi/ic_bg_light.9.png b/android/res/drawable-hdpi/ic_bg_light.9.png
new file mode 100644
index 0000000000..6571805a9f
--- /dev/null
+++ b/android/res/drawable-hdpi/ic_bg_light.9.png
diff --git a/android/res/drawable-hdpi/ic_bg_pp.9.png b/android/res/drawable-hdpi/ic_bg_pp.9.png
new file mode 100644
index 0000000000..a85c9ceb7f
--- /dev/null
+++ b/android/res/drawable-hdpi/ic_bg_pp.9.png
diff --git a/android/res/drawable-hdpi/ic_bg_toolbar.9.png b/android/res/drawable-hdpi/ic_bg_toolbar.9.png
new file mode 100644
index 0000000000..21b119be64
--- /dev/null
+++ b/android/res/drawable-hdpi/ic_bg_toolbar.9.png
diff --git a/android/res/drawable-hdpi/ic_notification.png b/android/res/drawable-hdpi/ic_notification.png
index b38ddca61c..4b2c3967fa 100755
--- a/android/res/drawable-hdpi/ic_notification.png
+++ b/android/res/drawable-hdpi/ic_notification.png
diff --git a/android/res/drawable-mdpi-v11/ic_notification.png b/android/res/drawable-mdpi-v11/ic_notification.png
index 09fa0a0df8..d9d32fcd02 100755..100644
--- a/android/res/drawable-mdpi-v11/ic_notification.png
+++ b/android/res/drawable-mdpi-v11/ic_notification.png
diff --git a/android/res/drawable-mdpi/ic_bg_dim.9.png b/android/res/drawable-mdpi/ic_bg_dim.9.png
new file mode 100644
index 0000000000..524ee0db64
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_bg_dim.9.png
diff --git a/android/res/drawable-mdpi/ic_bg_light.9.png b/android/res/drawable-mdpi/ic_bg_light.9.png
new file mode 100644
index 0000000000..a733da03ed
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_bg_light.9.png
diff --git a/android/res/drawable-mdpi/ic_bg_pp.9.png b/android/res/drawable-mdpi/ic_bg_pp.9.png
new file mode 100644
index 0000000000..4831c3cc88
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_bg_pp.9.png
diff --git a/android/res/drawable-mdpi/ic_bg_toolbar.9.png b/android/res/drawable-mdpi/ic_bg_toolbar.9.png
new file mode 100644
index 0000000000..3886d7a17f
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_bg_toolbar.9.png
diff --git a/android/res/drawable-mdpi/ic_notification.png b/android/res/drawable-mdpi/ic_notification.png
index 5555bb5695..47ee55eece 100755
--- a/android/res/drawable-mdpi/ic_notification.png
+++ b/android/res/drawable-mdpi/ic_notification.png
diff --git a/android/res/drawable-xhdpi-v11/ic_notification.png b/android/res/drawable-xhdpi-v11/ic_notification.png
index 6824a229fd..706e309141 100755..100644
--- a/android/res/drawable-xhdpi-v11/ic_notification.png
+++ b/android/res/drawable-xhdpi-v11/ic_notification.png
diff --git a/android/res/drawable-xhdpi/ic_bg_dim.9.png b/android/res/drawable-xhdpi/ic_bg_dim.9.png
new file mode 100644
index 0000000000..48aea4d8d5
--- /dev/null
+++ b/android/res/drawable-xhdpi/ic_bg_dim.9.png
diff --git a/android/res/drawable-xhdpi/ic_bg_light.9.png b/android/res/drawable-xhdpi/ic_bg_light.9.png
new file mode 100644
index 0000000000..68275e71be
--- /dev/null
+++ b/android/res/drawable-xhdpi/ic_bg_light.9.png
diff --git a/android/res/drawable-xhdpi/ic_bg_pp.9.png b/android/res/drawable-xhdpi/ic_bg_pp.9.png
new file mode 100644
index 0000000000..8234712220
--- /dev/null
+++ b/android/res/drawable-xhdpi/ic_bg_pp.9.png
diff --git a/android/res/drawable-xhdpi/ic_bg_toolbar.9.png b/android/res/drawable-xhdpi/ic_bg_toolbar.9.png
new file mode 100644
index 0000000000..0c8333e720
--- /dev/null
+++ b/android/res/drawable-xhdpi/ic_bg_toolbar.9.png
diff --git a/android/res/drawable-xhdpi/ic_notification.png b/android/res/drawable-xhdpi/ic_notification.png
index ed37e71b95..0b05ececef 100755
--- a/android/res/drawable-xhdpi/ic_notification.png
+++ b/android/res/drawable-xhdpi/ic_notification.png
diff --git a/android/res/drawable-xxhdpi-v11/ic_notification.png b/android/res/drawable-xxhdpi-v11/ic_notification.png
index 57e075b4a0..6216ff8f6e 100755..100644
--- a/android/res/drawable-xxhdpi-v11/ic_notification.png
+++ b/android/res/drawable-xxhdpi-v11/ic_notification.png
diff --git a/android/res/drawable-xxhdpi/ic_bg_dim.9.png b/android/res/drawable-xxhdpi/ic_bg_dim.9.png
new file mode 100644
index 0000000000..ed794f3614
--- /dev/null
+++ b/android/res/drawable-xxhdpi/ic_bg_dim.9.png
diff --git a/android/res/drawable-xxhdpi/ic_bg_light.9.png b/android/res/drawable-xxhdpi/ic_bg_light.9.png
new file mode 100644
index 0000000000..3b84a0fbdc
--- /dev/null
+++ b/android/res/drawable-xxhdpi/ic_bg_light.9.png
diff --git a/android/res/drawable-xxhdpi/ic_bg_pp.9.png b/android/res/drawable-xxhdpi/ic_bg_pp.9.png
new file mode 100644
index 0000000000..e58a98ac15
--- /dev/null
+++ b/android/res/drawable-xxhdpi/ic_bg_pp.9.png
diff --git a/android/res/drawable-xxhdpi/ic_bg_toolbar.9.png b/android/res/drawable-xxhdpi/ic_bg_toolbar.9.png
new file mode 100644
index 0000000000..a89b34a037
--- /dev/null
+++ b/android/res/drawable-xxhdpi/ic_bg_toolbar.9.png
diff --git a/android/res/drawable-xxhdpi/ic_notification.png b/android/res/drawable-xxhdpi/ic_notification.png
index 471d16f710..e81729a3b6 100755
--- a/android/res/drawable-xxhdpi/ic_notification.png
+++ b/android/res/drawable-xxhdpi/ic_notification.png
diff --git a/android/res/layout-sw600dp/fragment_downloader.xml b/android/res/layout-sw600dp/fragment_downloader.xml
index db8c5121c3..26f00d2c11 100644
--- a/android/res/layout-sw600dp/fragment_downloader.xml
+++ b/android/res/layout-sw600dp/fragment_downloader.xml
@@ -10,7 +10,6 @@
       android:id="@+id/toolbar"
       android:layout_width="match_parent"
       android:layout_height="?attr/actionBarSize"
-      android:layout_marginBottom="@dimen/margin_small"
       android:gravity="center_vertical"
       app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
       app:theme="@style/MwmToolbar">
@@ -32,5 +31,6 @@
   <ListView
       android:id="@android:id/list"
       android:layout_width="match_parent"
-      android:layout_height="match_parent"/>
+      android:layout_height="match_parent"
+      android:background="@drawable/ic_bg_light"/>
 </LinearLayout>
diff --git a/android/res/layout-sw600dp/fragment_search.xml b/android/res/layout-sw600dp/fragment_search.xml
index 9ce61c53e8..3b42a9c18e 100644
--- a/android/res/layout-sw600dp/fragment_search.xml
+++ b/android/res/layout-sw600dp/fragment_search.xml
@@ -14,7 +14,7 @@
       android:id="@android:id/list"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/margin_small"
+      android:background="@drawable/ic_bg_light"
       android:scrollbarStyle="outsideOverlay"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout-sw600dp/map_bottom_vertical_toolbar.xml b/android/res/layout-sw600dp/map_bottom_vertical_toolbar.xml
index ebc8aa3011..8f502a245c 100644
--- a/android/res/layout-sw600dp/map_bottom_vertical_toolbar.xml
+++ b/android/res/layout-sw600dp/map_bottom_vertical_toolbar.xml
@@ -11,93 +11,99 @@
       android:layout_width="match_parent"
       android:layout_height="?attr/actionBarSize"
       android:layout_gravity="center_vertical"
-      android:layout_marginBottom="@dimen/margin_small"
       app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
       app:theme="@style/MwmToolbar"/>
 
-  <RelativeLayout
+  <LinearLayout
       android:layout_width="match_parent"
-      android:layout_height="@dimen/bottom_item_height"
-      android:background="@android:color/white">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/margin_medium"
-        android:background="@drawable/ic_menu_download"
-        android:scaleType="center"/>
-
-    <TextView
-        android:id="@+id/btn_download_maps"
+      android:layout_height="wrap_content"
+      android:background="@drawable/ic_bg_dim"
+      android:orientation="vertical">
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottom_item_height"
-        android:background="?attr/clickableBackground"
-        android:fontFamily="@string/robotoLight"
-        android:gravity="center_vertical"
-        android:paddingLeft="@dimen/margin_large_and_half"
-        android:text="@string/download_maps"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textColor="@color/text_menu"/>
-
-  </RelativeLayout>
-
-  <View
-      style="@style/DrawerSeparatorMediumPadded"/>
-
-  <RelativeLayout
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/bottom_item_height"
-      android:background="@android:color/white">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/margin_medium"
-        android:background="@drawable/ic_menu_settings"
-        android:scaleType="center"/>
-
-    <TextView
-        android:id="@+id/btn_settings"
+        android:background="@android:color/white">
+
+      <ImageView
+          android:layout_width="wrap_content"
+          android:layout_height="match_parent"
+          android:layout_marginLeft="@dimen/margin_medium"
+          android:background="@drawable/ic_menu_download"
+          android:scaleType="center"/>
+
+      <TextView
+          android:id="@+id/btn_download_maps"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/bottom_item_height"
+          android:background="?attr/clickableBackground"
+          android:fontFamily="@string/robotoLight"
+          android:gravity="center_vertical"
+          android:paddingLeft="@dimen/margin_large_and_half"
+          android:text="@string/download_maps"
+          android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+          android:textColor="@color/text_menu"/>
+
+    </RelativeLayout>
+
+    <View
+        style="@style/DrawerSeparatorMediumPadded"/>
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottom_item_height"
-        android:background="?attr/clickableBackground"
-        android:fontFamily="@string/robotoLight"
-        android:gravity="center_vertical"
-        android:paddingLeft="@dimen/margin_large_and_half"
-        android:text="@string/settings_and_more"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textColor="@color/text_menu"/>
-
-  </RelativeLayout>
-
-  <View
-      style="@style/DrawerSeparatorMediumPadded"/>
-
-  <RelativeLayout
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/bottom_item_height"
-      android:background="@android:color/white"
-      android:minHeight="@dimen/search_item_height">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/margin_medium"
-        android:background="@drawable/ic_menu_send_my_location"
-        android:scaleType="center"/>
-
-    <TextView
-        android:id="@+id/btn_share"
+        android:background="@android:color/white">
+
+      <ImageView
+          android:layout_width="wrap_content"
+          android:layout_height="match_parent"
+          android:layout_marginLeft="@dimen/margin_medium"
+          android:background="@drawable/ic_menu_settings"
+          android:scaleType="center"/>
+
+      <TextView
+          android:id="@+id/btn_settings"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/bottom_item_height"
+          android:background="?attr/clickableBackground"
+          android:fontFamily="@string/robotoLight"
+          android:gravity="center_vertical"
+          android:paddingLeft="@dimen/margin_large_and_half"
+          android:text="@string/settings_and_more"
+          android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+          android:textColor="@color/text_menu"/>
+
+    </RelativeLayout>
+
+    <View
+        style="@style/DrawerSeparatorMediumPadded"/>
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottom_item_height"
-        android:background="?attr/clickableBackground"
-        android:fontFamily="@string/robotoLight"
-        android:gravity="center_vertical"
-        android:paddingLeft="@dimen/margin_large_and_half"
-        android:text="@string/share_my_location"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textColor="@color/text_menu"/>
-
-  </RelativeLayout>
-
+        android:background="@android:color/white"
+        android:minHeight="@dimen/search_item_height">
+
+      <ImageView
+          android:layout_width="wrap_content"
+          android:layout_height="match_parent"
+          android:layout_marginLeft="@dimen/margin_medium"
+          android:background="@drawable/ic_menu_send_my_location"
+          android:scaleType="center"/>
+
+      <TextView
+          android:id="@+id/btn_share"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/bottom_item_height"
+          android:background="?attr/clickableBackground"
+          android:fontFamily="@string/robotoLight"
+          android:gravity="center_vertical"
+          android:paddingLeft="@dimen/margin_large_and_half"
+          android:text="@string/share_my_location"
+          android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+          android:textColor="@color/text_menu"/>
+
+    </RelativeLayout>
+
+  </LinearLayout>
 </LinearLayout>
diff --git a/android/res/layout/search_box.xml b/android/res/layout/search_box.xml
index 12ae8df995..71699303fe 100644
--- a/android/res/layout/search_box.xml
+++ b/android/res/layout/search_box.xml
@@ -8,27 +8,6 @@
     android:gravity="center_vertical"
     android:orientation="horizontal">
 
-  <FrameLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content">
-
-    <ProgressBar
-        android:id="@+id/search_progress"
-        style="@style/Widget.AppCompat.ProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:padding="@dimen/margin_micro"/>
-
-    <ImageView
-        android:id="@+id/search_icon"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:contentDescription="@null"
-        android:src="@drawable/ic_search_hint_white"/>
-  </FrameLayout>
-
   <EditText
       android:id="@+id/search_text_query"
       style="@style/TextAppearance.AppCompat.Large"
@@ -46,6 +25,14 @@
       android:textColor="@color/text_search_box"
       android:textColorHint="@color/text_hint_search_box"/>
 
+  <ProgressBar
+      android:id="@+id/search_progress"
+      style="@style/Widget.AppCompat.ProgressBar"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="0"
+      android:padding="@dimen/margin_micro"/>
+
   <FrameLayout
       android:id="@+id/container_cancel_voice_input_search"
       android:layout_width="wrap_content"
diff --git a/android/res/values-sw600dp/styles.xml b/android/res/values-sw600dp/styles.xml
new file mode 100644
index 0000000000..5098c307c1
--- /dev/null
+++ b/android/res/values-sw600dp/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <style name="MwmToolbar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+    <item name="displayOptions">showHome|homeAsUp|showTitle</item>
+    <item name="android:background">@drawable/ic_bg_toolbar</item>
+  </style>
+
+</resources>
\ No newline at end of file
diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java
index c77d163e20..a16b146a0c 100644
--- a/android/src/com/mapswithme/maps/search/SearchFragment.java
+++ b/android/src/com/mapswithme/maps/search/SearchFragment.java
@@ -58,7 +58,6 @@ public class SearchFragment extends MWMListFragment implements View.OnClickListe
   private ProgressBar mSearchProgress;
   private View mClearQueryBtn;
   private View mVoiceInput;
-  private View mSearchIcon;
   // Current position.
   private double mLat;
   private double mLon;
@@ -135,7 +134,6 @@ public class SearchFragment extends MWMListFragment implements View.OnClickListe
   private void setUpView(ViewGroup root)
   {
     mVoiceInput = root.findViewById(R.id.search_voice_input);
-    mSearchIcon = root.findViewById(R.id.search_icon);
     mSearchProgress = (ProgressBar) root.findViewById(R.id.search_progress);
     mClearQueryBtn = root.findViewById(R.id.search_image_clear);
     mClearQueryBtn.setOnClickListener(this);
@@ -366,15 +364,9 @@ public class SearchFragment extends MWMListFragment implements View.OnClickListe
   private void setSearchInProgress(boolean inProgress)
   {
     if (inProgress)
-    {
       UiUtils.show(mSearchProgress);
-      UiUtils.invisible(mSearchIcon);
-    }
     else // search is completed
-    {
       UiUtils.invisible(mSearchProgress);
-      UiUtils.show(mSearchIcon);
-    }
   }
 
   @Override