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

Automatically restart settings when active plugins list is modified.

Browse source
This commit is contained in:
Igor B. Poretsky 2013-03-01 05:25:16 +04:00
parent a22f9c4fc8
commit 99c30540b8
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
View file

@ -17,7 +17,9 @@ import android.widget.ListView;
import android.widget.TextView;
public class PluginsActivity extends OsmandListActivity {
public static final int ACTIVE_PLUGINS_LIST_MODIFIED = 1;
private List<OsmandPlugin> availablePlugins;
private Set<String> clickedPlugins = new LinkedHashSet<String>();
private Set<String> restartPlugins = new LinkedHashSet<String>();
@ -52,6 +54,7 @@ public class PluginsActivity extends OsmandListActivity {
} else {
restartPlugins.add(item.getId());
}
setResult(ACTIVE_PLUGINS_LIST_MODIFIED);
}
clickedPlugins.add(item.getId());
getListAdapter().notifyDataSetChanged();

14
OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
View file

@ -25,6 +25,7 @@ import net.osmand.plus.ProgressDialogImplementation;
import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.activities.CustomTitleBar.CustomTitleBarView;
import net.osmand.plus.activities.PluginsActivity;
import net.osmand.plus.render.NativeOsmandLibrary;
import net.osmand.plus.routing.RouteProvider.RouteService;
import net.osmand.plus.views.SeekBarPreference;
@ -67,6 +68,8 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
public static final String SCREEN_ID_NAVIGATION_SETTINGS = "routing_settings";
public static final String MORE_VALUE = "MORE_VALUE";
private static final int PLUGINS_SELECTION_REQUEST = 1;
private Preference bidforfix;
private Preference plugins;
private Preference avoidRouting;
@ -441,6 +444,15 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
super.onDestroy();
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if ((requestCode == PLUGINS_SELECTION_REQUEST) && (resultCode == PluginsActivity.ACTIVE_PLUGINS_LIST_MODIFIED)) {
finish();
startActivity(getIntent());
}
}
public void updateAllSettings() {
for (OsmandPreference<Boolean> b : booleanPreferences.values()) {
CheckBoxPreference pref = (CheckBoxPreference) screenPreferences.get(b.getId());
@ -758,7 +770,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
startActivity(new Intent(this, OsmandBidForFixActivity.class));
return true;
} else if (preference == plugins) {
startActivity(new Intent(this, PluginsActivity.class));
startActivityForResult(new Intent(this, PluginsActivity.class), PLUGINS_SELECTION_REQUEST);
return true;
} else if (preference == avoidRouting) {
showBooleanSettings(new String[] { getString(R.string.avoid_toll_roads), getString(R.string.avoid_ferries),