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 2014-02-24 01:20:24 +01:00
commit 5b2bee22b7
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/ApplicationMode.java
View file

@ -174,7 +174,7 @@ public class ApplicationMode {
}
public static List<ApplicationMode> allPossibleValues(OsmandSettings settings) {
return values;
return new ArrayList<ApplicationMode>(values);
}

1
OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
View file

@ -311,6 +311,7 @@ public abstract class SettingsBaseActivity extends SherlockPreferenceActivity im
@Override
public void onClick(View v) {
if(selected.size() > 0) {
// test
setSelectedAppMode(selected.iterator().next());
}
if(profileDialog != null && profileDialog.isShowing()) {

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

@ -373,7 +373,9 @@ public class NavigateAction {
if(!showDefault) {
values.remove(ApplicationMode.DEFAULT);
}
selected.add(settings.getApplicationMode());
if (showDefault || settings.getApplicationMode() != ApplicationMode.DEFAULT) {
selected.add(settings.getApplicationMode());
}
return prepareAppModeView(a, values, selected, parent, singleSelection, onClickListener);
}