From db68dad7e18083cff1258207e86bf4eefdb72c78 Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Thu, 1 Dec 2011 11:33:41 +0400
Subject: [PATCH] [android] new icons and improved locationService logic.
 closes #443

---
 .../mapswithme/location/LocationService.cpp   |  48 +++++---
 .../mapswithme/location/LocationService.hpp   |   8 +-
 android/res/drawable-hdpi/download_maps.png   | Bin 4147 -> 0 bytes
 .../res/drawable-hdpi/ic_menu_download.png    | Bin 0 -> 1793 bytes
 .../res/drawable-hdpi/ic_menu_location.png    | Bin 0 -> 2028 bytes
 .../drawable-hdpi/ic_menu_location_found.png  | Bin 0 -> 2553 bytes
 .../drawable-hdpi/ic_menu_location_search.png | Bin 0 -> 2391 bytes
 android/res/drawable-hdpi/ic_menu_search.png  | Bin 0 -> 1882 bytes
 android/res/drawable-hdpi/my_position.png     | Bin 4147 -> 0 bytes
 android/res/drawable-ldpi/download_maps.png   | Bin 1723 -> 0 bytes
 .../res/drawable-ldpi/ic_menu_download.png    | Bin 0 -> 521 bytes
 .../res/drawable-ldpi/ic_menu_location.png    | Bin 0 -> 538 bytes
 .../drawable-ldpi/ic_menu_location_found.png  | Bin 0 -> 701 bytes
 .../drawable-ldpi/ic_menu_location_search.png | Bin 0 -> 746 bytes
 android/res/drawable-ldpi/ic_menu_search.png  | Bin 0 -> 609 bytes
 android/res/drawable-ldpi/my_position.png     | Bin 1723 -> 0 bytes
 android/res/drawable-mdpi/download_maps.png   | Bin 2574 -> 0 bytes
 .../res/drawable-mdpi/ic_menu_download.png    | Bin 0 -> 1855 bytes
 .../res/drawable-mdpi/ic_menu_location.png    | Bin 0 -> 1893 bytes
 .../drawable-mdpi/ic_menu_location_found.png  | Bin 0 -> 2268 bytes
 .../drawable-mdpi/ic_menu_location_search.png | Bin 0 -> 2085 bytes
 android/res/drawable-mdpi/ic_menu_search.png  | Bin 0 -> 1791 bytes
 android/res/drawable-mdpi/my_position.png     | Bin 2574 -> 0 bytes
 android/res/menu/main.xml                     |   4 +-
 .../src/com/mapswithme/maps/MWMActivity.java  |  79 ++++++++++---
 .../maps/location/LocationService.java        | 106 +++++++++++++++---
 26 files changed, 191 insertions(+), 54 deletions(-)
 delete mode 100644 android/res/drawable-hdpi/download_maps.png
 create mode 100644 android/res/drawable-hdpi/ic_menu_download.png
 create mode 100644 android/res/drawable-hdpi/ic_menu_location.png
 create mode 100644 android/res/drawable-hdpi/ic_menu_location_found.png
 create mode 100644 android/res/drawable-hdpi/ic_menu_location_search.png
 create mode 100644 android/res/drawable-hdpi/ic_menu_search.png
 delete mode 100644 android/res/drawable-hdpi/my_position.png
 delete mode 100644 android/res/drawable-ldpi/download_maps.png
 create mode 100644 android/res/drawable-ldpi/ic_menu_download.png
 create mode 100644 android/res/drawable-ldpi/ic_menu_location.png
 create mode 100644 android/res/drawable-ldpi/ic_menu_location_found.png
 create mode 100644 android/res/drawable-ldpi/ic_menu_location_search.png
 create mode 100644 android/res/drawable-ldpi/ic_menu_search.png
 delete mode 100644 android/res/drawable-ldpi/my_position.png
 delete mode 100644 android/res/drawable-mdpi/download_maps.png
 create mode 100644 android/res/drawable-mdpi/ic_menu_download.png
 create mode 100644 android/res/drawable-mdpi/ic_menu_location.png
 create mode 100644 android/res/drawable-mdpi/ic_menu_location_found.png
 create mode 100644 android/res/drawable-mdpi/ic_menu_location_search.png
 create mode 100644 android/res/drawable-mdpi/ic_menu_search.png
 delete mode 100644 android/res/drawable-mdpi/my_position.png

