New icons.

android/res/drawable/search_box_voice_selector.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/ic_voice_active" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_voice"/>
-
-</selector>

android/res/layout-sw600dp/download_item_placeholder.xml

@@ -2,4 +2,4 @@
 <View xmlns:android="http://schemas.android.com/apk/res/android"
       android:layout_width="match_parent"
       android:layout_height="@dimen/margin_medium"
-      android:background="@android:color/transparent"/>
+      android:background="@color/downloader_gray_bg"/>

android/res/layout-sw600dp/fragment_search.xml

@@ -8,7 +8,7 @@
       android:id="@+id/toolbar"
       layout="@layout/toolbar_with_search"
       android:layout_width="@dimen/panel_width"
-      android:layout_height="wrap_content"/>
+      android:layout_height="@dimen/search_box_height"/>
 
   <ListView
       android:id="@android:id/list"

android/res/layout-sw600dp/map.xml

@@ -20,8 +20,10 @@
 
   <RelativeLayout
       android:id="@+id/rl__routing_box"
-      android:layout_width="match_parent"
+      android:layout_width="@dimen/panel_width"
       android:layout_height="@dimen/routing_pp_height"
+      android:layout_below="@+id/toolbar_search"
+      android:layout_margin="@dimen/margin_medium"
       android:background="@color/bg_top_panels">
 
     <RelativeLayout
@@ -34,7 +36,8 @@
       <TextView
           android:id="@+id/tv__routing_go"
           android:layout_width="wrap_content"
-          android:layout_height="match_parent"
+          android:layout_height="@dimen/routing_button_height"
+          android:layout_centerVertical="true"
           android:background="?attr/clickableBackground"
           android:gravity="bottom"
           android:includeFontPadding="false"
@@ -82,8 +85,10 @@
   <include
       android:id="@+id/layout__turn_instructions"
       layout="@layout/map_turn_instructions"
-      android:layout_width="match_parent"
+      android:layout_width="@dimen/panel_width"
       android:layout_height="@dimen/routing_pp_height"
+      android:layout_below="@+id/toolbar_search"
+      android:layout_margin="@dimen/margin_medium"
       android:visibility="gone"/>
 
   <include
@@ -109,7 +114,7 @@
       android:id="@+id/toolbar_search"
       layout="@layout/toolbar_with_search"
       android:layout_width="@dimen/panel_width"
-      android:layout_height="wrap_content"
+      android:layout_height="@dimen/search_box_height"
       android:layout_margin="@dimen/margin_medium"/>
 
   <include

android/res/layout/map.xml

@@ -21,7 +21,7 @@
       android:id="@+id/info_box"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_alignParentTop="true"/>
+      android:layout_below="@+id/toolbar_search"/>
 
   <RelativeLayout
       android:id="@+id/rl__routing_box"
@@ -40,7 +40,8 @@
       <TextView
           android:id="@+id/tv__routing_go"
           android:layout_width="wrap_content"
-          android:layout_height="match_parent"
+          android:layout_height="@dimen/routing_button_height"
+          android:layout_centerVertical="true"
           android:background="?attr/clickableBackground"
           android:gravity="bottom"
           android:includeFontPadding="false"
@@ -90,6 +91,7 @@
       layout="@layout/map_turn_instructions"
       android:layout_width="match_parent"
       android:layout_height="@dimen/routing_pp_height"
+      android:layout_below="@+id/toolbar_search"
       android:visibility="gone"/>
 
   <include

android/res/layout/search_box.xml

@@ -26,7 +26,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:contentDescription="@null"
-        android:src="@drawable/ic_search"/>
+        android:src="@drawable/ic_search_hint_white"/>
   </FrameLayout>
 
   <EditText
@@ -39,12 +39,12 @@
       android:background="@null"
       android:fontFamily="@string/robotoLight"
       android:hint="@string/search"
-      android:textColorHint="@color/text_hint_search_box"
       android:imeOptions="actionSearch|flagNoExtractUi"
       android:inputType="text"
       android:padding="@dimen/margin_tiny"
       android:singleLine="true"
