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-12-09 11:18:07 +01:00
commit 6a9348eab7
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/AndroidManifest.xml
View file

@ -472,7 +472,7 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<activity android:name=".liveupdates.LivieUpdatesActivity"> <activity android:name=".liveupdates.LiveUpdatesActivity">
</activity> </activity>
</application> </application>

4
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -44,7 +44,7 @@ import net.osmand.plus.activities.search.SearchActivity;
import net.osmand.plus.dashboard.DashboardOnMap.DashboardType; import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
import net.osmand.plus.dialogs.FavoriteDialogs; import net.osmand.plus.dialogs.FavoriteDialogs;
import net.osmand.plus.download.IndexItem; import net.osmand.plus.download.IndexItem;
import net.osmand.plus.liveupdates.LivieUpdatesActivity; import net.osmand.plus.liveupdates.LiveUpdatesActivity;
import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder; import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.BaseMapLayer; import net.osmand.plus.views.BaseMapLayer;
@ -650,7 +650,7 @@ public class MapActivityActions implements DialogProvider {
.listen(new OnContextMenuClick() { .listen(new OnContextMenuClick() {
@Override @Override
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) { public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
Intent intent = new Intent(mapActivity, LivieUpdatesActivity.class); Intent intent = new Intent(mapActivity, LiveUpdatesActivity.class);
mapActivity.startActivity(intent); mapActivity.startActivity(intent);
return false; return false;
} }

2
OsmAnd/src/net/osmand/plus/LiveUpdates/LivieUpdatesActivity.java → OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesActivity.java
View file

@ -10,7 +10,7 @@ import android.support.v4.view.ViewPager;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.ActionBarProgressActivity; import net.osmand.plus.activities.ActionBarProgressActivity;
public class LivieUpdatesActivity extends ActionBarProgressActivity { public class LiveUpdatesActivity extends ActionBarProgressActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {

0
OsmAnd/src/net/osmand/plus/LiveUpdates/LiveUpdatesFragment.java → OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
View file