Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
91159e8ec1
3 changed files with 4 additions and 3 deletions
|
@ -194,6 +194,7 @@
|
|||
android:layout_gravity="top|center"
|
||||
android:layout_marginTop="@dimen/map_button_margin"
|
||||
android:background="@drawable/btn_round"
|
||||
android:visibility="gone"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<ImageView
|
||||
|
|
|
@ -149,11 +149,11 @@
|
|||
android:layout_gravity="top|left"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<!--
|
||||
<include layout="@layout/map_hud_widget" />
|
||||
|
||||
<include layout="@layout/map_hud_widget" />
|
||||
|
||||
<include layout="@layout/map_hud_widget" />
|
||||
-->
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
|
@ -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_GROUP_URL = "http://z.osmo.mobi/join?id=";
|
||||
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 OsMoPlugin plugin;
|
||||
private boolean enabled = false;
|
||||
|
|
Loading…
Reference in a new issue