第二次提交

.gitignore

@@ -0,0 +1,37 @@
+*.iml
+
+.DS_Store
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/dictionaries
+.idea/libraries
+.idea/
+
+# Keystore files
+*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/.name

@@ -1 +0,0 @@
-Contact.java

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>

.idea/gradle.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

.idea/misc.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="11" project-jdk-type="JavaSDK" />
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
 </project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/suibianzu-Gitpractice.iml" filepath="$PROJECT_DIR$/.idea/suibianzu-Gitpractice.iml" />
-    </modules>
-  </component>
-</project>

.idea/suibianzu-Gitpractice.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.idea/workspace.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="75997e0f-332e-4fa0-94e3-6fe48c1a3512" name="更改" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/.name" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.name" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 5
-}</component>
-  <component name="ProjectId" id="2vplyJFxP9oeYRdZ65d9wtoBCL2" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;D&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;
-  }
-}</component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="默认任务">
-      <changelist id="75997e0f-332e-4fa0-94e3-6fe48c1a3512" name="更改" comment="" />
-      <created>1744850148700</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1744850148700</updated>
-    </task>
-    <servers />
-  </component>
-</project>

6.txt

@@ -1,2 +0,0 @@
-88888888
-66666666

LICENSE

@@ -1,16 +1,3 @@
-
-   Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -188,3 +175,27 @@
 
    END OF TERMS AND CONDITIONS
 
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,2 +1,24 @@
-# suibianzu-Gitpractice
+# MiNotes
+[中文]
 
+1. MiCode便签是小米便签的社区开源版，由MIUI团队(www.miui.com) 发起并贡献第一批代码，遵循NOTICE文件所描述的开源协议，
+   今后为MiCode社区(www.micode.net) 拥有，并由社区发布和维护。
+
+2. Bug反馈和跟踪，请访问Github,
+   https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open
+
+3. 功能建议和综合讨论，请访问MiCode,
+   http://micode.net/forum.php?mod=forumdisplay&fid=38
+
+
+[English]
+
+1. MiCode Notes is open source edition of XM notepad, it's first initiated and sponsored by MIUI team (www.miui.com).
+   It's opened under license described by NOTICE file. It's owned by the MiCode community (www.micode.net). In future,
+   the MiCode community will release and maintain this project.
+
+2. Regarding issue tracking, please visit Github,
+   https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open
+
+3. Regarding feature request and general discussion, please visit Micode forum,
+   http://micode.net/forum.php?mod=forumdisplay&fid=38

app/build.gradle

@@ -0,0 +1,20 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "25.0.1"
+
+    defaultConfig {
+        applicationId "net.micode.notes"
+        minSdkVersion 14
+        targetSdkVersion 14
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+    android{ useLibrary 'org.apache.http.legacy' }
+}

app/src/main/java/net/micode/notes/data/Contact.java

@@ -25,49 +25,70 @@ import android.util.Log;
 
 import java.util.HashMap;
 
