|
|
|
@ -220,11 +220,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
|
|
|
|
|
protected void onStart() {
|
|
|
|
|
super.onStart();
|
|
|
|
|
Intent intent = getIntent();
|
|
|
|
|
// 如果是搜索引起的实体创建,说明需要展示搜索页面
|
|
|
|
|
if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
|
|
|
|
|
String query = intent.getStringExtra(SearchManager.QUERY);
|
|
|
|
|
mTitleBar.setText(SEARCH_RESULTS + query);
|
|
|
|
|
mTitleBar.setVisibility(View.VISIBLE);
|
|
|
|
|
mAddNewNote.setVisibility(View.GONE);
|
|
|
|
|
// 将搜索数据同步
|
|
|
|
|
startAsyncNotesSearchListQuery(query);
|
|
|
|
|
}
|
|
|
|
|
else startAsyncNotesListQuery();
|
|
|
|
@ -453,14 +455,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
|
|
|
|
|
private void startAsyncNotesListQuery() {
|
|
|
|
|
String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
|
|
|
|
|
: NORMAL_SELECTION;
|
|
|
|
|
// 按照 Top 降序
|
|
|
|
|
mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
|
|
|
|
|
Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
|
|
|
|
|
String.valueOf(mCurrentFolderId)
|
|
|
|
|
}, NoteColumns.TOP + " DESC," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
|
|
|
|
|
// DESC 降序
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void startAsyncNotesSearchListQuery(String query) {
|
|
|
|
|
// 模糊匹配 query
|
|
|
|
|
String selection = NoteColumns.SNIPPET + " LIKE'%" + query +"%'";
|
|
|
|
|
mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
|
|
|
|
|
Notes.CONTENT_NOTE_URI,
|
|
|
|
|