From 621e731d6398b298774b8fc6bd8a87613bb0398f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Fri, 3 Jun 2022 23:07:36 +0100 Subject: [PATCH] Go to previous PreferenceScreen on back actionbar option Fixes #2692 --- .../devicesettings/DeviceSettingsActivity.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java index 9ed08de5d..0a74095c3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java @@ -17,6 +17,7 @@ package nodomain.freeyourgadget.gadgetbridge.activities.devicesettings; import android.os.Bundle; +import android.view.MenuItem; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceFragmentCompat; @@ -72,4 +73,17 @@ public class DeviceSettingsActivity extends AbstractGBActivity implements .commit(); return true; } -} \ No newline at end of file + + @Override + public boolean onOptionsItemSelected(final MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + // Simulate a back press, so that we don't actually exit the activity when + // in a nested PreferenceScreen + this.onBackPressed(); + return true; + } + + return super.onOptionsItemSelected(item); + } +}