Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50405385 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Fix UP button not working in preference activity" into main

parents 14cb9b41 b6dc1d7b
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -749,6 +749,10 @@ public abstract class PreferenceActivity extends ListActivity implements
            getListView().clearChoices();
        } else if (!WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(this)) {
            super.onBackPressed();
        } else if (!mIsBackCallbackRegistered) {
            // If predictive back is enabled and no callback is registered, finish the activity.
            // This ensures correct back navigation behaviour when onBackPressed is called manually.
            finish();
        }
        updateBackCallbackRegistrationState();
    }