Back fixes

This commit is contained in:
M66B
2019-10-04 16:57:40 +02:00
parent 264b957c73
commit 1c0f5382f5
6 changed files with 15 additions and 42 deletions

View File

@@ -27,8 +27,10 @@ import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.os.Bundle;
import android.os.PowerManager;
import android.view.MenuItem;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.Lifecycle;
@@ -260,6 +262,18 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
super.onBackPressed();
}
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
onBackPressed();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
protected boolean backHandled() {
for (IBackPressedListener listener : backPressedListeners)
if (listener.onBackPressed())