diff --git a/android/jni/com/mapswithme/location/LocationService.cpp b/android/jni/com/mapswithme/location/LocationService.cpp
index ec5a9d7534..1da2ff8cf6 100644
--- a/android/jni/com/mapswithme/location/LocationService.cpp
+++ b/android/jni/com/mapswithme/location/LocationService.cpp
@@ -14,26 +14,32 @@ android::LocationService * g_locationService = 0;
 
 namespace android
 {
-  LocationService::LocationService(location::LocationObserver & locationObserver,
-                                   jobject observer)
-    : location::LocationService(locationObserver),
-      m_javaObserver(observer)
+  LocationService::LocationService(location::LocationObserver & observer,
+                                   jobject javaObserver)
+    : m_observer(observer),
+      m_javaObserver(javaObserver)
   {
     jclass k = jni::GetCurrentThreadJNIEnv()->GetObjectClass(m_javaObserver);
     m_onLocationChanged.reset(new jni::Method(k, "onLocationChanged", "(JDDF)V"));
-    m_onStatusChanged.reset(new jni::Method(k, "onStatusChanged", "(J)V"));
+    m_onStatusChanged.reset(new jni::Method(k, "onStatusChanged", "(I)V"));
   }
 
-  void LocationService::Start()
+  void LocationService::Start(bool doChangeStatus)
   {
-    m_observer.OnLocationStatusChanged(location::EStarted);
-    m_onStatusChanged->CallVoid(m_javaObserver, location::EStarted);
+    if (doChangeStatus)
+    {
+      m_observer.OnLocationStatusChanged(location::EStarted);
+      m_onStatusChanged->CallVoid(m_javaObserver, location::EStarted);
+    }
   }
 
-  void LocationService::Stop()
+  void LocationService::Stop(bool doChangeStatus)
   {
-    m_observer.OnLocationStatusChanged(location::EStopped);
-    m_onStatusChanged->CallVoid(m_javaObserver, location::EStopped);
+    if (doChangeStatus)
+    {
+      m_observer.OnLocationStatusChanged(location::EStopped);
+      m_onStatusChanged->CallVoid(m_javaObserver, location::EStopped);
+    }
   }
 
   void LocationService::Disable()
@@ -47,6 +53,12 @@ namespace android
     m_observer.OnGpsUpdated(info);
     m_onLocationChanged->CallVoid(m_javaObserver, info.m_timestamp, info.m_latitude, info.m_longitude, info.m_horizontalAccuracy);
   }
