Return to SearchResults on "Up" navigation from AppDetails

When arriving to the AppDetails screen from SearchResults, the Up navigation should return to SearchResults screen and not its actual parent.
This commit is contained in:
Jeff Mixon 2015-10-01 17:45:28 +02:00
parent 998d99eee0
commit 1daae076ec
2 changed files with 7 additions and 1 deletions

View File

@ -129,6 +129,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
public static final String EXTRA_APPID = "appid";
public static final String EXTRA_FROM = "from";
public static final String EXTRA_HINT_SEARCHING = "searching";
private FDroidApp fdroidApp;
private ApkListAdapter adapter;
@ -769,7 +770,11 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
switch (item.getItemId()) {
case android.R.id.home:
navigateUp();
if (getIntent().hasExtra(EXTRA_HINT_SEARCHING)) {
finish();
} else {
navigateUp();
}
return true;
case LAUNCH:

View File

@ -111,6 +111,7 @@ public class SearchResultsFragment extends ListFragment implements LoaderManager
Intent intent = new Intent(getActivity(), AppDetails.class);
intent.putExtra(AppDetails.EXTRA_APPID, app.id);
intent.putExtra(AppDetails.EXTRA_HINT_SEARCHING, true);
startActivityForResult(intent, REQUEST_APPDETAILS);
super.onListItemClick(l, v, position, id);
}