Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-09-24 08:55:07 +02:00
commit 91159e8ec1
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout-land/map_hud_top.xml
View file

@ -194,6 +194,7 @@
android:layout_gravity="top|center" android:layout_gravity="top|center"
android:layout_marginTop="@dimen/map_button_margin" android:layout_marginTop="@dimen/map_button_margin"
android:background="@drawable/btn_round" android:background="@drawable/btn_round"
android:visibility="gone"
android:orientation="vertical" > android:orientation="vertical" >
<ImageView <ImageView

4
OsmAnd/res/layout/map_hud_top.xml
View file

@ -149,11 +149,11 @@
android:layout_gravity="top|left" android:layout_gravity="top|left"
android:orientation="vertical" > android:orientation="vertical" >
<!--
<include layout="@layout/map_hud_widget" /> <include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget" /> <include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget" /> <include layout="@layout/map_hud_widget" />
-->
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

2
OsmAnd/src/net/osmand/plus/osmo/OsMoService.java
View file

@ -61,7 +61,7 @@ public class OsMoService implements OsMoReactor {
public static final String SHARE_TRACKER_URL = "http://z.osmo.mobi/connect?id="; public static final String SHARE_TRACKER_URL = "http://z.osmo.mobi/connect?id=";
public static final String SHARE_GROUP_URL = "http://z.osmo.mobi/join?id="; public static final String SHARE_GROUP_URL = "http://z.osmo.mobi/join?id=";
public static final String SIGNED_IN_CONTAINS = "z.osmo.mobi/login"; public static final String SIGNED_IN_CONTAINS = "z.osmo.mobi/login";
public static final String TRACK_URL = "http://osmo.mobi/u/"; public static final String TRACK_URL = "http://osmo.mobi/s/";
private String lastRegistrationError = null; private String lastRegistrationError = null;
private OsMoPlugin plugin; private OsMoPlugin plugin;
private boolean enabled = false; private boolean enabled = false;