+
+  void LocationService::OnLocationStatusChanged(int status)
+  {
+    m_observer.OnLocationStatusChanged((location::TLocationStatus)status);
+    m_onStatusChanged->CallVoid(m_javaObserver, status);
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -57,19 +69,25 @@ namespace android
 extern "C"
 {
   JNIEXPORT void JNICALL
-  Java_com_mapswithme_maps_location_LocationService_nativeStartUpdate(JNIEnv * env, jobject thiz, jobject observer)
+  Java_com_mapswithme_maps_location_LocationService_nativeStartUpdate(JNIEnv * env, jobject thiz, jobject observer, jboolean changeStatus)
   {
     g_locationService = new android::LocationService(*g_framework, observer);
-    g_locationService->Start();
+    g_locationService->Start(changeStatus);
   }
 
   JNIEXPORT void JNICALL
-  Java_com_mapswithme_maps_location_LocationService_nativeStopUpdate(JNIEnv * env, jobject thiz)
+  Java_com_mapswithme_maps_location_LocationService_nativeStopUpdate(JNIEnv * env, jobject thiz, jboolean changeStatus)
   {
-    g_locationService->Stop();
+    g_locationService->Stop(changeStatus);
     delete g_locationService;
   }
 
+  JNIEXPORT void JNICALL
+  Java_com_mapswithme_maps_location_LocationService_nativeLocationStatusChanged(JNIEnv * env, jobject thiz, int status)
+  {
+    g_locationService->OnLocationStatusChanged(status);
+  }
+
   JNIEXPORT void JNICALL
   Java_com_mapswithme_maps_location_LocationService_nativeLocationChanged(JNIEnv * env, jobject thiz,
       jlong time, jdouble lat, jdouble lon, jfloat accuracy)
diff --git a/android/jni/com/mapswithme/location/LocationService.hpp b/android/jni/com/mapswithme/location/LocationService.hpp
index 040cb70687..653594fd7d 100644
--- a/android/jni/com/mapswithme/location/LocationService.hpp
+++ b/android/jni/com/mapswithme/location/LocationService.hpp
@@ -8,11 +8,12 @@
 
 namespace android
 {
-  class LocationService : public location::LocationService
+  class LocationService
   {
   private:
 
     jobject m_javaObserver;
+    location::LocationObserver & m_observer;
 
     scoped_ptr<jni::Method> m_onLocationChanged;
     scoped_ptr<jni::Method> m_onStatusChanged;
@@ -22,10 +23,11 @@ namespace android
     LocationService(location::LocationObserver & locationObserver,
                     jobject observer);
 
-    void Start();
-    void Stop();
+    void Start(bool doChangeStatus);
+    void Stop(bool doChangeStatus);
     void Disable();
     void OnLocationUpdate(location::GpsInfo const & info);
+    void OnLocationStatusChanged(int status);
   };
 }
 
diff --git a/android/res/drawable-hdpi/download_maps.png b/android/res/drawable-hdpi/download_maps.png
deleted file mode 100644
index 8074c4c571b8cd19e27f4ee5545df367420686d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4147
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

diff --git a/android/res/drawable-hdpi/ic_menu_download.png b/android/res/drawable-hdpi/ic_menu_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a4d708f204c71e189c44e2210d32777a534ce54
GIT binary patch
literal 1793
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

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/ic_menu_location.png b/android/res/drawable-hdpi/ic_menu_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ff8c131afddee3a877b0d41787d27401f7658c9
GIT binary patch
literal 2028
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
KMNUMnLSTYU!pSiJ

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/ic_menu_location_found.png b/android/res/drawable-hdpi/ic_menu_location_found.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fd6616bcb7e02758c9f9f951dc02e39119fc693
GIT binary patch
literal 2553
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
P00000NkvXXu0mjft`FH(

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/ic_menu_location_search.png b/android/res/drawable-hdpi/ic_menu_location_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3a474aa31bade2472de3d9d4691e1754b3539ab
GIT binary patch
literal 2391
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
JPDHLkV1kq9i-`aL

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/ic_menu_search.png b/android/res/drawable-hdpi/ic_menu_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf503b86d789341edae942777926416566e0ac4d
GIT binary patch
literal 1882
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
UFB`*=7ytkO07*qoM6N<$g4GIwlmGw#

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/my_position.png b/android/res/drawable-hdpi/my_position.png
deleted file mode 100644
index 8074c4c571b8cd19e27f4ee5545df367420686d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4147
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

diff --git a/android/res/drawable-ldpi/download_maps.png b/android/res/drawable-ldpi/download_maps.png
deleted file mode 100644
index 1095584ec21f71cd0afc9e0993aa2209671b590c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1723
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
Rn%e*X002ovPDHLkV1g`*Fem^3

diff --git a/android/res/drawable-ldpi/ic_menu_download.png b/android/res/drawable-ldpi/ic_menu_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c2face52b0cce50e1f05eb489f57278c472994b
GIT binary patch
literal 521
zcmV+k0`~ohP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzt4TybRCwC#l`%`hKorM&O)3=vnFKdM
zoH__DLR|VK`T;t1sucVNods9d?#_OLqUa(xWGM(v2^lP<ffkF6{}<lL^~@!w#mxu5
zUV6!U|9kgdF7+(SYL@6`<>%7RHYS89y<aa-b-=`Owb^>TmP~+SBhUdyKiE16`E+aq
z20Wev!I**y$8iKdoBLJ?v_Sygz{qChWc)1o1gq7my&-^ot0`RYcnwnRULj<SMk8gP
zJjO;7EEWrS-2%_x0~~-@%T{l<ynUL@X8vcnT<&9d1ytx`%!hgg1L^`W0<q2NWd<x1
zvoFQ?s)d-(=QNV~3)mrb5E@opXrAZg*`#SIci|lzVm_8d?t@)$3qrL^s){Uwvrxz}
zC{|x?kq3I5@@2s`h>|V(_8KcOdb8Qgb8*qd{2sUmW7COXDza|A?~kX`Da8sv*HsE~
zRdwtrBBciqVp6OdFc3+SlogVSeZoa6GHQw^ZgK0wPNfBgCHIH?j4_6YqNu7B>BTz(
zkJ|hxxZ`Wb<m{?1i^0hG;kVz5tv@)G0u~u;C-CPP{0mgsrvL*0c(m35zHr2A00000
LNkvXXu0mjfE%D>Z

literal 0
HcmV?d00001

diff --git a/android/res/drawable-ldpi/ic_menu_location.png b/android/res/drawable-ldpi/ic_menu_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..21e77b94202c91028e8b90489a8f37260c2d2023
GIT binary patch
literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzyh%hsRCwCdRzYsUFc6HZUUG^#asZhh
z@B`=%$`A5`mKU^rf#C)46X*-V4~P=wz=`CBg23I4)|H!>kbpSU(g<aDXU2}5HB2ex
zJaRla4<6SH1V91;fGQ!NoTyd6S7gKae3k&!5LnA?I+eibbmD*jpa^?_1iTutPm1l0
z7;<>6!SQ(HfB>Kf3yc~0B3`Or81+G|L7wLlpa_1sSm!Kp-{48B!QpTa07Y0_+M7#2
zj=>i?{(FjGlimRMn*ye7k0Wx3TWD2|DFnxqT)M8CwlzQwa!F%sGZ<1byY-_2?l)-+
zb&Tm&k!4w>XLz2+nh4i%pAC2Cj+tL?6|^+Oq|@mzL{kG@58N-UV>8%La&*T^Jkr?M
z4AzwNce@>LD~=rGlE&I*FsCFI${S`ciCbt@47%NJ2#J|qMUo_bSp;GVVTt?3>}RM|
zIi`BVag2RlpW`K9+UxaF$`!@%%;=fZouDU!@BT&CTMeQpLek1GNy!L5zz>Q|03#CS
zrg*>K|I-DS?M@EEkdxSZ!!4KzA*}t2)m{4A?G~>?Y+PewMUF9JJT3FVU=Uu?VE_JK
c#g7030NAjl6!aymDgXcg07*qoM6N<$f^pF8=Kufz

literal 0
HcmV?d00001

diff --git a/android/res/drawable-ldpi/ic_menu_location_found.png b/android/res/drawable-ldpi/ic_menu_location_found.png
new file mode 100644
index 0000000000000000000000000000000000000000..085d0eb62651ee3ed93193262b2dd17057d3e4b9
GIT binary patch
literal 701
zcmV;u0z&<XP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!Ur9tkRCwCdRy}AGK@^_Zvq|NahM*Wh
zu#yW{1ws-CA#Fs#Sm+&CNhCQEVqtN)BA_7LhCsTIXrYA=Ei6J1%@If?c%-t@Q<0=d
zv9XBeV0Zl9<ZYbYxu0y2!hw&sH}8G#&CGjm=A=?eoaS)EDUUO)lv}&vBE$qR0Av&D
zDzE{}_ns5AW<F%IBih^%Wr)cWF4O}`eVxK@8{orF;gT>`Or#Z{0=(wA5^xsC0j{y5
z!NIP0kXV5AAC_}+To^uoM1o!$<F_>I%N$4tfv%@%lIx);0$G5*^Dxdw&RMS!4bqVf
z*|IMC_L~l9?_l+dqJ(~pR(}1G%%`aq@RyC9bc0`u?Vuir34o*z6w;O>ahR)pS!H?{
z=u*_Hzk5Z-61DbSba18I0N_Hr0A@xmh<apm>$3EpeO4=6c>{KU@Hnyi$<^)sR*S~=
z1@{I5$tlwgJ}Mj_Yvo{J+ir*lSEa6&r=P+Dh>nDMce=;vY{xZ@s8PeoBTomd&%YJd
z%t16pA6;|a#E$5XT7no)cvy-)uoLZV?qfI$QEYe@AwZSSt{;d6_*EBEoSWO6WJ=~^
zdndZPqpptU;Neyn-91!6-A{TQKTVl}?{XiJ^uRB~`T)`A>6ic)D5vcM;xJeHvaSlR
z&#9r+J#P8j{YsciI>DSGG?>p3hq)g4YIqkd_B-fCRRz$EYWd##fZ+b?Ry}`gPdc(8
zTh<Y`)bhH%^Dbz1UGEzeGRnnZUDwZtGJe|!XKY;uDW-XFUJhppsa`Z1H`js_J(;gY
jGU=bp|K?xCUjYUH3ZXghx+ihc00000NkvXXu0mjfp}<4P

literal 0
HcmV?d00001

diff --git a/android/res/drawable-ldpi/ic_menu_location_search.png b/android/res/drawable-ldpi/ic_menu_location_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..18a62c2cbd9825edf1c7b1ef96ea0658d62497fe
GIT binary patch
literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!j7da6RCwCdmd%P9K@i8CkRZl`V;~_c
zC?k>_gAnwR!|K69z(Y2WYcNlc-51Em6HGki5^%wn2nfk;4hjmo7cUY}R7ebhilWA^
z&cCEu+HrKf>>&+5W~{D%RZn+yx0(>bag*(q<A&RH2@GI@G7uKZ+-K~KKvQJLa=A2t
zI1uvH?c!`17K?=r%0Mt(V1gHl?E~Aoij6e--UPGROb2Bkm^9gx{*~S0pH}?KdlO8j
zQxga#srJQUv8R<vMG*9E(Ipj~X`5g&nHWGYX`87l(a`7fdB0RDy~Fa|2Y2K;l19-R
zTM0&^kqHFof~~nM6bi4x;qc3BHv5(49C4q62QmR^SW7Y1U$HJzR6!Kb^W5cf^{mwv
ziA1u+V)5r-FsKfP!!b;cz&+Vd8q#u%=+-`fF~pty9Th#u<#O|QJpMYL&tI@jQyrka
z<QO4o)8tXn@AtRP43EdN4xnk8qtoep8;{3FKA-P1OuxVn@VnRR?bO~@vLCYZW0_2b
zg3mz}bg$E@QzSX@dc7K9b*|NFU$Dpxyf#4#{3W~ehxVh4W0&BHJCApb#_e_=B@ziQ
zUjKlxwI5m!$GEafaKW9)cDt?HC2%^O&kVzOjMuwz56DIu(sB%01RHCR!s8U^d`iBt
zCI|+DPw)uwX=<$?leN@Rwx?;U)iQx#HjWBv)oN8>!_kk2^g%KP`6{}Nqe8RZXw7D`
z%%h}s4$e@PJu1^iqp@=K`~9oY<G1|UB>U6c$H;$cAIQd{?@E#$C!!7bo^2=Km;>u-
za3tS21vI-mxn8g99PISKoADDC|IDsK+jr@s?&&&w3!=&wIg}AowWI=pKz&yX?Z5w5
c@lSvO0H5#tAJ5_zo&W#<07*qoM6N<$f+h50=>Px#

literal 0
HcmV?d00001

diff --git a/android/res/drawable-ldpi/ic_menu_search.png b/android/res/drawable-ldpi/ic_menu_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..817cc9460489318e76e088906460d8ae218668f6
GIT binary patch
literal 609
zcmV-n0-pVeP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!14%?dRCwB~mA^~FKorN5)aDPcSPHd2
zhKj3`Q$Z2j1VJncf+&I@=wINf2s%j%E)Iey3XUBLPNI{O;8YNyp|+NSqhM+pzb7y7
zyyn`5`rt$Ea_{bY@4d@KcU@QWu{c-*vmitLH}C>(!5Q^?Tf5!nnBWk60=EmF<Y$Tv
zc0+d@$I}`CMKG!LZ;xQkFpQ?k!5}5ElOmX8>dzntMuASx9KH8^gntp6G?iOuwOWD$
z;1XY8512G2W77CHn{%K{k!{<efUm&Y#SSR+k)Cakr?w5o!r`#hks=golZq>f`~V74
z;Z+pK-#Z)|sv69&kWPA?3JLB%<0mi#<qYfJX~B&9XH){itltbM!2O4P1rXW?o-y_<
zyaf;#VeJp!8X$r)E8J9{1@`kVs{~5SX)B-r_b;ggE`d!>Svt1;EWSzp8qL2{30UBm
zP0WK`5K=50qVYU?cO8jDEI$Fg(P(J&72iu2-4oac58#~+LKf_T327a1W3EP{(T*te
zdc8i#Z7Peb#A2~)IYnNWO)w3PSWQ%j@pIrvsk^AvYD<42s8*}J{%GTr9+9T9^ha9+
zS0E%u5|77!Bhf9((grk@$Z{f)xX~+>%0R0plSvJmREf+R0dLO^NaP0XW#F)}5IFr8
v0b!|B%1^}kHvwVkbXtfkfOlg3M}PqUlQx)Hk~R$a00000NkvXXu0mjfQOO6i

literal 0
HcmV?d00001

diff --git a/android/res/drawable-ldpi/my_position.png b/android/res/drawable-ldpi/my_position.png
deleted file mode 100644
index 1095584ec21f71cd0afc9e0993aa2209671b590c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1723
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
Rn%e*X002ovPDHLkV1g`*Fem^3

diff --git a/android/res/drawable-mdpi/download_maps.png b/android/res/drawable-mdpi/download_maps.png
deleted file mode 100644
index a07c69fa5a0f4da5d5efe96eea12a543154dbab6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2574
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

diff --git a/android/res/drawable-mdpi/ic_menu_download.png b/android/res/drawable-mdpi/ic_menu_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9204c4f884c860d4aa6f3ffad7bcd2ba354dcde
GIT binary patch
literal 1855
zcmV-F2f+A=P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&;Ymb6RCwCVSbI#9R}`mDN+FfE<K>1(
zh!{p3f#_x;ZVF>;#6ZR-3i^kTumv`^Xf}gcmPK70>L18Ia|VL2ku90d7eT>9UP_j1
zvP^+CjQ1O)3|eSu`|Wq?cg<I5OKU>hm;7kC=iGD8J?D4My<bHf$9epp9x?q9i9~K=
zbaYgS&2*a0<^hw*G{|5y8Z~?O?u~$sLPUzIJS%KdgjSnpu~?+z<Kv$6eR_JDl#PHq
zHa2$7o_=(6^gCW&UVqot*3JY31aLHGVPV0Ln3!mSEt`~x#bVpZtECJE#7j#{Er^7k
zVPIh3TZsJWJ1roD!C)X~b2S=Gsc?=?r)v)m4qgwLC-giR?551wv$(kUE_U$-zIrkA
z^z=mHa{~-oBfK1x2{@q?&QT~7NvBVrK1>^dJ&8cqJ%=#)bKzp($kOEGBrUeio-_O+
z9O=QSMd5gIa&j(YVSvJsLrznM=)8q=&4a8Qp|Y~F4q-p4QmJy{;^MYp(FG=B09TBm
zp`nMv!ouQ7=lb>Qmzhkj*BefqI#mMGp|n?wx$Y1g5hL#v_~ZyfLqp>+F)?32luEqK
z&CLyiLwY7>z@k=%NQcsslarGOQui@=dwYA6QmNcZX~h4oJM`qqlPw_VEEc8kbJf+=
z^%(vDh@uMX=;-i)T+ieT*n}}8BqSd?8+l5|)oS&3Og=X^w@^?}K=NRFlyS%*xm-?@
zROIl?%#8NJg$phCf0TTs06OB2kVh=o4<0<IMC8V49Cj7^_U+5WcpxBi$st516lDI8
z8GrcjVHb@41JM|udm31$&IozP<>lpRv|4QglY?8Yr=_KBf!K#Ca#e@m3~^vR^$8Hq
za`NQK2Hu%z+A-gs9Aa4?vqq_@sp%Z5&P@M<L#o2U!uK&Aup&y!cQiaayl!@ORt+u?
zAGo`B@BV?|LqIGwHDTAEpP$z;JqAR=09hVDy-I{J4+72Y?d`qF^ack9$KvDT(=hHU
zjFNPDbm08~i9`}bj-m>dDk>_PDLQp^bsLkCk`7|XLJbj*3_5Z<(Ush|aU(k-B4S%m
zP|&}4WFsRZbr7|7c6NU6@9+OM?0fq9`UW36b}VcE{{7vM%>$+t5rWt2z@KJR0#yTd
z|Ni~QaFEjX>dl)sw_x{uOy(*kCMJgS^Yh<>jgalzxBK<?_ct=xqeqX_2?+_isd!kF
zY&eAWzC$XN?jR>A4A|-Ks1D-JWO{nKrmCtchyGu!!WfYHX+)s>;>C-Lv=%m~!!6-Q
zvQ2VCF*++NE16H5c!fhq!$*vm;L>PKP0gPe9tY@DUn(vx?r3amJb`XJ=Zw?@@I;TU
zeD%(qJH41Y0%&=1*C9IHOfMxRg`yWk@vuqR*w|Py`i%wP2r%|DhO>Z|1ze-Bs*t{~
zkXkd-T@G|+3+Dd<-GjhuEG3Xxd5aeEnLyuCQc^-EK!}xsqyf@}<D&r1Sx;|pMO$88
z-p=ogte9C*5&@CEvhMEg8b_(Budi=De*E}t=&FG}nu85+{N~M9u3V`_e`2W@rKYB4
zAhmJUn*j|XuP1PV&tPY?JMPSxGrvNZ&6lp!POFkopF+cIWOEoA8XEqB>|<aT>5wkQ
zJ%k{eZEbB|vN;Hd?%K6$Rg?{DgiwaL;Eyjkhx2K%rKLq385yaC*M`>CRt4ZgxOC}~
zgijkqZ2Iikv&B<WQ;%6>`uh3?P*FcY)&por2Xd-3Z$ejBmk)t#B4SNwAv*pzQEuM6
zIR*OR))aw1!*D8;=M;yAYJ!8*Y&Zf73o5L2=gyr6aATa|ud$xz&!69wnVCsf3~5nO
z(GRz7-D<;l2lZGuVS=sS(3{@0cb%sB?B0!jHM?okrbAM`y;}r#TM?X-**j9ulXl~f
z{W>Ef;~T#Ej7N?fX_CogpWw>60nSj9>*kLcBO-7VZ6w{<1&|dL9H%b|YlKkZgP0iZ
z%4-Tzsw*oiD=sZ9y~>xe2Y*Ng^53V3#5g9lqOaXX0Q_CCi=L&$eXCH+ymS@Fw|91S
z_NV-<&l3e<;amR@k9iuy2CXjw?$~~ImN~rNI(Wjv!{hGVyLS#L?8MF%KvWw!nqnBG
z*BzTS4mo-yarQ(-MeV`I9w)C)ZrNk{&lRDyc%D0DbjiY5reA*3v$qD`UX`d=$yz&P
z0&ixiO$d9GofL2=06E={*3=<d2u;w4D&hned3y`cV{z54jYDqzT!I~YdwZ+MA!iXH
zZy<NuzSPwp9iE-4=;D5Ueu3_i)!hjBzUV4LSEnB(o`w`}l%3$lD|A3oq+f(XxJA-2
tWMMy81@f;sFS+uI$QnJ=8OQz;U;tgtF8BoW4`2WQ002ovPDHLkV1gV9e$4;?

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/ic_menu_location.png b/android/res/drawable-mdpi/ic_menu_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..541d57dd07a3ab38a9f200c2f9a7192dff3153f6
GIT binary patch
literal 1893
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

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/ic_menu_location_found.png b/android/res/drawable-mdpi/ic_menu_location_found.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cf57f5cd1826c1746efa4af918d98c8e46fc4a7
GIT binary patch
literal 2268
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

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/ic_menu_location_search.png b/android/res/drawable-mdpi/ic_menu_location_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b2e799fe014bc9cb0e8622f6b3ebf7c36ac22a1
GIT binary patch
literal 2085
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
P00000NkvXXu0mjfJu~qk

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/ic_menu_search.png b/android/res/drawable-mdpi/ic_menu_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..8256f79775ad57e921fa4b503287bf3655d5c162
GIT binary patch
literal 1791
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

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/my_position.png b/android/res/drawable-mdpi/my_position.png
deleted file mode 100644
index a07c69fa5a0f4da5d5efe96eea12a543154dbab6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2574
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

diff --git a/android/res/menu/main.xml b/android/res/menu/main.xml
index 845ab94ca8..e6ba3e33de 100644
--- a/android/res/menu/main.xml
+++ b/android/res/menu/main.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/my_position"
-          android:icon="@drawable/my_position"
+          android:icon="@drawable/ic_menu_location"
           android:title="@string/my_position" />
 
     <item android:id="@+id/download_maps"
-          android:icon="@drawable/download_maps"
+          android:icon="@drawable/ic_menu_download"
           android:title="@string/download_maps" />
 </menu>
diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java
index 8416409c41..7d355bec1a 100644
--- a/android/src/com/mapswithme/maps/MWMActivity.java
+++ b/android/src/com/mapswithme/maps/MWMActivity.java
@@ -20,10 +20,14 @@ import android.util.Log;
 public class MWMActivity extends NvEventQueueActivity implements LocationService.Observer
 {
   VideoTimer m_timer;
+  
   private static String TAG = "MWMActivity";
   private final static String PACKAGE_NAME = "com.mapswithme.maps";
   
-  private boolean m_locationEnabled = false;
+  private int m_locationStatus;
+  private int m_locationIconRes;
+  private boolean m_isLocationServicePaused = false;
+  
   private LocationService m_locationService = null; 
 
   private String getAppBundlePath() throws NameNotFoundException
@@ -43,7 +47,7 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService
   public void onCreate(Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
-
+    
     final String storagePath = getDataStoragePath();
     // create folder if it doesn't exist
     File f = new File(storagePath);
@@ -59,36 +63,68 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService
     }
 
     m_timer = new VideoTimer();
+    m_locationStatus = (int)LocationService.STOPPED;
+    m_locationIconRes = R.drawable.ic_menu_location;
     m_locationService = new LocationService(this);
+    m_isLocationServicePaused = false;
   }
   
-  public void onStatusChanged(long status)
+  public void onStatusChanged(int status)
   {
-    Log.d(TAG, "onStatusChanged");
+    m_locationStatus = status;
+
+    switch (status)
+    {
+    case LocationService.FIRST_EVENT:
+      m_locationIconRes = R.drawable.ic_menu_location_found;
+      break;
+    case LocationService.STOPPED:
+      m_locationIconRes = R.drawable.ic_menu_location;
+      break;
+    case LocationService.DISABLED_BY_USER:
+      m_locationIconRes = R.drawable.ic_menu_location;
+      break;
+    case LocationService.STARTED:
+      m_locationIconRes = R.drawable.ic_menu_location_search;
+      break;
+    default:
+      m_locationIconRes = R.drawable.ic_menu_location;
+    }
+    
+    Log.d(TAG, "StatusChanged: " + status);
   }
   
   public void onLocationChanged(long time, double latitude, double longitude, float accuracy)
   {
-    Log.d(TAG, "onLocationChanged");
+  }
+  
+  public void onLocationNotAvailable()
+  {
+    Log.d(TAG, "location services is disabled or not available"); 
   }
 
-/*  @Override
+  @Override
   protected void onPause()
   {
+    if (m_locationService.isActive())
+    {
+      m_locationService.enterBackground();
+      m_isLocationServicePaused = true;
+    }
+
     super.onPause();
-    m_view.onPause();
-    if (m_locationEnabled)
-      LocationService.stop();
   }
 
   @Override
   protected void onResume()
   {
-    super.onResume();
-    m_view.onResume();
-    if (m_locationEnabled)
-      LocationService.start(this);
-  }*/
+    if (m_isLocationServicePaused)
+    {
+      m_locationService.enterForeground();
+      m_isLocationServicePaused = false;
+    }
+    super.onResume();    
+  }
 
   @Override
   public boolean onCreateOptionsMenu(Menu menu)
@@ -99,19 +135,28 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService
     //menu.removeItem(R.id.download_maps);
     return true;
   }
+  
+  @Override 
+  public boolean onPrepareOptionsMenu(Menu menu)
+  {
+    menu.findItem(R.id.my_position).setIcon(m_locationIconRes);
+    return super.onPrepareOptionsMenu(menu);
+  }
 
   @Override
   public boolean onOptionsItemSelected(MenuItem item)
   {
     // Handle item selection
+    
     switch (item.getItemId())
     {
     case R.id.my_position:
+
       if (m_locationService.isActive())
-        m_locationService.stopUpdate();
+        m_locationService.stopUpdate(true);
       else
-        m_locationService.startUpdate(this);
-      m_locationEnabled = !m_locationEnabled;
+        m_locationService.startUpdate(this, true);
+      
       return true;
     case R.id.download_maps:
       Intent intent = new Intent(this, DownloadUI.class);
diff --git a/android/src/com/mapswithme/maps/location/LocationService.java b/android/src/com/mapswithme/maps/location/LocationService.java
index 9c7652295b..f96e25d1cb 100644
--- a/android/src/com/mapswithme/maps/location/LocationService.java
+++ b/android/src/com/mapswithme/maps/location/LocationService.java
@@ -16,20 +16,36 @@ import android.view.WindowManager;
 
 public class LocationService implements LocationListener, SensorEventListener
 {
+  private static String TAG = "Location";  
+  
+  /// This constants should correspond to values defined in platform/location.hpp
+  /// @{
+  public static final int STOPPED = 0;
+  public static final int STARTED = 1;
+  public static final int FIRST_EVENT = 2;
+  public static final int NOT_SUPPORTED = 3;
+  public static final int DISABLED_BY_USER = 4;
+  /// @}
 
   public interface Observer
   {
     public void onLocationChanged(long time, double lat, double lon, float accuracy);
-    public void onStatusChanged(long status);
+    public void onStatusChanged(int status);
+    public void onLocationNotAvailable();
   };
   
+  Observer m_observer;
+  
   private boolean m_isActive = false;
-  private static String TAG = "Location";
+  private Location m_location = null;
+
   private LocationManager m_locationManager;
   private SensorManager m_sensorManager;
   private Sensor m_compassSensor;
   // To calculate true north for compass
   private GeomagneticField m_field;
+  private boolean m_hasRealProviders;
+  private boolean m_reportFirstUpdate;
   
   public LocationService(Context c)
   {
@@ -45,54 +61,110 @@ public class LocationService implements LocationListener, SensorEventListener
     return m_isActive;
   }
   
-  public void startUpdate(Observer observer)
+  public void startUpdate(Observer observer, boolean doChangeState)
   {
+    m_observer = observer;
     m_isActive = false;
+    m_hasRealProviders = false;
+    m_reportFirstUpdate = true;
 
-  /*if (m_locationManager.isProviderEnabled(LocationManager.PASSIVE_PROVIDER))
-    {
-      m_locationManager.requestLocationUpdates(LocationManager.PASSIVE_PROVIDER, 0, 0, this);
-      m_isActive = true;
-    }*/
-    
     if (m_locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER))
     {
       m_locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, this);
+      m_hasRealProviders = true;
       m_isActive = true;
     }
 
     if (m_locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER))
     {
       m_locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
+      m_hasRealProviders = true;
       m_isActive = true;
     }
+
+    if (m_hasRealProviders)
+    {
+      if (m_locationManager.isProviderEnabled(LocationManager.PASSIVE_PROVIDER))
+        m_locationManager.requestLocationUpdates(LocationManager.PASSIVE_PROVIDER, 0, 0, this);
+    }
     
     if (m_isActive)
     {
       m_sensorManager.registerListener(this, m_compassSensor, SensorManager.SENSOR_DELAY_NORMAL);
-      nativeStartUpdate(observer);
+      nativeStartUpdate(m_observer, doChangeState);
     }
     else
     {
       Log.d(TAG, "no locationProviders are found");
+      m_observer.onLocationNotAvailable();
       // TODO : callback into gui to show the "providers are not enabled" messagebox      
     }
   }
   
-  public void stopUpdate()
+  public void stopUpdate(boolean doChangeState)
   {
     m_locationManager.removeUpdates(this);
     m_sensorManager.unregisterListener(this);
     m_isActive = false;
-    nativeStopUpdate();
+    nativeStopUpdate(doChangeState);
+  }
+
+  public void enterBackground()
+  {
+    stopUpdate(false);
+
+    /// requesting location updates from the low-power location provider
+    if (m_locationManager.isProviderEnabled(LocationManager.PASSIVE_PROVIDER))
+    {
+      m_locationManager.requestLocationUpdates(LocationManager.PASSIVE_PROVIDER, 0, 0, this);
+      nativeStartUpdate(m_observer, false);
+    }
+  }
+  
+  public void enterForeground()
+  {
+    nativeStopUpdate(false);
+    
+    m_isActive = false;
+    m_hasRealProviders = false;
+
+    if (m_locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER))
+    {
+      m_locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, this);
+      m_hasRealProviders = true;
+      m_isActive = true;
+    }
+
+    if (m_locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER))
+    {
+      m_locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
+      m_hasRealProviders = true;
+      m_isActive = true;
+    }
+
+    nativeStartUpdate(m_observer, false);
+    
+    m_sensorManager.registerListener(this, m_compassSensor, SensorManager.SENSOR_DELAY_NORMAL);
+    
+    if (m_location != null)
+      nativeLocationChanged(m_location.getTime(),
+                            m_location.getLatitude(),
+                            m_location.getLongitude(),
+                            m_location.getAccuracy());
   }
   
   //@Override
   public void onLocationChanged(Location l)
   {
+    if (m_reportFirstUpdate)
+    {
+      nativeLocationStatusChanged(FIRST_EVENT);
+      m_reportFirstUpdate = false; 
+    }
     // used for compass updates
     if (m_field == null)
       m_field = new GeomagneticField((float)l.getLatitude(), (float)l.getLongitude(), (float)l.getAltitude(), l.getTime());
+    m_location = l;
     nativeLocationChanged(l.getTime(), l.getLatitude(), l.getLongitude(), l.getAccuracy());
     Log.d(TAG, l.toString());
   }
@@ -109,8 +181,7 @@ public class LocationService implements LocationListener, SensorEventListener
       {
         Log.d(TAG, "to receive a location data please enable some of the location providers");
         nativeDisable();
-        stopUpdate();
-        /// TODO : callback into GUI to set the button into the "disabled" state
+        stopUpdate(true);
       }
     }
   }
@@ -120,7 +191,7 @@ public class LocationService implements LocationListener, SensorEventListener
   {
     Log.d(TAG, "onProviderEnabled " + provider);
     if (m_isActive)
-      m_locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
+      m_locationManager.requestLocationUpdates(provider, 0, 0, this);
   }
 
   //@Override
@@ -145,9 +216,10 @@ public class LocationService implements LocationListener, SensorEventListener
       nativeCompassChanged(event.timestamp, event.values[0], event.values[0] + m_field.getDeclination(), m_field.getDeclination());
   }
 
-  private native void nativeStartUpdate(Observer observer);
-  private native void nativeStopUpdate();
+  private native void nativeStartUpdate(Observer observer, boolean changeState);
+  private native void nativeStopUpdate(boolean changeState);
   private native void nativeDisable();
   private native void nativeLocationChanged(long time, double lat, double lon, float accuracy);
+  private native void nativeLocationStatusChanged(int status);
   private native void nativeCompassChanged(long time, double magneticNorth, double trueNorth, float accuracy);
 }