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

Fix minor issues

Browse source
This commit is contained in:
Victor Shcherb 2013-07-18 19:12:22 +02:00
parent 33fa0010a4
commit e0baef4ae6
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/notification.xml
View file

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout" android:id="@+id/layout"
android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical" android:background="@color/color_black">
<net.osmand.access.NotificationTextView android:id="@+id/message" <net.osmand.access.NotificationTextView android:id="@+id/message"
android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginLeft="4dp" android:layout_marginRight="4dp"

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

@ -703,7 +703,7 @@ public class MapActivityActions implements DialogProvider {
} }
final Spinner fromSpinner = ((Spinner) view.findViewById(R.id.FromSpinner)); final Spinner fromSpinner = ((Spinner) view.findViewById(R.id.FromSpinner));
ArrayAdapter<String> fromAdapter = new ArrayAdapter<String>(view.getContext(), ArrayAdapter<String> fromAdapter = new ArrayAdapter<String>(view.getContext(),
android.R.layout.simple_spinner_item, android.R.layout.simple_spinner_dropdown_item,
fromActions fromActions
); );
fromSpinner.setAdapter(fromAdapter); fromSpinner.setAdapter(fromAdapter);
@ -733,7 +733,7 @@ public class MapActivityActions implements DialogProvider {
} }
final Spinner toSpinner = ((Spinner) view.findViewById(R.id.ToSpinner)); final Spinner toSpinner = ((Spinner) view.findViewById(R.id.ToSpinner));
ArrayAdapter<String> toAdapter = new ArrayAdapter<String>(view.getContext(), ArrayAdapter<String> toAdapter = new ArrayAdapter<String>(view.getContext(),
android.R.layout.simple_spinner_item, android.R.layout.simple_spinner_dropdown_item,
toActions toActions
); );
toSpinner.setAdapter(toAdapter); toSpinner.setAdapter(toAdapter);
@ -1146,6 +1146,15 @@ public class MapActivityActions implements DialogProvider {
} }
} }
}).reg(); }).reg();
if (getTargets().getPointToNavigate() != null) {
optionsMenuHelper.item(R.string.target_points).icons(R.drawable.ic_action_flage_dark, R.drawable.ic_action_flage_light)
.listen(new OnContextMenuClick() {
@Override
public void onContextMenuClick(int itemId, int pos, boolean isChecked, DialogInterface dialog) {
openIntermediatePointsDialog();
}
}).reg();
}
if (mapActivity.getPointToNavigate() != null) { if (mapActivity.getPointToNavigate() != null) {
int nav; int nav;
if(routingHelper.isFollowingMode()) { if(routingHelper.isFollowingMode()) {
@ -1213,18 +1222,6 @@ public class MapActivityActions implements DialogProvider {
mapActivity.startActivity(newIntent); mapActivity.startActivity(newIntent);
} }
}).reg(); }).reg();
// 10-11 Waypoints, Use location
if (getTargets().getPointToNavigate() != null) {
optionsMenuHelper.item(R.string.target_points).icons(R.drawable.ic_action_flage_dark,
R.drawable.ic_action_flage_light)
.listen(new OnContextMenuClick() {
@Override
public void onContextMenuClick(int itemId, int pos, boolean isChecked, DialogInterface dialog) {
openIntermediatePointsDialog();
}
}).reg();
}
optionsMenuHelper.item(R.string.show_point_options).icons(R.drawable.ic_action_marker_dark, R.drawable.ic_action_marker_light ) optionsMenuHelper.item(R.string.show_point_options).icons(R.drawable.ic_action_marker_dark, R.drawable.ic_action_marker_light )
.listen(new OnContextMenuClick() { .listen(new OnContextMenuClick() {
@Override @Override