diff --git a/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java index 66ae5b7..f1d9277 100644 --- a/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -201,6 +201,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt * Insert an introduction when user firstly use this application */ setAppInfoFromRawRes(); + + // 注册Android 13+的返回键回调 + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) { + getOnBackInvokedDispatcher().registerOnBackInvokedCallback( + android.window.OnBackInvokedDispatcher.PRIORITY_DEFAULT, + new android.window.OnBackInvokedCallback() { + @Override + public void onBackInvoked() { + handleBackPress(); + } + } + ); + } } /** @@ -1052,8 +1065,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt * 3. 如果在根文件夹中,调用默认的返回处理 *

*/ - @Override - public void onBackPressed() { + private void handleBackPress() { switch (mState) { case SUB_FOLDER: mCurrentFolderId = Notes.ID_ROOT_FOLDER; @@ -1076,6 +1088,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } + @Override + public void onBackPressed() { + handleBackPress(); + } + /** * 更新部件 *