+/**
+ * 联系人信息查询类
+ * 用于根据电话号码从联系人数据库中查询对应的联系人姓名
+ * 包含缓存机制以提高查询效率
+ */
 public class Contact {
+    // 联系人缓存，避免重复查询
     private static HashMap<String, String> sContactCache;
     private static final String TAG = "Contact";
 
+    // 联系人查询SQL条件（使用CALLER_ID匹配规则）
     private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
-    + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
+            + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
-    + " AND " + Data.RAW_CONTACT_ID + " IN "
+            + " AND " + Data.RAW_CONTACT_ID + " IN "
             + "(SELECT raw_contact_id "
             + " FROM phone_lookup"
             + " WHERE min_match = '+')";
 
+    /**
+     * 根据电话号码查询联系人姓名
+     * @param context 应用上下文
+     * @param phoneNumber 待查询的电话号码
+     * @return 联系人姓名，未找到返回null
+     */
     public static String getContact(Context context, String phoneNumber) {
-        if(sContactCache == null) {
+        // 初始化缓存
+        if (sContactCache == null) {
             sContactCache = new HashMap<String, String>();
         }
 
-        if(sContactCache.containsKey(phoneNumber)) {
+        // 检查缓存中是否已有结果
+        if (sContactCache.containsKey(phoneNumber)) {
             return sContactCache.get(phoneNumber);
         }
 
+        // 生成适配CALLER_ID匹配规则的查询条件
         String selection = CALLER_ID_SELECTION.replace("+",
                 PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
+
+        // 查询联系人数据库
         Cursor cursor = context.getContentResolver().query(
-                Data.CONTENT_URI,
+                Data.CONTENT_URI,                  // 数据URI
-                new String [] { Phone.DISPLAY_NAME },
+                new String[] { Phone.DISPLAY_NAME }, // 查询字段（联系人显示名称）
-                selection,
+                selection,                           // 查询条件
-                new String[] { phoneNumber },
+                new String[] { phoneNumber },        // 条件参数
-                null);
+                null);                               // 排序方式
 
         if (cursor != null && cursor.moveToFirst()) {
             try {
+                // 解析查询结果
                 String name = cursor.getString(0);
+                // 缓存查询结果
                 sContactCache.put(phoneNumber, name);
                 return name;
             } catch (IndexOutOfBoundsException e) {
-                Log.e(TAG, " Cursor get string error " + e.toString());
+                Log.e(TAG, "Cursor获取字符串错误: " + e.toString());
                 return null;
             } finally {
+                // 关闭Cursor释放资源
                 cursor.close();
             }
         } else {
-            Log.d(TAG, "No contact matched with number:" + phoneNumber);
+            Log.d(TAG, "未找到匹配电话号码: " + phoneNumber);
             return null;
         }
     }
-}
+}

app/src/main/java/net/micode/notes/data/Notes.java

@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.micode.notes.data;
+
+import android.net.Uri;
+
+/**
+ * 笔记数据模型核心类
+ * 定义笔记、文件夹的数据结构、类型标识及URI访问规范
+ * 包含系统文件夹ID、数据列定义和不同类型笔记的常量
+ */
+public class Notes {
+    public static final String AUTHORITY = "micode_notes";  // 内容提供器权限标识
+    public static final String TAG = "Notes";              // 日志标签
+
+    // 数据类型常量
+    public static final int TYPE_NOTE = 0;       // 普通笔记
+    public static final int TYPE_FOLDER = 1;     // 文件夹
+    public static final int TYPE_SYSTEM = 2;     // 系统对象
+
+    /**
+     * 系统文件夹ID定义
+     * ID_ROOT_FOLDER为默认根文件夹
+     * ID_TEMPARAY_FOLDER为无所属文件夹的临时笔记
+     * ID_CALL_RECORD_FOLDER存储通话记录
+     * ID_TRASH_FOLER为回收站文件夹
+     */
+    public static final int ID_ROOT_FOLDER = 0;
+    public static final int ID_TEMPARAY_FOLDER = -1;
+    public static final int ID_CALL_RECORD_FOLDER = -2;
+    public static final int ID_TRASH_FOLER = -3;
+
+    // 意图传递参数常量
+    public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date";       // 提醒日期
+    public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id";  // 背景颜色ID
+    public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";       // 桌面小部件ID
+    public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type";   // 小部件类型
+    public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";       // 文件夹ID
+    public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date";       // 通话日期
+
+    // 桌面小部件类型常量
+    public static final int TYPE_WIDGET_INVALIDE = -1;  // 无效类型
+    public static final int TYPE_WIDGET_2X = 0;         // 2x1小部件
+    public static final int TYPE_WIDGET_4X = 1;         // 4x1小部件
+
+    public static class DataConstants {
+        public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;        // 文本笔记MIME类型
+        public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;  // 通话笔记MIME类型
+    }
+
+    /**
+     * 笔记内容URI（查询所有笔记和文件夹）
+     */
+    public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
+
+    /**
+     * 附件数据URI（查询笔记附件）
+     */
+    public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
+
+    /**
+     * 笔记基本信息列定义
+     * 包含ID、父子关系、时间戳、内容摘要等字段
+     */
+    public interface NoteColumns {
+        /** 行唯一标识 */
+        public static final String ID = "_id";
+        /** 父节点ID */
+        public static final String PARENT_ID = "parent_id";
+        /** 创建时间戳 */
+        public static final String CREATED_DATE = "created_date";
+        /** 最后修改时间戳 */
+        public static final String MODIFIED_DATE = "modified_date";
+        /** 提醒时间戳 */
+        public static final String ALERTED_DATE = "alert_date";
+        /** 文件夹名称或笔记内容摘要 */
+        public static final String SNIPPET = "snippet";
+        /** 桌面小部件ID */
+        public static final String WIDGET_ID = "widget_id";
+        /** 桌面小部件类型 */
+        public static final String WIDGET_TYPE = "widget_type";
+        /** 背景颜色资源ID */
+        public static final String BG_COLOR_ID = "bg_color_id";
+        /** 是否包含附件 */
+        public static final String HAS_ATTACHMENT = "has_attachment";
+        /** 文件夹内笔记数量 */
+        public static final String NOTES_COUNT = "notes_count";
+        /** 数据类型（笔记/文件夹/系统） */
+        public static final String TYPE = "type";
+        /** 最后同步ID（用于同步标记） */
+        public static final String SYNC_ID = "sync_id";
+        /** 本地修改标记 */
+        public static final String LOCAL_MODIFIED = "local_modified";
+        /** 移动前原始父ID（临时文件夹专用） */
+        public static final String ORIGIN_PARENT_ID = "origin_parent_id";
+        /** Google Tasks同步ID */
+        public static final String GTASK_ID = "gtask_id";
+        /** 数据版本号 */
+        public static final String VERSION = "version";
+    }
+
+    /**
+     * 附件数据列定义
+     * 包含MIME类型、所属笔记ID、通用数据字段
+     */
+    public interface DataColumns {
+        /** 行唯一标识 */
+        public static final String ID = "_id";
+        /** MIME类型（标识附件类型） */
+        public static final String MIME_TYPE = "mime_type";
+        /** 所属笔记ID */
+        public static final String NOTE_ID = "note_id";
+        /** 创建时间戳 */
+        public static final String CREATED_DATE = "created_date";
+        /** 最后修改时间戳 */
+        public static final String MODIFIED_DATE = "modified_date";
+        /** 附件内容 */
+        public static final String CONTENT = "content";
+        /** 通用数据字段1（整型） */
+        public static final String DATA1 = "data1";
+        /** 通用数据字段2（整型） */
+        public static final String DATA2 = "data2";
+        /** 通用数据字段3（文本） */
+        public static final String DATA3 = "data3";
+        /** 通用数据字段4（文本） */
+        public static final String DATA4 = "data4";
+        /** 通用数据字段5（文本） */
+        public static final String DATA5 = "data5";
+    }
+
+    /**
+     * 文本笔记定义
+     * 继承DataColumns，增加清单模式标识
+     */
+    public static final class TextNote implements DataColumns {
+        /** 清单模式标识（1为清单模式，0为普通模式） */
+        public static final String MODE = DATA1;
+        public static final int MODE_CHECK_LIST = 1;        // 清单模式常量
+
+        /** 文本笔记MIME类型定义 */
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
+        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
+    }
+
+    /**
+     * 通话笔记定义
+     * 继承DataColumns，增加通话日期和电话号码字段
+     */
+    public static final class CallNote implements DataColumns {
+        /** 通话时间戳 */
+        public static final String CALL_DATE = DATA1;
+        /** 电话号码 */
+        public static final String PHONE_NUMBER = DATA3;
+
+        /** 通话笔记MIME类型定义 */
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
+        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
+    }
+}

app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java

@@ -77,8 +77,9 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
                     NotesListActivity.class), 0);
         }
