From 0d63bae3c57a179a45a12bb31568369c41b0e124 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Thu, 11 Jun 2015 19:11:40 +0300 Subject: [PATCH] Navigation fix after toolbar back button press in downloader. --- .../src/com/mapswithme/test/MonkeyEventsReceiver.java | 2 +- android/src/com/mapswithme/country/DownloadFragment.java | 8 ++++++++ .../src/com/mapswithme/maps/search/SearchActivity.java | 7 ------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/android/MapsWithMeTest/src/com/mapswithme/test/MonkeyEventsReceiver.java b/android/MapsWithMeTest/src/com/mapswithme/test/MonkeyEventsReceiver.java index 2a620b751e..1ce6ab5840 100644 --- a/android/MapsWithMeTest/src/com/mapswithme/test/MonkeyEventsReceiver.java +++ b/android/MapsWithMeTest/src/com/mapswithme/test/MonkeyEventsReceiver.java @@ -79,7 +79,7 @@ public class MonkeyEventsReceiver extends BroadcastReceiver @Override public void run() { - SearchActivity.startForSearch(target, mQuery, mScope); + // TODO finish search task } }, 1500); diff --git a/android/src/com/mapswithme/country/DownloadFragment.java b/android/src/com/mapswithme/country/DownloadFragment.java index 29c2244ced..60f93a797f 100644 --- a/android/src/com/mapswithme/country/DownloadFragment.java +++ b/android/src/com/mapswithme/country/DownloadFragment.java @@ -53,6 +53,14 @@ public class DownloadFragment extends BaseMwmListFragment implements View.OnClic { final Toolbar toolbar = getToolbar(); toolbar.setTitle(getString(R.string.maps)); + toolbar.setNavigationOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View v) + { + onBackPressed(); + } + }); mTvUpdateAll = (TextView) toolbar.findViewById(R.id.tv__update_all); mTvUpdateAll.setOnClickListener(this); mTvUpdateAll.setVisibility(View.GONE); diff --git a/android/src/com/mapswithme/maps/search/SearchActivity.java b/android/src/com/mapswithme/maps/search/SearchActivity.java index d8b2df6335..5813ac9817 100644 --- a/android/src/com/mapswithme/maps/search/SearchActivity.java +++ b/android/src/com/mapswithme/maps/search/SearchActivity.java @@ -23,13 +23,6 @@ public class SearchActivity extends BaseMwmFragmentActivity transaction.commit(); } - public static void startForSearch(Context context, String query, int scope) - { - final Intent i = new Intent(context, SearchActivity.class); - i.putExtra(EXTRA_QUERY, query); - context.startActivity(i); - } - public static void startForSearch(Context context, String query) { final Intent i = new Intent(context, SearchActivity.class);