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

Revert "GPS service now controlled fully automatically - no manual manipulation of back-stage parameters needed any more."

Browse source 
This reverts commit 1c4ab5c7af.
This commit is contained in:
Victor Shcherb 2016-10-31 10:22:57 +02:00
parent 41d00d8d96
commit d1fbe6b4b2
2 changed files with 51 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,6 @@ public class StartGPSStatus extends OsmAndAction {
}
OsmandMapTileView view = mapActivity.getMapView();
AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
builder.setTitle(R.string.gps_status);
LinearLayout ll = new LinearLayout(activity);
final ListView lv = new ListView(activity);
lv.setPadding(7, 3, 7, 0);

104
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -108,65 +108,63 @@ public class MapInfoWidgetsFactory {
gpsInfoControl.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
// Issue #3185: GPS service now controlled fully automatically - no manual manipulation of back-stage parameters needed any more.
// TODO: Once we use the new notifications only, we can remove strings sleep_mode_stop_dialog, gps_wake_up_timer, keep_navigation_service, stop_navigation_service
//if (app.getNavigationService() != null) {
// AlertDialog.Builder dlg = new AlertDialog.Builder(map);
// dlg.setTitle(app.getString(R.string.sleep_mode_stop_dialog));
if (app.getNavigationService() != null) {
AlertDialog.Builder dlg = new AlertDialog.Builder(map);
dlg.setTitle(app.getString(R.string.sleep_mode_stop_dialog));
//Show currently active wake-up interval
// int soi = app.getNavigationService().getServiceOffInterval();
// if (soi == 0) {
// dlg.setMessage(app.getString(R.string.gps_wake_up_timer) + ": " + app.getString(R.string.int_continuosly));
// } else if (soi <= 90000) {
// dlg.setMessage(app.getString(R.string.gps_wake_up_timer) + ": " + Integer.toString(soi / 1000) + " " + app.getString(R.string.int_seconds));
// } else {
// dlg.setMessage(app.getString(R.string.gps_wake_up_timer) + ": " + Integer.toString(soi / 1000 / 60) + " " + app.getString(R.string.int_min));
// }
int soi = app.getNavigationService().getServiceOffInterval();
if (soi == 0) {
dlg.setMessage(app.getString(R.string.gps_wake_up_timer) + ": " + app.getString(R.string.int_continuosly));
} else if (soi <= 90000) {
dlg.setMessage(app.getString(R.string.gps_wake_up_timer) + ": " + Integer.toString(soi / 1000) + " " + app.getString(R.string.int_seconds));
} else {
dlg.setMessage(app.getString(R.string.gps_wake_up_timer) + ": " + Integer.toString(soi / 1000 / 60) + " " + app.getString(R.string.int_min));
}
// dlg.setPositiveButton(app.getString(R.string.keep_navigation_service), null);
// dlg.setNegativeButton(app.getString(R.string.stop_navigation_service), new DialogInterface.OnClickListener() {
// @Override
// public void onClick(DialogInterface dialogInterface, int i) {
// Intent serviceIntent = new Intent(app, NavigationService.class);
// app.stopService(serviceIntent);
// }
// });
// dlg.show();
dlg.setPositiveButton(app.getString(R.string.keep_navigation_service), null);
dlg.setNegativeButton(app.getString(R.string.stop_navigation_service), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
Intent serviceIntent = new Intent(app, NavigationService.class);
app.stopService(serviceIntent);
}
});
dlg.show();
//} else {
// final ValueHolder<Integer> vs = new ValueHolder<Integer>();
// vs.value = 0;
// final AlertDialog[] dlgshow = new AlertDialog[1];
// AlertDialog.Builder dlg = new AlertDialog.Builder(map);
// dlg.setTitle(app.getString(R.string.enable_sleep_mode));
// WindowManager mgr = (WindowManager) map.getSystemService(Context.WINDOW_SERVICE);
// DisplayMetrics dm = new DisplayMetrics();
// mgr.getDefaultDisplay().getMetrics(dm);
// LinearLayout ll = OsmandMonitoringPlugin.createIntervalChooseLayout(map,
// app.getString(R.string.gps_wake_up_timer) + " : %s",
// OsmandMonitoringPlugin.SECONDS,
// OsmandMonitoringPlugin.MINUTES,
// null, vs, dm);
// if (Version.isGpsStatusEnabled(app)) {
// dlg.setNeutralButton(R.string.gps_status, new DialogInterface.OnClickListener() {
// @Override
// public void onClick(DialogInterface dialog, int which) {
} else {
final ValueHolder<Integer> vs = new ValueHolder<Integer>();
vs.value = 0;
final AlertDialog[] dlgshow = new AlertDialog[1];
AlertDialog.Builder dlg = new AlertDialog.Builder(map);
dlg.setTitle(app.getString(R.string.enable_sleep_mode));
WindowManager mgr = (WindowManager) map.getSystemService(Context.WINDOW_SERVICE);
DisplayMetrics dm = new DisplayMetrics();
mgr.getDefaultDisplay().getMetrics(dm);
LinearLayout ll = OsmandMonitoringPlugin.createIntervalChooseLayout(map,
app.getString(R.string.gps_wake_up_timer) + " : %s",
OsmandMonitoringPlugin.SECONDS,
OsmandMonitoringPlugin.MINUTES,
null, vs, dm);
if (Version.isGpsStatusEnabled(app)) {
dlg.setNeutralButton(R.string.gps_status, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
new StartGPSStatus(map).run();
// }
// });
// }
// dlg.setView(ll);
// dlg.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
// @Override
// public void onClick(DialogInterface dialog, int which) {
// app.startNavigationService(NavigationService.USED_BY_WAKE_UP, vs.value);
// }
// });
// dlg.setNegativeButton(R.string.shared_string_cancel, null);
// dlgshow[0] = dlg.show();
}
});
}
dlg.setView(ll);
dlg.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
app.startNavigationService(NavigationService.USED_BY_WAKE_UP, vs.value);
}
});
dlg.setNegativeButton(R.string.shared_string_cancel, null);
dlgshow[0] = dlg.show();
//}
}
}
});