diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 834addc..b4a443a 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -473,16 +473,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt new AsyncTask>() { protected HashSet doInBackground(Void... unused) { HashSet widgets = mNotesListAdapter.getSelectedWidget(); - if (!isSyncMode()) { - // if not synced, delete notes directly + if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ // 只需要修改这里 + // if in trash, really delete notes if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter .getSelectedItemIds())) { } else { Log.e(TAG, "Delete notes error, should not happens"); } } else { - // in sync mode, we'll move the deleted note into the trash - // folder + // move notes to trash if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) { Log.e(TAG, "Move notes to trash folder error, should not happens"); @@ -812,12 +811,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt case R.id.menu_search: onSearchRequested(); break; + case R.id.menu_trash: + openTrashFolder(); + break; default: break; } return true; } - + private void openTrashFolder() { + // 将当前列表的编辑状态设置为子文件夹模式 + mState = ListEditState.SUB_FOLDER; + // 将当前文件夹 ID 设置为垃圾箱的 ID + mCurrentFolderId = Notes.ID_TRASH_FOLER; + startAsyncNotesListQuery(); + // 不显示底部的“写便签” + mAddNewNote.setVisibility(View.GONE); + // 将顶部栏设置为 data.getSnippet 文件夹名称 + mTitleBar.setText(NotesListActivity.this + .getString(R.string.menu_trash)); + mTitleBar.setVisibility(View.VISIBLE); + } @Override public boolean onSearchRequested() { startSearch(null, false, null /* appData */, false); diff --git a/src/app/src/main/res/menu/note_list.xml b/src/app/src/main/res/menu/note_list.xml index 42ea736..9a7c51d 100644 --- a/src/app/src/main/res/menu/note_list.xml +++ b/src/app/src/main/res/menu/note_list.xml @@ -33,7 +33,8 @@ android:id="@+id/menu_setting" android:title="@string/menu_setting" /> + + android:id="@+id/menu_trash" + android:title="@string/menu_trash"/> diff --git a/src/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml index 55df868..24cb211 100644 --- a/src/app/src/main/res/values/strings.xml +++ b/src/app/src/main/res/values/strings.xml @@ -116,6 +116,8 @@ %1$s has been set as the sync account New note background color random + Recycle Bin + Delete Call notes Input name