From 3b315c36cee1e2e824c89fe8a672e1e663a972f8 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 6 Oct 2011 22:55:53 +0200
Subject: [PATCH] Fix small issues. Test voice activity

---
 OsmAnd/res/layout-land/navigate_point.xml             |  7 ++++---
 OsmAnd/res/layout/navigate_point.xml                  |  7 +++----
 OsmAnd/res/layout/search_address.xml                  | 11 ++++++-----
 .../src/net/osmand/plus/activities/MapActivity.java   |  1 -
 .../net/osmand/plus/activities/TestVoiceActivity.java |  9 +++++++--
 .../plus/activities/search/SearchPOIActivity.java     |  1 -
 .../net/osmand/plus/voice/MediaCommandPlayerImpl.java |  2 +-
 7 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/res/layout-land/navigate_point.xml b/OsmAnd/res/layout-land/navigate_point.xml
index 593c8aef12..e1d2319f9c 100644
--- a/OsmAnd/res/layout-land/navigate_point.xml
+++ b/OsmAnd/res/layout-land/navigate_point.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent">
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent" android:orientation="vertical">
 
 <TextView android:textSize="16sp" android:id="@+id/TextView" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:text="@string/navigate_point_top_text"></TextView>
 
-<ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
+
 
 <TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:stretchColumns="1">
 <TableRow android:layout_width="fill_parent" >
@@ -26,10 +26,11 @@
 <TextView android:id="@+id/ValidateTextView" android:textSize="16sp"  android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="" android:gravity="center" android:textColor="@color/color_red"></TextView>
 
 </TableLayout>
-</ScrollView>
+
 <LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" 
 	android:gravity="center">
     <Button android:layout_width="125dp" android:layout_height="wrap_content" android:id="@+id/ShowOnMap" android:text="@string/search_shown_on_map"></Button>
     <Button android:layout_width="125dp" android:layout_height="wrap_content" android:id="@+id/Cancel" android:text="@string/navigate_point_cancel"></Button>
 </LinearLayout>
 </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/navigate_point.xml b/OsmAnd/res/layout/navigate_point.xml
index 483f20d75c..317c29b855 100644
--- a/OsmAnd/res/layout/navigate_point.xml
+++ b/OsmAnd/res/layout/navigate_point.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" >
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent" android:orientation="vertical">
 
 <TextView android:id="@+id/TextView" android:textSize="16sp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/navigate_point_top_text"></TextView>
 
-<ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
-
 <TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:stretchColumns="1">
 <TableRow android:layout_width="fill_parent" >
 <TextView android:textSize="20sp"  android:id="@+id/TextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_latitude"></TextView>
@@ -24,11 +22,12 @@
 </RadioGroup>
 <TextView android:id="@+id/ValidateTextView" android:textSize="16sp"  android:visibility="gone"  android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="" android:gravity="center" android:textColor="@color/color_red"></TextView>
 </TableLayout>
-</ScrollView>
 
 <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center">
     <Button android:layout_width="125dp" android:layout_height="wrap_content" android:id="@+id/ShowOnMap" android:text="@string/search_shown_on_map"></Button>
     <Button android:layout_width="125dp" android:layout_toRightOf="@id/ShowOnMap" 
     	android:layout_height="wrap_content" android:id="@+id/Cancel" android:text="@string/navigate_point_cancel" > </Button>
 </LinearLayout>
+
 </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_address.xml b/OsmAnd/res/layout/search_address.xml
index ad8eb25487..782978c938 100644
--- a/OsmAnd/res/layout/search_address.xml
+++ b/OsmAnd/res/layout/search_address.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" 
+			android:layout_width="fill_parent" android:layout_height="fill_parent">
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent" android:orientation="vertical">
   
@@ -9,7 +10,7 @@
 		  android:layout_marginTop = "5dp" android:text="@string/search_address_top_text">
 </TextView>
 
-<ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
+
 <TableLayout android:id="@+id/TableLayout" android:stretchColumns="1" android:layout_width="fill_parent" android:layout_height="wrap_content">
 <TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp">
 <TextView android:id="@+id/TextView" android:text="@string/search_address_region">
@@ -52,7 +53,7 @@
 </TableRow>
 
 </TableLayout> 
-</ScrollView>
+
 
 
 <LinearLayout  android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="wrap_content"  
@@ -72,5 +73,5 @@
 </Button>
 </LinearLayout>
 </LinearLayout> 
-
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 4f9418d427..46186c0910 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -1043,7 +1043,6 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
 			// dlg.showDialog();
 			Intent newIntent = new Intent(MapActivity.this, SearchActivity.class);
 			newIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-			newIntent.putExtra(SearchActivity.TAB_INDEX_EXTRA, SearchActivity.LOCATION_TAB_INDEX);
 			LatLon mapLoc = getMapLocation();
 			newIntent.putExtra(SearchActivity.SEARCH_LAT, mapLoc.getLatitude());
 			newIntent.putExtra(SearchActivity.SEARCH_LON, mapLoc.getLongitude());
diff --git a/OsmAnd/src/net/osmand/plus/activities/TestVoiceActivity.java b/OsmAnd/src/net/osmand/plus/activities/TestVoiceActivity.java
index 43d2c2845e..4c80b37346 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TestVoiceActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TestVoiceActivity.java
@@ -53,7 +53,7 @@ public class TestVoiceActivity extends Activity {
 		
 		// add buttons
 		setContentView(gl);
-		app.showDialogInitializingCommandPlayer(this, true, new Runnable(){
+		Runnable r = new Runnable(){
 
 			@Override
 			public void run() {
@@ -65,7 +65,12 @@ public class TestVoiceActivity extends Activity {
 				}
 			}
 			
-		});
+		};
+		if (app.getRoutingHelper().getVoiceRouter().getPlayer() != null) {
+			r.run();
+		} else {
+			app.showDialogInitializingCommandPlayer(this, true, r);
+		}
 	}
 	
 	private void addButtons(final LinearLayout ll, CommandPlayer p) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
index 769f7306bf..179d2de89f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
@@ -115,7 +115,6 @@ public class SearchPOIActivity extends ListActivity implements SensorEventListen
 	@Override
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
-		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 		setContentView(R.layout.searchpoi);
 		
 		uiHandler = new Handler();
diff --git a/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java
index d060c290a3..78841b228f 100644
--- a/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java
+++ b/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java
@@ -28,7 +28,7 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer {
 	// playing media
 	private MediaPlayer mediaPlayer;
 	// indicates that player is ready to play first file
-	private boolean playNext = true;
+	private volatile boolean playNext = true;
 	private List<String> filesToPlay = Collections.synchronizedList(new ArrayList<String>());