Merge remote-tracking branch 'origin/master'

.gitignore

@@ -33,4 +33,4 @@ out/
 Thumbs.db
 
 # Output files
-/build
+build

OsmAnd/assets/help/style.css

@@ -1,14 +1,19 @@
    
    body{padding:0; margin:0; }
    a {color:#536DFE;}
-   .main{width:320px; margin:0 auto; font-family:arial; font-size:11pt;}
+   xmp{white-space: pre-wrap;}
+   .main{ margin:0 auto; font-family:arial; font-size:11pt;}
+	.main{width:95%;}
+	xmp{max-width:95%;}
+   .code{font-style:italic;}
+   
    .list li{padding-bottom:10px; color:#000; }
    .list li a{ text-decoration:none;} 
    .subtitle{border-bottom:1px solid #F3F3F3; font-size:13pt; margin-top:10px; font-weight:bold;}
    .blocksubtitle{font-weight:bold; margin-top:10px;}
     h1{background-color:#FF8F00; font-size:15pt; color:#fff; padding-left:15px; padding-top:30px; padding-bottom:15px; font-weight:bold; 
    -webkit-border-radius: 4px;-moz-border-radius: 4px;border-radius: 4px; margin-top:-5px;}
-   .content{padding:15px;}
+   .content{padding:15px; padding-top:5px;}
    .content ul{padding-left:20px;}
    /************home page*****************/
    .mainlist{list-style-type: none; margin:0; padding:0;}  
@@ -24,8 +29,10 @@
    .toc .list li{color:#D2D2D2;}
    .toc .subtitle{font-weight:normal;}  
   
-  .screenshot{max-width:100%; max-height:100%;}
+  .screenshot{max-width:95%; max-height:100%; padding:7px; border:1px solid #ddd;}
-  .imgcontainer{margin:30px; padding:7px; border:1px solid #ddd;}
+  .imgcontainer{margin:20px 30px;}
+  .legendcontainer{margin:0;}
+  .legend{width:100%;}
    /*div {border-width: 1px; padding: 10px;
    		border: groove; margin-left:auto;margin-right:auto; width:480pt}
    h3.help { text-align: center}

OsmAnd/res/layout/preference_activity.xml

@@ -18,7 +18,8 @@
 				android:id="@+id/spinner_nav"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center_horizontal"/>
+				android:layout_gravity="center_horizontal"
+				android:popupBackground="?attr/spinnerListBackground"/>
 
 		<ProgressBar android:id="@+id/ProgressBar"
 					 android:layout_width="wrap_content"

OsmAnd/res/layout/spinner_dropdown_item.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
+	android:id="@android:id/text1"
-    android:singleLine="true"
+	android:singleLine="true"
-    android:background="?attr/expandable_list_background"
+	android:textColor="?attr/spinnerItemTextColor"
-    android:textSize="@dimen/default_list_text_size"
+	android:textSize="@dimen/default_list_text_size"
-    android:layout_width="fill_parent"
+	android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
+	android:layout_height="wrap_content"
-    android:padding="10dp"
+	android:padding="10dp"
-    android:ellipsize="marquee"/>
+	android:ellipsize="marquee"/>

OsmAnd/res/values/attrs.xml

@@ -20,6 +20,7 @@
         <attr name="bottomToolBarColor" format="color" />
 		<attr name="downloadButtonBackground" format="reference" />
 		<attr name="spinnerItemTextColor" format="reference" />
+        <attr name="spinnerListBackground" format="color|reference" />
 		<attr name="search_background" format="reference" />
 		<attr name="switch_ex_background" format="reference" />
 		<attr name="switch_ex_text_color" format="color|reference" />

OsmAnd/res/values/colors.xml

@@ -148,4 +148,7 @@
 	<color name="sherpafy_selection">#ff33b5e5</color>
 	<color name="sherpafy_add_text">#b9b9b9</color>
 
+	<color name="spinner_list_background_light">#eeeeee</color>
+	<color name="spinner_list_background_dark">#303030</color>
+
 </resources>

OsmAnd/res/values/styles.xml

@@ -84,7 +84,8 @@
         <item name="dashboard_general_button_text_color">@color/dashboard_general_button_text_light</item>
         <item name="android:listChoiceIndicatorMultiple">@drawable/check_light</item>
         <item name="android:textColorPrimary">@color/color_black</item>
-        <item name="spinnerItemTextColor">@color/color_white</item>
+        <item name="spinnerItemTextColor">@color/color_black</item>
+		<item name="spinnerListBackground">@color/spinner_list_background_light</item>
 		
 		<item name="android:actionModeBackground">@color/actionbar_light_color</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
@@ -93,7 +94,7 @@
         <item name="android:actionMenuTextColor">@color/color_white</item>
 	</style>
 	
-	    <style name="OsmandDarkTheme" parent="Theme.AppCompat">
+	<style name="OsmandDarkTheme" parent="Theme.AppCompat">
 		<item name="list_divider">@color/list_divider_light</item>
         <item name="expandable_category_color">?android:attr/colorBackground</item>
         <item name="bottomToolBarColor">@color/tool_bar_color_dark</item>
@@ -124,7 +125,7 @@
 		<item name="android:listChoiceIndicatorMultiple">@drawable/check_dark</item>
 		<item name="android:textColorPrimary">@color/color_white</item>
 		<item name="spinnerItemTextColor">@color/color_white</item>
-		
+		<item name="spinnerListBackground">@color/spinner_list_background_dark</item>
 		
 		<item name="android:actionModeBackground">@color/actionbar_dark_color</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>

OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java

@@ -339,7 +339,6 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
 			}
 			SpinnerAdapter spinnerAdapter = new SpinnerAdapter(this,
 					R.layout.spinner_item, s);
-			int r = android.R.layout.simple_spinner_item;
 //			android.R.layout.simple_spinner_dropdown_item
 			spinnerAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
 			getSpinner().setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {