From 0ae307dbf67cc379eff7d01d012d7052880d9566 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sat, 29 Sep 2018 21:16:56 +0200 Subject: [PATCH] Delete legacy search as used less than 0.1% people and non-maintainable any more --- OsmAnd/res/values/strings.xml | 2 -- .../osmand/plus/OsmAndAppCustomization.java | 4 ---- .../src/net/osmand/plus/OsmandSettings.java | 3 --- .../osmand/plus/activities/MapActivity.java | 13 ----------- .../plus/activities/MapActivityActions.java | 23 +------------------ .../SettingsDevelopmentActivity.java | 5 ---- 6 files changed, 1 insertion(+), 49 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 51a78d816e..db330258e4 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -529,8 +529,6 @@ Water Hide water Legacy search - Show legacy search - Add the legacy search to the drawer list. Allow motorways Allow motorways. Upload your OSM Note anonymously or by using your OpenStreetMap.org profile. diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java index aeab7e17a6..9fcf0777e9 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java @@ -56,10 +56,6 @@ public class OsmAndAppCustomization { return MapActivity.class; } - public Class getSearchActivity(){ - return SearchActivity.class; - } - public Class getTrackActivity(){ return TrackActivity.class; } diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index fab165fd53..1685923442 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -1192,9 +1192,6 @@ public class OsmandSettings { } - - public final OsmandPreference SHOW_LEGACY_SEARCH = new BooleanPreference("show_legacy_search", false).makeGlobal(); - // this value string is synchronized with settings_pref.xml preference name public final OsmandPreference DEBUG_RENDERING_INFO = new BooleanPreference("debug_rendering", false).makeGlobal(); diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 1a8401a167..ed54863719 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -1367,19 +1367,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven uiHandler.sendMessageDelayed(msg, LONG_KEYPRESS_DELAY); } return true; - } else if (keyCode == KeyEvent.KEYCODE_SEARCH && event.getRepeatCount() == 0) { - Intent newIntent = new Intent(MapActivity.this, getMyApplication().getAppCustomization() - .getSearchActivity()); - // causes wrong position caching: newIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - LatLon loc = getMapLocation(); - newIntent.putExtra(SearchActivity.SEARCH_LAT, loc.getLatitude()); - newIntent.putExtra(SearchActivity.SEARCH_LON, loc.getLongitude()); - if (mapViewTrackingUtilities.isMapLinkedToLocation()) { - newIntent.putExtra(SearchActivity.SEARCH_NEARBY, true); - } - startActivity(newIntent); - newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - return true; } return super.onKeyDown(keyCode, event); } diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index c61b5880e6..62d697f3b3 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -696,28 +696,7 @@ public class MapActivityActions implements DialogProvider { } }).createItem()); - if (settings.SHOW_LEGACY_SEARCH.get()) { - optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.legacy_search, mapActivity) - .setIcon(R.drawable.ic_action_search_dark) - .setListener(new ContextMenuAdapter.ItemClickListener() { - @Override - public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) { - app.logEvent(mapActivity, "drawer_legacy_search_open"); - Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization() - .getSearchActivity()); - LatLon loc = mapActivity.getMapLocation(); - newIntent.putExtra(SearchActivity.SEARCH_LAT, loc.getLatitude()); - newIntent.putExtra(SearchActivity.SEARCH_LON, loc.getLongitude()); - if (mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation()) { - newIntent.putExtra(SearchActivity.SEARCH_NEARBY, true); - } - newIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - mapActivity.startActivity(newIntent); - return true; - } - }).createItem()); - } - + optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.get_directions, mapActivity) .setIcon(R.drawable.ic_action_gdirections_dark) .setListener(new ContextMenuAdapter.ItemClickListener() { diff --git a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java index c3422de21d..3843af44f2 100644 --- a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java +++ b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java @@ -88,11 +88,6 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity { R.string.show_free_version_banner, R.string.show_free_version_banner_description)); - - cat.addPreference(createCheckBoxPreference(settings.SHOW_LEGACY_SEARCH, - R.string.show_legacy_search, R.string.show_legacy_search_desc)); - - Preference pref = new Preference(this); final Preference simulate = pref; final OsmAndLocationSimulation sim = getMyApplication().getLocationProvider().getLocationSimulation();