-      android:textColor="@color/text_search_box"/>
+      android:textColor="@color/text_search_box"
+      android:textColorHint="@color/text_hint_search_box"/>
 
   <FrameLayout
       android:id="@+id/container_cancel_voice_input_search"
@@ -57,6 +57,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:background="?attr/clickableBackground"
         android:contentDescription="@null"
         android:padding="@dimen/margin_medium"
         android:src="@drawable/ic_close_w"/>
@@ -66,9 +67,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:background="?attr/clickableBackground"
         android:contentDescription="@null"
         android:padding="@dimen/margin_medium"
-        android:src="@drawable/search_box_voice_selector"
+        android:src="@drawable/ic_mic_white"
         android:visibility="gone"/>
   </FrameLayout>
 

android/src/com/mapswithme/maps/MWMActivity.java

@@ -180,9 +180,6 @@ public class MWMActivity extends NvEventQueueActivity
 
   public static void startSearch(Context context, String query)
   {
-    if (!(context instanceof MWMActivity))
-      return;
-
     final MWMActivity activity = (MWMActivity) context;
     if (activity.mIsFragmentContainer)
       activity.showSearch();
@@ -966,7 +963,6 @@ public class MWMActivity extends NvEventQueueActivity
   {
     mInfoView = (MapInfoView) findViewById(R.id.info_box);
     mInfoView.setOnVisibilityChangedListener(this);
-    mInfoView.bringToFront();
     mIvStartRouting = (ImageView) mInfoView.findViewById(R.id.iv__start_routing);
     mIvStartRouting.setOnClickListener(this);
     mPbRoutingProgress = (ProgressBar) mInfoView.findViewById(R.id.pb__routing_progress);

android/src/com/mapswithme/maps/base/MWMFragmentActivity.java

@@ -11,6 +11,7 @@ import com.mapswithme.maps.Framework;
 import com.mapswithme.maps.R;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.statistics.Statistics;
+
 import ru.mail.mrgservice.MRGService;
 
 public class MWMFragmentActivity extends ActionBarActivity implements Framework.BuyProListener

android/src/com/mapswithme/maps/search/SearchController.java

@@ -1,5 +1,6 @@
 package com.mapswithme.maps.search;
 
+import android.app.Activity;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
@@ -15,6 +16,7 @@ import com.mapswithme.util.UiUtils;
 
 public class SearchController implements OnClickListener
 {
+  private Activity mActivity;
   // Views
   private TextView mSearchQueryTV;
   private View mClearView;
@@ -43,8 +45,17 @@ public class SearchController implements OnClickListener
 
   public void onCreate(MWMActivity activity)
   {
+    mActivity = activity;
     mSearchToolbar = (Toolbar) activity.findViewById(R.id.toolbar_search);
     UiUtils.showHomeUpButton(mSearchToolbar);
+    mSearchToolbar.setNavigationOnClickListener(new OnClickListener()
+    {
+      @Override
+      public void onClick(View v)
+      {
+        exitSearch();
+      }
+    });
     mSearchBox = (ViewGroup) mSearchToolbar.findViewById(R.id.search_box);
     mSearchQueryTV = (TextView) mSearchBox.findViewById(R.id.search_text_query);
     mClearView = mSearchBox.findViewById(R.id.search_image_clear);
@@ -82,16 +93,11 @@ public class SearchController implements OnClickListener
     if (R.id.search_text_query == id)
     {
       final String query = mSearchQueryTV.getText().toString();
-      MWMActivity.startSearch(v.getContext(), query);
+      MWMActivity.startSearch(mActivity, query);
       UiUtils.hide(mSearchToolbar);
     }
     else if (R.id.search_image_clear == id)
-    {
-      cancelApiCall();
-      cancel();
-      mSearchQueryTV.setText(null);
-      UiUtils.hide(mSearchToolbar);
-    }
+      exitSearch();
     else
       throw new IllegalArgumentException("Unknown id");
   }
@@ -120,4 +126,12 @@ public class SearchController implements OnClickListener
     setQuery(null);
     Framework.cleanSearchLayerOnMap();
   }
+
+  private void exitSearch()
+  {
+    cancelApiCall();
+    cancel();
+    mSearchQueryTV.setText(null);
+    UiUtils.hide(mSearchToolbar);
+  }
 }