Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-08-27 14:03:55 +02:00
commit f9a0559655

View file

@ -102,6 +102,15 @@ public class MapInfoWidgetsFactory {
if (app.getNavigationService() != null){ if (app.getNavigationService() != null){
AlertDialog.Builder dlg = new AlertDialog.Builder(map); AlertDialog.Builder dlg = new AlertDialog.Builder(map);
dlg.setTitle(app.getString(R.string.sleep_mode_stop_dialog)); dlg.setTitle(app.getString(R.string.sleep_mode_stop_dialog));
//Show currently active wake-up interval
if (vs.value <= 90000) {
String vss = ": " + Integer.toString(vs.value/1000) + "int_seconds";
} else {
String vss = ": " + Integer.toString(vs.value/1000/60) + "int_minutes";
}
dlg.setMessage(app.getString(R.string.gps_wake_up_timer) + vss);
dlg.setPositiveButton(app.getString(R.string.keep_navigation_service), null); dlg.setPositiveButton(app.getString(R.string.keep_navigation_service), null);
dlg.setNegativeButton(app.getString(R.string.stop_navigation_service), new DialogInterface.OnClickListener() { dlg.setNegativeButton(app.getString(R.string.stop_navigation_service), new DialogInterface.OnClickListener() {
@Override @Override