-        notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
+//        notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
-                pendingIntent);
+//                pendingIntent);
+        notification.contentIntent = pendingIntent;
         mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
     }
 

app/src/main/java/net/micode/notes/ui/NoteEditActivity.java

@@ -870,4 +870,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private void showToast(int resId, int duration) {
         Toast.makeText(this, resId, duration).show();
     }
+    
+
+    public void OnOpenMenu(View view) {
+		openOptionsMenu();
+	}
 }

app/src/main/java/net/micode/notes/ui/NotesListActivity.java

@@ -16,6 +16,7 @@
 
 package net.micode.notes.ui;
 
+import android.R.menu;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -59,7 +60,6 @@ import android.widget.ListView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
@@ -104,6 +104,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     private ListView mNotesListView;
 
     private Button mAddNewNote;
+    private Button mMenuSet;
 
     private boolean mDispatch;
 
@@ -223,6 +224,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         mAddNewNote = (Button) findViewById(R.id.btn_new_note);
         mAddNewNote.setOnClickListener(this);
         mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());
+        mMenuSet = (Button) findViewById(R.id.btn_set);
         mDispatch = false;
         mDispatchY = 0;
         mOriginY = 0;
@@ -234,10 +236,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
         private DropdownMenu mDropDownMenu;
         private ActionMode mActionMode;
