Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
f79d3fe9a1
2 changed files with 11 additions and 13 deletions
|
@ -10,7 +10,7 @@
|
||||||
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
|
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
|
||||||
-->
|
-->
|
||||||
<string name="simulate_initial_startup_descr">"Resets flag indicating first startup, keep other settings in the original state"</string>
|
<string name="simulate_initial_startup_descr">"Resets flag indicating first startup, keep other settings in the original state"</string>
|
||||||
<string name="simulate_initial_startup">Simulate initial startup</string>
|
<string name="simulate_initial_startup">Simulate first app start</string>
|
||||||
<string name="share_geo">geo:</string>
|
<string name="share_geo">geo:</string>
|
||||||
<string name="share_menu_location">Share location</string>
|
<string name="share_menu_location">Share location</string>
|
||||||
<string name="shared_string_send">Send</string>
|
<string name="shared_string_send">Send</string>
|
||||||
|
@ -44,7 +44,7 @@
|
||||||
<string name="gps_wake_up_timer">GPS wake-up interval</string>
|
<string name="gps_wake_up_timer">GPS wake-up interval</string>
|
||||||
<string name="favourites_edit_dialog_title">Favorite information</string>
|
<string name="favourites_edit_dialog_title">Favorite information</string>
|
||||||
<string name="simulate_your_location_stop_descr">Stop simulating your position</string>
|
<string name="simulate_your_location_stop_descr">Stop simulating your position</string>
|
||||||
<string name="simulate_your_location_descr">Simulate using recorded GPX or calculated route</string>
|
<string name="simulate_your_location_descr">Simulate using calculated route or recorded GPX</string>
|
||||||
<string name="address_unknown">Address is not known yet</string>
|
<string name="address_unknown">Address is not known yet</string>
|
||||||
<string name="av_locations_descr">GPX file with note locations</string>
|
<string name="av_locations_descr">GPX file with note locations</string>
|
||||||
<string name="av_locations">Locations</string>
|
<string name="av_locations">Locations</string>
|
||||||
|
|
|
@ -58,7 +58,11 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
|
||||||
final CheckBoxPreference openGlRender = createCheckBoxPreference(settings.USE_OPENGL_RENDER, R.string.use_opengl_render,R.string.use_opengl_render_descr);
|
final CheckBoxPreference openGlRender = createCheckBoxPreference(settings.USE_OPENGL_RENDER, R.string.use_opengl_render,R.string.use_opengl_render_descr);
|
||||||
cat.addPreference(openGlRender);
|
cat.addPreference(openGlRender);
|
||||||
|
|
||||||
|
if(Version.isDeveloperVersion(getMyApplication())) {
|
||||||
|
cat.addPreference(createCheckBoxPreference(settings.BETA_TESTING_LIVE_UPDATES,
|
||||||
|
"Live updates", "Beta testing for live updates"));
|
||||||
|
}
|
||||||
|
|
||||||
final Preference firstRunPreference = new Preference(this);
|
final Preference firstRunPreference = new Preference(this);
|
||||||
firstRunPreference.setTitle(R.string.simulate_initial_startup);
|
firstRunPreference.setTitle(R.string.simulate_initial_startup);
|
||||||
firstRunPreference.setSummary(R.string.simulate_initial_startup_descr);
|
firstRunPreference.setSummary(R.string.simulate_initial_startup_descr);
|
||||||
|
@ -74,10 +78,10 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
|
||||||
});
|
});
|
||||||
cat.addPreference(firstRunPreference);
|
cat.addPreference(firstRunPreference);
|
||||||
|
|
||||||
if(Version.isDeveloperVersion(getMyApplication())) {
|
cat.addPreference(createCheckBoxPreference(settings.SHOULD_SHOW_FREE_VERSION_BANNER,
|
||||||
cat.addPreference(createCheckBoxPreference(settings.BETA_TESTING_LIVE_UPDATES,
|
R.string.show_free_version_banner,
|
||||||
"Live updates", "Beta testing for live updates"));
|
R.string.show_free_version_banner_description));
|
||||||
}
|
|
||||||
Preference pref = new Preference(this);
|
Preference pref = new Preference(this);
|
||||||
final Preference simulate = pref;
|
final Preference simulate = pref;
|
||||||
final OsmAndLocationSimulation sim = getMyApplication().getLocationProvider().getLocationSimulation();
|
final OsmAndLocationSimulation sim = getMyApplication().getLocationProvider().getLocationSimulation();
|
||||||
|
@ -114,8 +118,6 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
cat.addPreference(pref);
|
cat.addPreference(pref);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
pref = new Preference(this);
|
pref = new Preference(this);
|
||||||
pref.setTitle(R.string.app_modes_choose);
|
pref.setTitle(R.string.app_modes_choose);
|
||||||
|
@ -196,10 +198,6 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
|
||||||
//setEnabled(false) creates bad readability on some devices
|
//setEnabled(false) creates bad readability on some devices
|
||||||
//pref.setEnabled(false);
|
//pref.setEnabled(false);
|
||||||
cat.addPreference(pref);
|
cat.addPreference(pref);
|
||||||
|
|
||||||
cat.addPreference(createCheckBoxPreference(settings.SHOULD_SHOW_FREE_VERSION_BANNER,
|
|
||||||
R.string.show_free_version_banner,
|
|
||||||
R.string.show_free_version_banner_description));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void availableProfileDialog() {
|
protected void availableProfileDialog() {
|
||||||
|
|
Loading…
Reference in a new issue