From bed99dc1ead7a619deedc61e2bf763cc462f07c0 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 29 Jan 2015 14:10:32 +0200
Subject: [PATCH 1/7] Fixed osmo layout

---
 OsmAnd/res/layout/osmo_group_list.xml         | 30 +++++++++++++++++++
 .../osmand/plus/osmo/OsMoGroupsActivity.java  |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 OsmAnd/res/layout/osmo_group_list.xml

diff --git a/OsmAnd/res/layout/osmo_group_list.xml b/OsmAnd/res/layout/osmo_group_list.xml
new file mode 100644
index 0000000000..1b4095476c
--- /dev/null
+++ b/OsmAnd/res/layout/osmo_group_list.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:layout_width="fill_parent"
+			  android:layout_height="fill_parent"
+			  android:orientation="vertical"
+			  android:layout_marginTop="?attr/actionBarSize">
+
+	<TextView
+			android:id="@+id/DescriptionText"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="5dp"
+			android:layout_marginLeft="10dp"
+			android:layout_marginRight="10dp"
+			android:layout_marginTop="3dp"
+			android:text=""
+			android:visibility="gone" />
+
+	<ExpandableListView
+			android:id="@android:id/list"
+			style="@style/OsmandListView"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:layout_marginLeft="0dp"
+			android:layout_marginRight="0dp"
+			android:layout_marginTop="0dp"
+			android:layout_weight="1"
+			android:groupIndicator="@android:color/transparent"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index 25fa730842..6c1c32dcc6 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -138,7 +138,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 				new OsMoIntentHandler(app, osMoPlugin).execute(getIntent());
 			}
 		}
-		setContentView(R.layout.expandable_list);
+		setContentView(R.layout.osmo_group_list);
 		getSupportActionBar().setTitle(R.string.osmo_activity);
 		setSupportProgressBarIndeterminateVisibility(false);
 		setupHeader();

From 1aee28df26de15dd2c4c756b626ce2ac1bf08f02 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 29 Jan 2015 14:47:48 +0200
Subject: [PATCH 2/7] Added flag for action bar back button. Added back button
 for actionmode

---
 OsmAnd/res/drawable-hdpi/action_mode_back.png    | Bin 0 -> 667 bytes
 OsmAnd/res/drawable-xhdpi/action_mode_back.png   | Bin 0 -> 706 bytes
 OsmAnd/res/drawable-xxhdpi/action_mode_back.png  | Bin 0 -> 924 bytes
 OsmAnd/res/drawable-xxxhdpi/action_mode_back.png | Bin 0 -> 1437 bytes
 OsmAnd/res/values/styles.xml                     |   4 ++++
 .../osmand/plus/activities/MainMenuActivity.java |   1 +
 .../plus/activities/OsmandActionBarActivity.java |  14 +++++++++++---
 7 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/action_mode_back.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/action_mode_back.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/action_mode_back.png
 create mode 100644 OsmAnd/res/drawable-xxxhdpi/action_mode_back.png

