pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Navigation fix after toolbar back button press in downloader.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-06-11 19:11:40 +03:00 • committed by Alex Zolotarev
parent b997575dc9
commit 0d63bae3c5
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/MapsWithMeTest/src/com/mapswithme/test/MonkeyEventsReceiver.java
View file

@ -79,7 +79,7 @@ public class MonkeyEventsReceiver extends BroadcastReceiver
@Override
public void run()
{
SearchActivity.startForSearch(target, mQuery, mScope);
// TODO finish search task
}
}, 1500);

8
android/src/com/mapswithme/country/DownloadFragment.java
View file

@ -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);

7
android/src/com/mapswithme/maps/search/SearchActivity.java
View file

@ -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);