Merge branch '1.0' into develop

This commit is contained in:
jannis 2019-08-25 11:23:38 +02:00
commit 6369e1a434

View File

@ -325,9 +325,7 @@ public class SettingsActivity extends PreferenceActivity {
public boolean onMenuItemSelected(int featureId, MenuItem item) {
int id = item.getItemId();
if (id == android.R.id.home) {
if (!super.onMenuItemSelected(featureId, item)) {
NavUtils.navigateUpFromSameTask(this);
}
finish();
return true;
}
return super.onMenuItemSelected(featureId, item);