From f2c51d2f6006ad3903e2c71aa693b59ea6dccfbe Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 4 Feb 2015 12:11:11 +0200
Subject: [PATCH] Fixed bug with dissapearing tabs in 2.3.5. Fixed bug with
 multiple search buttons at favorites on 2.3.5

---
 OsmAnd/AndroidManifest.xml                                      | 1 -
 OsmAnd/res/layout/download.xml                                  | 2 +-
 OsmAnd/res/layout/tab_content.xml                               | 2 +-
 OsmAnd/res/values/sizes.xml                                     | 1 +
 OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java | 2 +-
 .../src/net/osmand/plus/activities/FavoritesTreeFragment.java   | 2 +-
 OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java  | 1 +
 7 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 9bfc8fb54d..b028c6bfc0 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -61,7 +61,6 @@
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
             </intent-filter>
diff --git a/OsmAnd/res/layout/download.xml b/OsmAnd/res/layout/download.xml
index 032cd5023b..a6426fa29b 100644
--- a/OsmAnd/res/layout/download.xml
+++ b/OsmAnd/res/layout/download.xml
@@ -8,7 +8,7 @@
     <net.osmand.plus.views.controls.PagerSlidingTabStrip
         android:id="@+id/sliding_tabs"
         android:layout_width="fill_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/tab_height"
         android:background="?attr/colorPrimary" />
 
     <LinearLayout
diff --git a/OsmAnd/res/layout/tab_content.xml b/OsmAnd/res/layout/tab_content.xml
index 3bc64c7fcf..49772045b3 100644
--- a/OsmAnd/res/layout/tab_content.xml
+++ b/OsmAnd/res/layout/tab_content.xml
@@ -7,7 +7,7 @@
 	<net.osmand.plus.views.controls.PagerSlidingTabStrip
 			android:id="@+id/sliding_tabs"
 			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize"
+            android:layout_height="@dimen/tab_height"
 			android:background="?attr/colorPrimary"/>
 
 	<android.support.v4.view.ViewPager
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 3f3b405f4a..1379f13e29 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -24,6 +24,7 @@
     <dimen name="dash_parking_height">100dp</dimen>
     <dimen name="list_content_padding">16dp</dimen>
     <dimen name="list_header_padding">8dp</dimen>
+    <dimen name="tab_height">48dp</dimen>
 
     <!-- TextSizes -->
     <dimen name="showAllButtonTextSize">12sp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index 9312f2d8d5..1cefa05984 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -133,7 +133,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-
+		menu.clear();
 		MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark,
 				R.drawable.ic_action_search_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS
 						| MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 90f7b1d097..e237df7ad2 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -299,7 +299,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-
+		menu.clear();
 		MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark,
 				R.drawable.ic_action_search_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
 		searchView = new SearchView(getActivity());
diff --git a/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java
index e232e92208..10d48b7e8c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java
@@ -243,6 +243,7 @@ public class SelectedGPXFragment extends OsmandExpandableListFragment {
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		menu.clear();
 		((FavoritesActivity) getActivity()).getClearToolbar(false);
 //		MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_light,
 //				R.drawable.ic_action_search_dark, MenuItem.SHOW_AS_ACTION_ALWAYS