From 19443565d1cb0ad23080c77779d75b98dea6d883 Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Fri, 11 Jul 2014 02:13:22 +0200
Subject: [PATCH] Removed address text from PPP and bring it to front of map
 zoom buttons.

---
 android/res/layout/info_box_additional_layer.xml        | 8 --------
 android/res/layout/info_box_api.xml                     | 8 --------
 android/res/layout/info_box_bookmark.xml                | 8 --------
 android/res/layout/info_box_poi.xml                     | 8 --------
 android/src/com/mapswithme/maps/MWMActivity.java        | 1 +
 android/src/com/mapswithme/maps/widget/MapInfoView.java | 7 -------
 6 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/android/res/layout/info_box_additional_layer.xml b/android/res/layout/info_box_additional_layer.xml
index 3d727a5fb8..86b8d31e43 100644
--- a/android/res/layout/info_box_additional_layer.xml
+++ b/android/res/layout/info_box_additional_layer.xml
@@ -5,14 +5,6 @@
     android:orientation="vertical"
     android:padding="10dp" >
 
-    <TextView
-        android:id="@+id/info_box_address"
-        style="@style/Holo.TextAppearance.Medium.Light"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:fontFamily="@string/robotoLight" />
-
     <include
         android:id="@+id/info_box_geo_ref"
         android:layout_width="match_parent"
diff --git a/android/res/layout/info_box_api.xml b/android/res/layout/info_box_api.xml
index 3d727a5fb8..86b8d31e43 100644
--- a/android/res/layout/info_box_api.xml
+++ b/android/res/layout/info_box_api.xml
@@ -5,14 +5,6 @@
     android:orientation="vertical"
     android:padding="10dp" >
 
-    <TextView
-        android:id="@+id/info_box_address"
-        style="@style/Holo.TextAppearance.Medium.Light"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:fontFamily="@string/robotoLight" />
-
     <include
         android:id="@+id/info_box_geo_ref"
         android:layout_width="match_parent"
diff --git a/android/res/layout/info_box_bookmark.xml b/android/res/layout/info_box_bookmark.xml
index 8d48e54ad5..0e7aa900b0 100644
--- a/android/res/layout/info_box_bookmark.xml
+++ b/android/res/layout/info_box_bookmark.xml
@@ -5,14 +5,6 @@
     android:orientation="vertical"
     android:padding="10dp" >
 
-    <TextView
-        android:id="@+id/info_box_address"
-        style="@style/Holo.TextAppearance.Medium.Light"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:fontFamily="@string/robotoLight" />
-
     <include
         android:id="@+id/info_box_geo_ref"
         android:layout_width="match_parent"
diff --git a/android/res/layout/info_box_poi.xml b/android/res/layout/info_box_poi.xml
index 3d727a5fb8..86b8d31e43 100644
--- a/android/res/layout/info_box_poi.xml
+++ b/android/res/layout/info_box_poi.xml
@@ -5,14 +5,6 @@
     android:orientation="vertical"
     android:padding="10dp" >
 
-    <TextView
-        android:id="@+id/info_box_address"
-        style="@style/Holo.TextAppearance.Medium.Light"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:fontFamily="@string/robotoLight" />
-
     <include
         android:id="@+id/info_box_geo_ref"
         android:layout_width="match_parent"
diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java
index 21d86bcb68..503b580488 100644
--- a/android/src/com/mapswithme/maps/MWMActivity.java
+++ b/android/src/com/mapswithme/maps/MWMActivity.java
@@ -690,6 +690,7 @@ public class MWMActivity extends NvEventQueueActivity
   {
     mInfoView = (MapInfoView) findViewById(R.id.info_box);
     mInfoView.setOnVisibilityChangedListener(this);
+    mInfoView.bringToFront();
   }
 
   private void yotaSetup()
diff --git a/android/src/com/mapswithme/maps/widget/MapInfoView.java b/android/src/com/mapswithme/maps/widget/MapInfoView.java
index 27b308c174..df90f61c06 100644
--- a/android/src/com/mapswithme/maps/widget/MapInfoView.java
+++ b/android/src/com/mapswithme/maps/widget/MapInfoView.java
@@ -376,7 +376,6 @@ public class MapInfoView extends LinearLayout implements View.OnClickListener
         mIsBookmarked.setChecked(isChecked);
 
         setUpPreview();
-        setUpAddressBox();
         setUpGeoInformation();
         setUpBottomButtons();
         setUpRoutingButtons();
@@ -516,12 +515,6 @@ public class MapInfoView extends LinearLayout implements View.OnClickListener
     }
   }
 
-  private void setUpAddressBox()
-  {
-    final TextView addressText = (TextView) mPlacePageGroup.findViewById(R.id.info_box_address);
-    addressText.setText(Framework.getNameAndAddress4Point(mMapObject.getLat(), mMapObject.getLon()));
-  }
-
   private void fillPlacePagePoi(MapObject poi)
   {
     mPlacePageContainer.removeAllViews();