diff --git a/OsmAnd/res/drawable-hdpi/action_mode_back.png b/OsmAnd/res/drawable-hdpi/action_mode_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c36eae2f4aee9ca8665b7436f3317042e6dcc97
GIT binary patch
literal 667
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+eS5K)hhiu0R{01Y44~
zy9>jA5L~c#`DCC7XMsm#F_88EW4Dvpc0l8^JzX3_A`ZWuaWLqRfr#sQZH;$-Vq>>j
z7d-vJ_>bA@asAG~kSVVhCH6F4GFzHC^WoW)7gJQ`+?oAE^?;?H&KmDz&)?Qtf8;HW
zt}=M`RXKdo!cEE=$p?;!u3m9@zEh)-<Ok+6cXvmBkBiO8W_{e{IcvxBnEH($_W5%e
z^CpD7`+Ri$bg5+=3DYL&1s(R$no>Ef<mK(F-Ko5}QB?+!Su-vyTdtTe>&BFrnYw4D
zZ=aRMSN2S;__otqg+E^Nj9eK$-&nEv#Er;#@7#Ng)So&q)-VSru-;+LKOp*4@9rsv
z1g1UA{0G<*(zey79ITmP?RssJnU!D8@5-qqd-Km*O^Fd!S$ucKKV<{wOJ>>kEj&NZ
z)A_w-y={|cEl1Xm)Obcwt*K?nYXY-oT)B8*-<FeGnO1ey{*|@Qnj-bAA&gn{*7Ro_
z(Tt+E)IH1h<r)^Q$-dB3B>t|3w<}Au$8PZ+mA3PN+pk}YUF!Zl{jjB<UL7O<T34<!
z*Ix(&!(X+;HKHUXu_V<hxhNG#F&G&bn&=vs>lzt{7+P2vnp&9}0=ZTO23Ho$jzZCp
zo1c=IR*74~(!a{jfEpx0HU#IVm6RtIr7}3C<R_&nc;+Uirv{}arc@T5Oa&zp22WQ%
Jmvv4FO#txt0+Ij#

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/action_mode_back.png b/OsmAnd/res/drawable-xhdpi/action_mode_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..27bdcb79e3f22219e6cf48707eb27d386e818717
GIT binary patch
literal 706
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0
z-G$*l2rk&Wd@@jkv%n*=7)X17vD?XPJD~BCJY5_^GVZ;d>F9UZK)`jr^XVp4q4ozH
z9tZle75W@^El73FKO$<uvqCg$V!&)89V5ozI~oi9gjfBXv~;4Z_50%+jY|)v7|pyj
zrQ3EvN6WGQt4j3V=`QXQYnbjJbJb<bM4O7`Pnjz&>|&g-g0nMMiEEFTx)Qq-|I_I5
zxa!+GwmvWxjLevm6@5ukSoFbkDSy`|tAg3G4*0t~sgZwB9cSNc{-d^SzrhdLL+NsV
zmTvq0^;g8xeEvmDf4m-x3tDDp&wroW6fW9%lS_h0xmUKb=o?!Mv;P6Z32VRJ4`Vu`
z>B(Tetc5FZ$w9lCM_;2E)*qO-?I_E8=HLe+GoJo=cYU(v>_(<Ko;z$082K6}cRbj~
z=x(=oX=VAP182)uJ>ao;KA}cRW&+duEuXp0eyBScYPMk;hwy{Ah3$W0j(9&{t2h#U
zWMc1`y*u2_e=xJ+%2|9qH*fLnSuftTuW9Rir&gGD$Y%zp@y5JI_iNR6Rc{DA>{7VJ
z;>D6iE;Sb^n>)F`Dr(o1YVyjizb!8#>T^M4&&d>{t?T_6qV}zE5|W+;j3(6**NBpo
z#FA92<f2p{#b9J$XrgOiu4`l*VrXGyXli9@2;^EB7+hH}I|@ZZZhlH;S|x4`OaCfA
y18R^2*$|wcR#Ki=l*-_klAn~S;F+74o*I;zm{M7IG8L4T7(8A5T-G@yGywo@MGp@E

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/action_mode_back.png b/OsmAnd/res/drawable-xxhdpi/action_mode_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2d6a542cdc3786472e2ad6d3b50501e96e18b18
GIT binary patch
literal 924
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Ea{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ueoXKL{?^yL>WGgtNdSvKUB%?PPE}nQh0wz?9?Z;uunK>+S4|ezy%ITKj`1sBO6&
z`&Nweo6YW<hc`@P>gUK1zO-dK1Lv&G-T&17J6*bQYsKVeHIqV5`$m1A+&}vWr$UQ>
z6NloF2*sbjUcF9MnDVYcSdd{uEdRnB@$S0n{yFBks;Z$&_w7(sm)f!IQ~2+QN88LF
z#W)*HShHqd%Hd15v~H)_O^PaV@;=uss?WJu@QQKKHMJ#qqLcP0{xm$LbN9bcQJ7j%
zvg)Ut_1jhKW%n#-jL5yy(P^lB(t6VJy#1H#ll6;!CAq41tJF`hDHr~lc+PR=#;U@i
zb2+z<#ynYa?A5)aS!K%V>S6B1lNU#no(No12E;;7G{R(yL{@_^i)B}6yUfw7_BmG~
z{;K?3D!V!;^*+!{QP-cFKLt*a=_`67@o|?AZvy9oORxUjGFtnO;em8RJcHkzvZV?Q
z%jd{Wvd(T=)FO4@7E9srbX(>MmJf^vmMxfZLb&0)V$1O>vXk5cyw9C_a^+jx{Z}V8
zPTjcS#9c*qfweJ=Kl<KwtT1RgdYosId*QiVH>SA!F)tG5(>4+Q%yf3eEUx!*h6&o4
zy>4MsOs0DNy311O$#}c7DtS}Zb-C@_40X&uxE`ES@qL$X_x|$i=C!9}HR8U_Ns>9z
z_-Mb!Dch?R#ccHxnyge_rj$AadEI$dx^uDfB)u7`UO{)*R5bHACy8u#@$9<YpmJ2#
zanhq{8lHvH6PD~y^|+*4(K)F^_<6&UDLc--HhaM5xoe_L;3PR$i3v|0Zz~dvF5MHq
zWc|^$wZ9M6Iet2JOK(H0NJXrv=GQYb<W@*8_;KXAa;8X;oAZ<>&u2yYo&u(h7J;Oy
zKa5$j(g$lko!S9RgsLU35hW>!C8<`)MX5lF!N|bSMAyJv*T^`;(89{l)XLNl$h9&s
zxUyh&6pDu2{FKbJO57Tj{#AYk)F276Aviy+q&%@GmBBG3KPgqgGdD3kH7GSPrLyp3
RDkzsQc)I$ztaD0e0swE)fB^si

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxxhdpi/action_mode_back.png b/OsmAnd/res/drawable-xxxhdpi/action_mode_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..70c2040210887f654dfea3b13ca7758424c5f070
GIT binary patch
literal 1437
zcmbVLeM}o=7=H_uGz?6mI00EWOP0W9dmsI}yV22)Ye$`B2+d%bQLfhmE^v3<^;ipz
zK#*l2nL?IM_|J-q#>8kAV@S4u!XFz#{KG|@*<i~sWLbtXVSW$^@h!BtM6y4;<nDQ&
z_nzPL@q3<Uptj~ner|Ct03hFA&D25JlzMeJ@Vht?BcUi#y^U(U+^oh}g$J&%9O4nb
z$hPoxJR9yj^(|isKz5rDY*ZTquhE<=n%I<$DK17J8i2~Gc!cHJcohlpErR4QtX%!t
zfCyoSp}`u!0uc}2DpYqVe0^6<kn3vWsIZ~xFj5((p#zauStKsDOHn%RFl_my;W>4U
z8jvj$wasDJPO33bi+E&(N315Rk;4cau~R18YN2ra6@<WWGm2v<K^bwJw%BRhhNK?@
zjHZN}={m-jjs-P`p;c8QG>XPzF;mQJl9d(|rzi@=2$Ud<(83t)lvFlul%i!B4-6mW
z6d|GtvV^2OvLU%cbr@i#+a-vRKw!tQ6ipKaDMRCI1jS7lDvGJPwydLS9sh3{yIMzs
zoe>_b<D+ti!ohwtmu0|^yQc?A8NzJnV~PNq!nQLq*CFzf>Sr7V_{S6$!n7G9yoAN<
z_L2l)BXJxGm&Z%GyqMKYVVEW3V>c}BB5jn}OJbCb!Evv}ZS&wBi;p2Z9?a^tkQuCB
zimI%{@tL>+jGM;VpNgeD3eT#t5|rik%mmc7%Bmb~l_QA9gOmqYPLNW1MXEpB<ube?
zoaVzmMHZ1Qf@xuw1SsA@Qk>at<Scx%(Sq4XV~8MGW3v_G2*MgBY%FI;<HP@lI20y?
zrY7WxiOF2SF-#qI<{v6M8^lX+Z4|g4Rde-lyEM~&#ubd;T3(nGr<?`-?Cr%7HId`i
z6b$)7_6r3=SvSDG$%PX~OGxd9-fHv8c+aJa&PB@yH?K`yJ^%2^v&`@S-2Gm-r5XUT
z0MG)U13(V|0_JD$^ZnnM;_GX3f1fQ%9_)FKe*R<a(mCJAg+%FIHt+FA8{?~AtbKpY
zZg$phUVgW<#&u=&?rk#LxqeS`V|XR6cJxd`FR^qeD{<g%e)5g=8nAyhrYS!;k?nl2
zItP|!8?tIA^vSV}?jKiQ0E3C1;^$gMH;O?5)h5rp43_q2%HPsC*WF-dW%|p~qYo;o
z0_RNTWN6*?2{Q8{#1=MP@)^H5{TK~?I-b+p^vI~wzVp)MH~W9_E&s0U8=#ke?SET;
z=hk21&u5E(`vB1A0Vf8)BrG%gze-`{@#%ywa-!_`-bvwN*smSym|D`8G|UXUBMS#d
z^ZM4Liv9ZeKli*ksAsQ#_Ji*AKh8h&k|62%>G0Y!y*X@ApQF6w)cyIBx_dK&xsOWS
z)2n059Y^=XZ*<VNd2FO!|0KP@ndTko-qaQX`q29gLtovz4m$z--Wuj}cT?X#X1w7?

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index e7ba686983..005b6fa644 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -78,6 +78,8 @@
         <item name="actionModeBackground">@color/actionbar_light_color</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
+		<item name="android:actionModeCloseDrawable">@drawable/action_mode_back</item>
+		<item name="actionModeCloseDrawable">@drawable/action_mode_back</item>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -94,6 +96,8 @@
         <item name="actionModeBackground">@color/actionbar_dark_color</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
+		<item name="android:actionModeCloseDrawable">@drawable/action_mode_back</item>
+		<item name="actionModeCloseDrawable">@drawable/action_mode_back</item>
     </style>
 
     <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index c76878b492..a22d6bd09c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -144,6 +144,7 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 	protected void onCreate(Bundle savedInstanceState) {
 		getMyApplication().applyTheme(this);
 		super.onCreate(savedInstanceState);
+		haveHomeButton = false;
 		if (getIntent() != null) {
 			Intent intent = getIntent();
 			if (intent.getExtras() != null && intent.getExtras().containsKey(APP_EXIT_KEY)) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java
index 642666fdda..3965e04f49 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java
@@ -13,6 +13,8 @@ import net.osmand.plus.R;
  */
 public class OsmandActionBarActivity extends ActionBarActivity {
 
+	protected boolean haveHomeButton = true;
+
     //should be called after set content view
     protected void setupHomeButton(){
         Drawable back = getResources().getDrawable(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
@@ -25,18 +27,24 @@ public class OsmandActionBarActivity extends ActionBarActivity {
     @Override
     public void setContentView(int layoutResID) {
         super.setContentView(layoutResID);
-        setupHomeButton();
+		if (haveHomeButton) {
+			setupHomeButton();
+		}
     }
 
     @Override
     public void setContentView(View view) {
         super.setContentView(view);
-        setupHomeButton();
+		if (haveHomeButton) {
+			setupHomeButton();
+		}
     }
 
     @Override
     public void setContentView(View view, ViewGroup.LayoutParams params) {
         super.setContentView(view, params);
-        setupHomeButton();
+		if (haveHomeButton) {
+			setupHomeButton();
+		}
     }
 }

From abff5f411c3d8f2fb8bdbf5abcb50982fec1ccab Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 29 Jan 2015 14:49:41 +0200
Subject: [PATCH 3/7] Renamed favourites to favorites

---
 OsmAnd/AndroidManifest.xml                         |  4 ++--
 .../net/osmand/plus/OsmAndAppCustomization.java    |  6 +++---
 .../plus/activities/AvailableGPXFragment.java      | 10 +++++-----
 ...ouritesActivity.java => FavoritesActivity.java} | 10 +++++-----
 ...istActivity.java => FavoritesListActivity.java} |  4 ++--
 ...istFragment.java => FavoritesListFragment.java} |  2 +-
 ...reeFragment.java => FavoritesTreeFragment.java} | 10 ++++------
 .../plus/activities/SelectedGPXFragment.java       |  2 +-
 .../plus/activities/search/SearchActivity.java     | 14 +++++++-------
 .../plus/views/controls/MapRouteInfoControl.java   |  6 +-----
 10 files changed, 31 insertions(+), 37 deletions(-)
 rename OsmAnd/src/net/osmand/plus/activities/{FavouritesActivity.java => FavoritesActivity.java} (96%)
 rename OsmAnd/src/net/osmand/plus/activities/{FavouritesListActivity.java => FavoritesListActivity.java} (84%)
 rename OsmAnd/src/net/osmand/plus/activities/{FavouritesListFragment.java => FavoritesListFragment.java} (98%)
 rename OsmAnd/src/net/osmand/plus/activities/{FavouritesTreeFragment.java => FavoritesTreeFragment.java} (98%)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index b9e6420487..4c5dd226c1 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -141,8 +141,8 @@
 
 		<activity android:name="net.osmand.plus.activities.search.SearchActivity" android:label="@string/search_activity" />
 		<activity android:name="net.osmand.plus.activities.ShowRouteInfoActivity" android:label="@string/show_route" />
-		<activity android:name="net.osmand.plus.activities.FavouritesListActivity" android:label="@string/favourites_list_activity" />
-		<activity android:name="net.osmand.plus.activities.FavouritesActivity" android:windowSoftInputMode="adjustPan" />
+		<activity android:name=".activities.FavoritesListActivity" android:label="@string/favourites_list_activity" />
+		<activity android:name=".activities.FavoritesActivity" android:windowSoftInputMode="adjustPan" />
 		<activity android:name="net.osmand.plus.activities.PluginsActivity" />
 		<activity android:name="net.osmand.plus.activities.ContributionVersionActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/contribution_activity" />
 
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
index 3629bd4d31..c1dd8ed61d 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
@@ -10,7 +10,7 @@ import net.osmand.IndexConstants;
 import net.osmand.Location;
 import net.osmand.data.LocationPoint;
 import net.osmand.plus.activities.MainMenuActivity;
-import net.osmand.plus.activities.FavouritesActivity;
+import net.osmand.plus.activities.FavoritesActivity;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.PluginsActivity;
 import net.osmand.plus.activities.SettingsActivity;
@@ -60,8 +60,8 @@ public class OsmAndAppCustomization {
 		return SearchActivity.class;
 	}
 	
-	public Class<FavouritesActivity> getFavoritesActivity(){
-		return FavouritesActivity.class;
+	public Class<FavoritesActivity> getFavoritesActivity(){
+		return FavoritesActivity.class;
 	}
 
 	public Class<MainMenuActivity> getMainMenuActivity() {
diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index ed6e97caee..9312f2d8d5 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -155,9 +155,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		});
 
 		if (isOrientationPortrait()) {
-			menu = ((FavouritesActivity) getActivity()).getClearToolbar(true).getMenu();
+			menu = ((FavoritesActivity) getActivity()).getClearToolbar(true).getMenu();
 		} else {
-			((FavouritesActivity) getActivity()).getClearToolbar(false);
+			((FavoritesActivity) getActivity()).getClearToolbar(false);
 		}
 
 
@@ -242,12 +242,12 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	}
 
 	public void showProgressBar() {
-		((FavouritesActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(true);
+		((FavoritesActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(true);
 	}
 
 	public void hideProgressBar() {
 		if (getActivity() != null){
-			((FavouritesActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
+			((FavoritesActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
 		}
 	}
 
@@ -262,7 +262,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	private void enableSelectionMode(boolean selectionMode) {
 		this.selectionMode = selectionMode;
 		if (isOrientationPortrait()) {
-			((FavouritesActivity)getActivity()).setToolbarVisibility(!selectionMode);
+			((FavoritesActivity)getActivity()).setToolbarVisibility(!selectionMode);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesActivity.java
similarity index 96%
rename from OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java
rename to OsmAnd/src/net/osmand/plus/activities/FavoritesActivity.java
index cce5ea6290..4eb9c45da0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesActivity.java
@@ -32,7 +32,7 @@ import net.osmand.plus.views.controls.PagerSlidingTabStrip;
 /**
  *
  */
-public class FavouritesActivity extends TabActivity {
+public class FavoritesActivity extends TabActivity {
 
 	private static final String FAVOURITES_INFO = "FAVOURITES_INFO";
 	private static final String TRACKS = "TRACKS";
@@ -67,7 +67,7 @@ public class FavouritesActivity extends TabActivity {
 		
 		if(!hasGpx) {
 			setContentView(R.layout.search_activity_single);
-			getSupportFragmentManager().beginTransaction().add(R.id.layout, new FavouritesTreeFragment()).commit();
+			getSupportFragmentManager().beginTransaction().add(R.id.layout, new FavoritesTreeFragment()).commit();
 		} else {
 			setContentView(R.layout.tab_content);
 
@@ -77,7 +77,7 @@ public class FavouritesActivity extends TabActivity {
 			ViewPager mViewPager = (ViewPager) findViewById(R.id.pager);
 
 			List<TabItem> mTabs = new ArrayList<TabItem>();
-			mTabs.add(getTabIndicator(R.string.my_favorites, FavouritesTreeFragment.class));
+			mTabs.add(getTabIndicator(R.string.my_favorites, FavoritesTreeFragment.class));
 			mTabs.add(getTabIndicator(R.string.my_tracks, AvailableGPXFragment.class));
 			mTabs.add(getTabIndicator(R.string.selected_track, SelectedGPXFragment.class));
 
@@ -107,7 +107,7 @@ public class FavouritesActivity extends TabActivity {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		((OsmandApplication) getApplication()).getSelectedGpxHelper().setUiListener(FavouritesActivity.class,new Runnable() {
+		((OsmandApplication) getApplication()).getSelectedGpxHelper().setUiListener(FavoritesActivity.class,new Runnable() {
 			
 			@Override
 			public void run() {
@@ -119,7 +119,7 @@ public class FavouritesActivity extends TabActivity {
 	@Override
 	protected void onPause() {
 		super.onPause();
-		((OsmandApplication) getApplication()).getSelectedGpxHelper().setUiListener(FavouritesActivity.class, null);
+		((OsmandApplication) getApplication()).getSelectedGpxHelper().setUiListener(FavoritesActivity.class, null);
 	}
 
 	public void updateSelectedTracks() {
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesListActivity.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesListActivity.java
similarity index 84%
rename from OsmAnd/src/net/osmand/plus/activities/FavouritesListActivity.java
rename to OsmAnd/src/net/osmand/plus/activities/FavoritesListActivity.java
index 33722d50de..44d71af761 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavouritesListActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesListActivity.java
@@ -5,7 +5,7 @@ import net.osmand.plus.OsmandApplication;
 import android.os.Bundle;
 
 
-public class FavouritesListActivity extends OsmandActionBarActivity {
+public class FavoritesListActivity extends OsmandActionBarActivity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -13,7 +13,7 @@ public class FavouritesListActivity extends OsmandActionBarActivity {
 		super.onCreate(savedInstanceState);
 		if (savedInstanceState == null) {
 			// During initial setup, plug in the details fragment.
-			FavouritesListFragment details = new FavouritesListFragment();
+			FavoritesListFragment details = new FavoritesListFragment();
 			details.setArguments(getIntent().getExtras());
 			getSupportFragmentManager().beginTransaction().add(android.R.id.content, details).commit();
 		}
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
similarity index 98%
rename from OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java
rename to OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
index c1428f5adf..77bceb6e89 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
@@ -37,7 +37,7 @@ import android.widget.TextView.BufferType;
 /**
  * 
  */
-public class FavouritesListFragment extends ListFragment implements SearchActivityChild {
+public class FavoritesListFragment extends ListFragment implements SearchActivityChild {
 
 	public static final String SELECT_FAVORITE_POINT_INTENT_KEY = "SELECT_FAVORITE_POINT_INTENT_KEY"; 
 	public static final int SELECT_FAVORITE_POINT_RESULT_OK = 1;
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
similarity index 98%
rename from OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java
rename to OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index b9e915d03a..cc1cd7e917 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -31,12 +31,10 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
-import net.osmand.plus.activities.search.SearchActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.ColorDialogs;
 import net.osmand.plus.helpers.ScreenOrientationHelper;
-import net.osmand.plus.helpers.WaypointDialogHelper;
 import net.osmand.util.MapUtils;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -64,7 +62,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 
-public class FavouritesTreeFragment extends OsmandExpandableListFragment {
+public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 
 	public static final int SEARCH_ID = -1;
 //	public static final int EXPORT_ID = 0;
@@ -339,9 +337,9 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
 		boolean portrait = orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT ||
 				orientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
 		if (portrait) {
-			menu = ((FavouritesActivity) getActivity()).getClearToolbar(true).getMenu();
+			menu = ((FavoritesActivity) getActivity()).getClearToolbar(true).getMenu();
 		} else {
-			((FavouritesActivity) getActivity()).getClearToolbar(false);
+			((FavoritesActivity) getActivity()).getClearToolbar(false);
 		}
 
 
@@ -465,7 +463,7 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
 
 	private void enableSelectionMode(boolean selectionMode) {
 		this.selectionMode = selectionMode;
-		((FavouritesActivity)getActivity()).setToolbarVisibility(!selectionMode);
+		((FavoritesActivity)getActivity()).setToolbarVisibility(!selectionMode);
 	}
 
 	protected void openChangeGroupDialog(final FavoriteGroup group) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java
index 2e302bd12a..e232e92208 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java
@@ -243,7 +243,7 @@ public class SelectedGPXFragment extends OsmandExpandableListFragment {
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		((FavouritesActivity) getActivity()).getClearToolbar(false);
+		((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
 //						| MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
index 18ee788b73..85c2dd1e13 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
@@ -16,8 +16,8 @@ import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
-import net.osmand.plus.activities.FavouritesListActivity;
-import net.osmand.plus.activities.FavouritesListFragment;
+import net.osmand.plus.activities.FavoritesListActivity;
+import net.osmand.plus.activities.FavoritesListFragment;
 import net.osmand.plus.activities.NavigatePointFragment;
 import net.osmand.plus.activities.TabActivity;
 import net.osmand.plus.views.controls.PagerSlidingTabStrip;
@@ -171,7 +171,7 @@ public class SearchActivity extends TabActivity implements OsmAndLocationListene
 		} else if(tab == TRANSPORT_TAB_INDEX) {
 			return SearchTransportFragment.class;
 		} else if(tab == FAVORITES_TAB_INDEX) {
-			return FavouritesListFragment.class;
+			return FavoritesListFragment.class;
 		}
 		return SearchPoiFilterFragment.class;
 	}
@@ -218,9 +218,9 @@ public class SearchActivity extends TabActivity implements OsmAndLocationListene
 						if (position == POSITION_LAST_MAP_VIEW) {
 							updateSearchPoint(settings.getLastKnownMapLocation(), getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false);
 						} else if (position == POSITION_FAVORITES) {
-							Intent intent = new Intent(SearchActivity.this, FavouritesListActivity.class);
+							Intent intent = new Intent(SearchActivity.this, FavoritesListActivity.class);
 							intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-							intent.putExtra(FavouritesListFragment.SELECT_FAVORITE_POINT_INTENT_KEY, (Serializable) null);
+							intent.putExtra(FavoritesListFragment.SELECT_FAVORITE_POINT_INTENT_KEY, (Serializable) null);
 							startActivityForResult(intent, REQUEST_FAVORITE_SELECT);
 							getSupportActionBar().setSelectedNavigationItem(0);
 						} else if (position == POSITION_ADDRESS) {
@@ -249,8 +249,8 @@ public class SearchActivity extends TabActivity implements OsmAndLocationListene
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 		
-		if(requestCode == REQUEST_FAVORITE_SELECT && resultCode == FavouritesListFragment.SELECT_FAVORITE_POINT_RESULT_OK){
-			FavouritePoint p = (FavouritePoint) data.getSerializableExtra(FavouritesListFragment.SELECT_FAVORITE_POINT_INTENT_KEY);
+		if(requestCode == REQUEST_FAVORITE_SELECT && resultCode == FavoritesListFragment.SELECT_FAVORITE_POINT_RESULT_OK){
+			FavouritePoint p = (FavouritePoint) data.getSerializableExtra(FavoritesListFragment.SELECT_FAVORITE_POINT_INTENT_KEY);
 			if (p != null) {
 				LatLon latLon = new LatLon(p.getLatitude(), p.getLongitude());
 				updateSearchPoint(latLon, getString(R.string.select_search_position) + " " + p.getName(), false);
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
index 853fbe4bd3..ab9a6511ec 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
@@ -3,13 +3,10 @@ package net.osmand.plus.views.controls;
 import java.util.ArrayList;
 import java.util.List;
 
-import android.graphics.Point;
-import android.os.SystemClock;
 import android.view.*;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.RotatedTileBox;
-import net.osmand.data.RotatedTileBox.RotatedTileBoxBuilder;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
@@ -17,8 +14,7 @@ import net.osmand.plus.development.OsmandDevelopmentPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
-import net.osmand.plus.activities.FavouritesListFragment.FavouritesAdapter;
-import net.osmand.plus.activities.IntermediatePointsDialog;
+import net.osmand.plus.activities.FavoritesListFragment.FavouritesAdapter;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.ShowRouteInfoActivity;
 import net.osmand.plus.routing.RouteDirectionInfo;

From 06226be31598a3a4889f306195864b1850daa88e Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 29 Jan 2015 15:09:32 +0200
Subject: [PATCH 4/7] Fixed icon in action mode for favorites tree fragment

---
 .../src/net/osmand/plus/activities/FavoritesTreeFragment.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index cc1cd7e917..b4f5ec604d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -372,7 +372,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 			public boolean onCreateActionMode(ActionMode mode, Menu menu) {
 				enableSelectionMode(true);
 				createMenuItem(menu, SELECT_DESTINATIONS_ACTION_MODE_ID, R.string.select_destination_and_intermediate_points,
-						R.drawable.ic_action_flage_light, R.drawable.ic_action_flage_dark,
+						R.drawable.ic_action_flage_dark, R.drawable.ic_action_flage_dark,
 						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				favoritesSelected.clear();
 				groupsToDelete.clear();

From 91d16432b4ef66f369bc2a3a84d1ebd229b47181 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 29 Jan 2015 15:21:20 +0200
Subject: [PATCH 5/7] Made actionmode header white for white theme

---
 OsmAnd/res/values/styles.xml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 005b6fa644..0b2ffa748f 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -76,10 +76,12 @@
         <item name="pstsTextColor">@color/color_white</item>
         <item name="android:actionModeBackground">@color/actionbar_light_color</item>
         <item name="actionModeBackground">@color/actionbar_light_color</item>
-        <item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
 		<item name="android:actionModeCloseDrawable">@drawable/action_mode_back</item>
 		<item name="actionModeCloseDrawable">@drawable/action_mode_back</item>
+		<item name="android:actionModeStyle">@style/WhiteActionMode</item>
+		<item name="actionModeStyle">@style/WhiteActionMode</item>
+		<item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -96,8 +98,6 @@
         <item name="actionModeBackground">@color/actionbar_dark_color</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
-		<item name="android:actionModeCloseDrawable">@drawable/action_mode_back</item>
-		<item name="actionModeCloseDrawable">@drawable/action_mode_back</item>
     </style>
 
     <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -130,7 +130,16 @@
 		<item name="android:colorBackground">@color/dashboard_black</item>
 		<item name="android:clickable">true</item>
 	</style>
-	
+
+	<style name="WhiteActionMode" parent="@style/Widget.AppCompat.ActionMode">
+		<item name="android:titleTextStyle">@style/WhiteActionModeTitleTextStyle</item>
+		<item name="titleTextStyle">@style/WhiteActionModeTitleTextStyle</item>
+	</style>
+
+	<style name="WhiteActionModeTitleTextStyle" parent="@style/TextAppearance.AppCompat.Widget.ActionMode.Title">
+		<item name="android:textColor">@color/color_white</item>
+	</style>
+
 	<!-- Dialog popup -->
 	<style name="Animations" />
 	<!-- PopDownMenu -->

From 538eb7b4790b766ca4a20fd46152d87fc4a30905 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 29 Jan 2015 18:11:26 +0200
Subject: [PATCH 6/7] Updated spinner background and select tab text color

---
 OsmAnd/res/values/styles.xml                  | 22 +++++++++++++++----
 .../plus/activities/SettingsActivity.java     |  2 --
 .../plus/activities/SettingsBaseActivity.java |  2 ++
 .../views/controls/PagerSlidingTabStrip.java  | 18 ++++++---------
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 0b2ffa748f..71e80f0432 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -67,6 +67,8 @@
 
     <style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
         <item name="expandable_category_color">@color/group_background</item>
+		<item name="android:actionDropDownStyle">@style/Widget.LightSpinner</item>
+		<item name="actionDropDownStyle">@style/Widget.LightSpinner</item>
         <item name="reset_image">@drawable/ic_action_delete_light</item> <!--  @drawable/a_1_navigation_cancel_light -->
 		<item name="windowActionBarOverlay">true</item>
         <item name="bottomToolBarColor">@color/tool_bar_light_color</item>
@@ -86,8 +88,10 @@
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
         <item name="reset_image">@drawable/ic_action_delete_dark</item> <!--  @drawable/a_1_navigation_cancel_dark -->
+		<item name="android:actionDropDownStyle">@style/Widget.DarkActionSpinner</item>
+		<item name="actionDropDownStyle">@style/Widget.DarkActionSpinner</item>
         <item name="expandable_category_color">?android:attr/colorBackground</item>
-        <item name="android:spinnerStyle">@style/Widget.Spinner</item>
+        <item name="android:spinnerStyle">@style/Widget.DarkSpinner</item>
         <item name="windowActionBarOverlay">true</item>
         <item name="bottomToolBarColor">@color/tool_bar_dark_color</item>
         <item name="pstsTabBackground">@color/actionbar_dark_color</item>
@@ -126,9 +130,19 @@
         <item name="android:textColor">@color/color_white</item>
     </style>
 
-	<style name="Widget.Spinner" parent="android:Widget">
-		<item name="android:colorBackground">@color/dashboard_black</item>
-		<item name="android:clickable">true</item>
+	<style name="Widget.DarkSpinner" parent="@style/Widget.AppCompat.Spinner.DropDown.ActionBar">
+		<item name="android:popupBackground">@color/actionbar_dark_color</item>
+		<item name="android:textColor">@color/color_white</item>
+	</style>
+
+	<style name="Widget.DarkActionSpinner" parent="@style/Widget.AppCompat.Spinner.DropDown.ActionBar">
+		<item name="android:popupBackground">@color/actionbar_dark_color</item>
+		<item name="android:textColor">@color/color_white</item>
+	</style>
+
+	<style name="Widget.LightSpinner" parent="@style/Widget.AppCompat.Spinner.DropDown.ActionBar">
+		<item name="android:popupBackground">@color/actionbar_light_color</item>
+		<item name="android:textColor">@color/color_white</item>
 	</style>
 
 	<style name="WhiteActionMode" parent="@style/Widget.AppCompat.ActionMode">
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index 602039e9dc..8375e9fa37 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -40,8 +40,6 @@ public class SettingsActivity extends SettingsBaseActivity {
 		PreferenceScreen screen = getPreferenceScreen();
 		localIndexes =(Preference) screen.findPreference("local_indexes");
 		localIndexes.setOnPreferenceClickListener(this);
-//		bidforfix = (Preference) screen.findPreference("bidforfix");
-//		bidforfix.setOnPreferenceClickListener(this);
 		plugins = (Preference) screen.findPreference("plugins");
 		plugins.setOnPreferenceClickListener(this);
 		general = (Preference) screen.findPreference("general_settings");
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
index fc3c00ae17..82d8cee0c4 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
@@ -9,6 +9,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.preference.*;
 import android.view.MenuItem;
 import android.widget.AdapterView;
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java b/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java
index ed7eaf1a8b..6fd1a6c8f0 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java
@@ -43,6 +43,7 @@ import android.widget.HorizontalScrollView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import net.osmand.plus.R;
+import net.osmand.plus.helpers.FontCache;
 
 
 import java.util.Locale;
@@ -50,7 +51,7 @@ import java.util.Locale;
 public class PagerSlidingTabStrip extends HorizontalScrollView {
 
 	private static final float OPAQUE = 1.0f;
-	private static final float HALF_TRANSP = 0.5f;
+	private static final float HALF_TRANSP = 0.6f;
 
 	public interface CustomTabProvider {
 		public View getCustomTabView(ViewGroup parent, int position);
@@ -110,7 +111,7 @@ public class PagerSlidingTabStrip extends HorizontalScrollView {
 	private int tabPadding = 12;
 	private int tabTextSize = 14;
 	private int tabTextColor = 0;
-	private float tabTextAlpha = OPAQUE;
+	private float tabTextAlpha = HALF_TRANSP;
 	private float tabTextSelectedAlpha = OPAQUE;
 
 	private int padding = 0;
@@ -120,8 +121,8 @@ public class PagerSlidingTabStrip extends HorizontalScrollView {
 	private boolean isPaddingMiddle = false;
 
 	private Typeface tabTypeface = null;
-	private int tabTypefaceStyle = Typeface.BOLD;
-	private int tabTypefaceSelectedStyle = Typeface.BOLD;
+	private int tabTypefaceStyle = Typeface.NORMAL;
+	private int tabTypefaceSelectedStyle = Typeface.NORMAL;
 
 	private int scrollOffset;
 	private int lastScrollX = 0;
@@ -159,13 +160,7 @@ public class PagerSlidingTabStrip extends HorizontalScrollView {
 		// get system attrs (android:textSize and android:textColor)
 		TypedArray a = context.obtainStyledAttributes(attrs, ATTRS);
 		tabTextSize = a.getDimensionPixelSize(TEXT_SIZE_INDEX, tabTextSize);
-		ColorStateList colorStateList = a.getColorStateList(TEXT_COLOR_INDEX);
 		int textPrimaryColor = a.getColor(TEXT_COLOR_PRIMARY, android.R.color.white);
-//		if (colorStateList != null) {
-//			tabTextColor = colorStateList;
-//		} else {
-//			tabTextColor = getColorStateList(textPrimaryColor);
-//		}
 
 		underlineColor = textPrimaryColor;
 		dividerColor = textPrimaryColor;
@@ -195,8 +190,9 @@ public class PagerSlidingTabStrip extends HorizontalScrollView {
 		isPaddingMiddle = a.getBoolean(R.styleable.PagerSlidingTabStrip_pstsPaddingMiddle, isPaddingMiddle);
 		tabTypefaceStyle = a.getInt(R.styleable.PagerSlidingTabStrip_pstsTextStyle, Typeface.BOLD);
 		tabTypefaceSelectedStyle = a.getInt(R.styleable.PagerSlidingTabStrip_pstsTextSelectedStyle, Typeface.BOLD);
-		tabTextAlpha = a.getFloat(R.styleable.PagerSlidingTabStrip_pstsTextAlpha, OPAQUE);
+		tabTextAlpha = a.getFloat(R.styleable.PagerSlidingTabStrip_pstsTextAlpha, HALF_TRANSP);
 		tabTextSelectedAlpha = a.getFloat(R.styleable.PagerSlidingTabStrip_pstsTextSelectedAlpha, OPAQUE);
+		tabTypeface = FontCache.getRobotoMedium(context);
 		a.recycle();
 
 		setMarginBottomTabContainer();

From 32311c1464e346a62894db5de46c0a7717582865 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 29 Jan 2015 18:24:02 +0200
Subject: [PATCH 7/7] Fixed menu items color for light theme and icons in osmo

---
 OsmAnd/res/values/styles.xml                            | 2 ++
 OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 71e80f0432..80e2434844 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -83,6 +83,8 @@
 		<item name="actionModeCloseDrawable">@drawable/action_mode_back</item>
 		<item name="android:actionModeStyle">@style/WhiteActionMode</item>
 		<item name="actionModeStyle">@style/WhiteActionMode</item>
+		<item name="android:actionMenuTextColor">@color/color_white</item>
+		<item name="actionMenuTextColor">@color/color_white</item>
 		<item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
     </style>
 
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index 6c1c32dcc6..72c34ed565 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -952,13 +952,13 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 				0, 0,/*R.drawable.ic_action_marker_light,*/
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 		createMenuItem(menu, SHARE_SESSION, R.string.osmo_share_session, 
-				R.drawable.ic_action_gshare_light, R.drawable.ic_action_gshare_dark,
+				R.drawable.ic_action_gshare_dark, R.drawable.ic_action_gshare_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 		createMenuItem(menu, CREATE_GROUP, R.string.osmo_create_group, 
-				R.drawable.ic_action_plus_light, R.drawable.ic_action_plus_dark,
+				R.drawable.ic_action_plus_dark, R.drawable.ic_action_plus_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 		createMenuItem(menu, SETTINGS_ID, R.string.settings, 
-				R.drawable.ic_action_settings_light, R.drawable.ic_action_settings_dark,
+				R.drawable.ic_action_settings_dark, R.drawable.ic_action_settings_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 		return super.onCreateOptionsMenu(menu);
 	}