+        private Menu menu;
         private MenuItem mMoveMenu;
 
         public boolean onCreateActionMode(ActionMode mode, Menu menu) {
             getMenuInflater().inflate(R.menu.note_list_options, menu);
+            this.menu = menu;
             menu.findItem(R.id.delete).setOnMenuItemClickListener(this);
             mMoveMenu = menu.findItem(R.id.move);
             if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
@@ -251,6 +255,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             mNotesListAdapter.setChoiceMode(true);
             mNotesListView.setLongClickable(false);
             mAddNewNote.setVisibility(View.GONE);
+            mMenuSet.setVisibility(View.GONE);
 
             View customView = LayoutInflater.from(NotesListActivity.this).inflate(
                     R.layout.note_list_dropdown_menu, null);
@@ -298,13 +303,36 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
         public void onDestroyActionMode(ActionMode mode) {
             mNotesListAdapter.setChoiceMode(false);
+            mNotesListView.clearChoices();
+            mNotesListView.setItemChecked(0,true);
+            mNotesListView.setItemChecked(0,false);
+            
             mNotesListView.setLongClickable(true);
+            System.out.println("-----------------onDestroyActionMode------------------");
+            mNotesListAdapter.notifyDataSetChanged();
+//            closeOptionsMenu();
+//            mNotesListView.invalidate();
             mAddNewNote.setVisibility(View.VISIBLE);
-        }
+            mMenuSet.setVisibility(View.VISIBLE);
+            
+            
+            
+//            mNotesListView.setChoiceMode(ListView.CHOICE_MODE_NONE);
+            
+//            menu.clear();
+//            menu.close();
+        }
+        
+        
 
         public void finishActionMode() {
             mActionMode.finish();
+            mActionMode = null;
+            mNotesListAdapter.setChoiceMode(false);
+            mNotesListView.setLongClickable(true);
         }
+        
+        
 
         public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
                 boolean checked) {
@@ -345,6 +373,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             return true;
         }
     }
+    
 
     private class NewNoteOnTouchListener implements OnTouchListener {
 
@@ -546,6 +575,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
             mState = ListEditState.CALL_RECORD_FOLDER;
             mAddNewNote.setVisibility(View.GONE);
+            mMenuSet.setVisibility(View.GONE);
         } else {
             mState = ListEditState.SUB_FOLDER;
         }
@@ -666,6 +696,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     @Override
     public void onBackPressed() {
+
+    	System.out.println("-------onBackPressed---00000");
         switch (mState) {
             case SUB_FOLDER:
                 mCurrentFolderId = Notes.ID_ROOT_FOLDER;
@@ -677,10 +709,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 mCurrentFolderId = Notes.ID_ROOT_FOLDER;
                 mState = ListEditState.NOTE_LIST;
                 mAddNewNote.setVisibility(View.VISIBLE);
+                mMenuSet.setVisibility(View.VISIBLE);
                 mTitleBar.setVisibility(View.GONE);
                 startAsyncNotesListQuery();
                 break;
             case NOTE_LIST:
+            	System.out.println("-------onBackPressed---");
                 super.onBackPressed();
                 break;
             default:
@@ -951,4 +985,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
         return false;
     }
+    
+    public void OnOpenMenu(View view) {
+		openOptionsMenu();
+	}
 }

app/src/main/res/color/primary_text_dark.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
 

app/src/main/res/color/secondary_text_dark.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)