n

src/app/src/main/AndroidManifest.xml

@@ -20,11 +20,17 @@
     android:versionCode="1"
     android:versionName="0.1" >
 
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> origin/Branch_liujie
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+<<<<<<< HEAD
     <uses-permission android:name="andro id.permission.AUTHENTICATE_ACCOUNTS" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@ -34,6 +40,12 @@
     <!-- 精确的位置权限 -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+=======
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+>>>>>>> origin/Branch_liujie
 
     <application
         android:icon="@drawable/icon_app"
@@ -43,8 +55,13 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
+<<<<<<< HEAD
             android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:uiOptions="splitActionBarWhenNarrow"
+=======
+            android:theme="@style/NoteTheme"
+
+>>>>>>> origin/Branch_liujie
             android:windowSoftInputMode="adjustPan" >
 
             <intent-filter>
@@ -57,7 +74,11 @@
             android:name=".ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
+<<<<<<< HEAD
             android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
+=======
+            android:theme="@style/NoteTheme" >
+>>>>>>> origin/Branch_liujie
 
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

src/app/src/main/AndroidManifest.xml.orig

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.micode.notes"
+    android:versionCode="1"
+    android:versionName="0.1" >
+
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> origin/Branch_liujie
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+<<<<<<< HEAD
+    <uses-permission android:name="andro id.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <!-- 粗略的位置权限 -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
+    <!-- 精确的位置权限 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
+    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+=======
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+>>>>>>> origin/Branch_liujie
+
+    <application
+        android:icon="@drawable/icon_app"
+        android:label="@string/app_name" >
+        <activity
+            android:name=".ui.NotesListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+<<<<<<< HEAD
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+            android:uiOptions="splitActionBarWhenNarrow"
+=======
+            android:theme="@style/NoteTheme"
+
+>>>>>>> origin/Branch_liujie
+            android:windowSoftInputMode="adjustPan" >
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ui.NoteEditActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTop"
+<<<<<<< HEAD
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
+=======
+            android:theme="@style/NoteTheme" >
+>>>>>>> origin/Branch_liujie
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.item/text_note" />
+                <data android:mimeType="vnd.android.cursor.item/call_note" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.item/text_note" />
+                <data android:mimeType="vnd.android.cursor.item/call_note" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
+        </activity>
+
+        <provider
+            android:name="net.micode.notes.data.NotesProvider"
+            android:authorities="micode_notes"
+            android:multiprocess="true" />
+
+        <receiver
+            android:name=".widget.NoteWidgetProvider_2x"
+            android:label="@string/app_widget2x2" >
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_2x_info" />
+        </receiver>
+        <receiver
+            android:name=".widget.NoteWidgetProvider_4x"
+            android:label="@string/app_widget4x4" >
+
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_4x_info" />
+        </receiver>
+
+        <receiver android:name=".ui.AlarmInitReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
+        <receiver
+            android:name="net.micode.notes.ui.AlarmReceiver"
+            android:process=":remote" >
+        </receiver>
+
+        <activity
+            android:name=".ui.AlarmAlertActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleInstance"
+            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+        </activity>
+
+        <activity
+            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+            android:label="@string/preferences_title"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Holo.Light" >
+        </activity>
+
+        <service
+            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+            android:exported="false" >
+        </service>
+
+        <meta-data
+            android:name="android.app.default_searchable"
+            android:value=".ui.NoteEditActivity" />
+    </application>
+</manifest>

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

@@ -166,7 +166,12 @@ public class Notes {
          */
         public static final String VERSION = "version";
 
+<<<<<<< HEAD
         public static final String TOP = "top";
+=======
+
+        String PASSWORD = "";
+>>>>>>> origin/Branch_liujie
     }
 
     public interface DataColumns {

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

@@ -0,0 +1,286 @@
+/*
+ * 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;
+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;
+
+    /**
+     * Following IDs are system folders' identifiers
+     * {@link Notes#ID_ROOT_FOLDER } is default folder
+     * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
+     * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
+     */
+    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";
+    public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_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";
+    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;
+    public static final int TYPE_WIDGET_4X            = 1;
+
+    public static class DataConstants {
+        public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
+        public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
+    }
+
+    /**
+     * Uri to query all notes and folders
+     */
+    public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
+
+    /**
+     * Uri to query data
+     */
+    public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
+
+    public interface NoteColumns {
+        /**
+         * The unique ID for a row
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String ID = "_id";
+
+        /**
+         * The parent's id for note or folder
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String PARENT_ID = "parent_id";
+
+        /**
+         * Created data for note or folder
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String CREATED_DATE = "created_date";
+
+        /**
+         * Latest modified date
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String MODIFIED_DATE = "modified_date";
+
+
+        /**
+         * Alert date
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String ALERTED_DATE = "alert_date";
+
+        /**
+         * Folder's name or text content of note
+         * <P> Type: TEXT </P>
+         */
+        public static final String SNIPPET = "snippet";
+
+        /**
+         * Note's widget id
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String WIDGET_ID = "widget_id";
+
+        /**
+         * Note's widget type
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String WIDGET_TYPE = "widget_type";
+
+        /**
+         * Note's background color's id
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String BG_COLOR_ID = "bg_color_id";
+
+        /**
+         * For text note, it doesn't has attachment, for multi-media
+         * note, it has at least one attachment
+         * <P> Type: INTEGER </P>
+         */
+        public static final String HAS_ATTACHMENT = "has_attachment";
+
+        /**
+         * Folder's count of notes
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String NOTES_COUNT = "notes_count";
+
+        /**
+         * The file type: folder or note
+         * <P> Type: INTEGER </P>
+         */
+        public static final String TYPE = "type";
+
+        /**
+         * The last sync id
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String SYNC_ID = "sync_id";
+
+        /**
+         * Sign to indicate local modified or not
+         * <P> Type: INTEGER </P>
+         */
+        public static final String LOCAL_MODIFIED = "local_modified";
+
+        /**
+         * Original parent id before moving into temporary folder
+         * <P> Type : INTEGER </P>
+         */
+        public static final String ORIGIN_PARENT_ID = "origin_parent_id";
+
+        /**
+         * The gtask id
+         * <P> Type : TEXT </P>
+         */
+        public static final String GTASK_ID = "gtask_id";
+
+        /**
+         * The version code
+         * <P> Type : INTEGER (long) </P>
+         */
+        public static final String VERSION = "version";
+
+<<<<<<< HEAD
+        public static final String TOP = "top";
+=======
+
+        String PASSWORD = "";
+>>>>>>> origin/Branch_liujie
+    }
+
+    public interface DataColumns {
+        /**
+         * The unique ID for a row
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String ID = "_id";
+
+        /**
+         * The MIME type of the item represented by this row.
+         * <P> Type: Text </P>
+         */
+        public static final String MIME_TYPE = "mime_type";
+
+        /**
+         * The reference id to note that this data belongs to
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String NOTE_ID = "note_id";
+
+        /**
+         * Created data for note or folder
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String CREATED_DATE = "created_date";
+
+        /**
+         * Latest modified date
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String MODIFIED_DATE = "modified_date";
+
+        /**
+         * Data's content
+         * <P> Type: TEXT </P>
+         */
+        public static final String CONTENT = "content";
+
+
+        /**
+         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+         * integer data type
+         * <P> Type: INTEGER </P>
+         */
+        public static final String DATA1 = "data1";
+
+        /**
+         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+         * integer data type
+         * <P> Type: INTEGER </P>
+         */
+        public static final String DATA2 = "data2";
+
+        /**
+         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+         * TEXT data type
+         * <P> Type: TEXT </P>
+         */
+        public static final String DATA3 = "data3";
+
+        /**
+         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+         * TEXT data type
+         * <P> Type: TEXT </P>
+         */
+        public static final String DATA4 = "data4";
+
+        /**
+         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+         * TEXT data type
+         * <P> Type: TEXT </P>
+         */
+        public static final String DATA5 = "data5";
+    }
+
+    public static final class TextNote implements DataColumns {
+        /**
+         * Mode to indicate the text in check list mode or not
+         * <P> Type: Integer 1:check list mode 0: normal mode </P>
+         */
+        public static final String MODE = DATA1;
+
+        public static final int MODE_CHECK_LIST = 1;
+
+        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");
+    }
+
+    public static final class CallNote implements DataColumns {
+        /**
+         * Call date for this record
+         * <P> Type: INTEGER (long) </P>
+         */
+        public static final String CALL_DATE = DATA1;
+
+        /**
+         * Phone number for this record
+         * <P> Type: TEXT </P>
+         */
+        public static final String PHONE_NUMBER = DATA3;
+
+        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");
+    }
+}

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

@@ -59,11 +59,19 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
+<<<<<<< HEAD
             NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT 1," +
             NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.TOP + " INTEGER NOT NULL DEFAULT 0" +
         ")";
 
+=======
+            NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
+            NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
+        ")";
+
+
+>>>>>>> origin/Branch_liujie
     private static final String CREATE_DATA_TABLE_SQL =
         "CREATE TABLE " + TABLE.DATA + "(" +
             DataColumns.ID + " INTEGER PRIMARY KEY," +
@@ -323,10 +331,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             oldVersion++;
         }
 
+<<<<<<< HEAD
         if (oldVersion == 4) {
             upgradeToV5(db);
             oldVersion++;
         }
+=======
+>>>>>>> origin/Branch_liujie
 
         if (reCreateTriggers) {
             reCreateNoteTableTriggers(db);
@@ -339,6 +350,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         }
     }
 
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> origin/Branch_liujie
     private void upgradeToV2(SQLiteDatabase db) {
         db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
         db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
@@ -365,10 +381,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
                 + " INTEGER NOT NULL DEFAULT 0");
     }
+<<<<<<< HEAD
 
     private void upgradeToV5(SQLiteDatabase db) {
         db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.TOP
                 + " INTEGER NOT NULL DEFAULT 0");
     }
 
+=======
+>>>>>>> origin/Branch_liujie
 }

src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java.orig

@@ -0,0 +1,393 @@
+/*
+ * 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.content.ContentValues;
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.DataConstants;
+import net.micode.notes.data.Notes.NoteColumns;
+
+
+public class NotesDatabaseHelper extends SQLiteOpenHelper {
+    private static final String DB_NAME = "note.db";
+
+    private static final int DB_VERSION = 4;
+
+    public interface TABLE {
+        public static final String NOTE = "note";
+
+        public static final String DATA = "data";
+    }
+
+    private static final String TAG = "NotesDatabaseHelper";
+
+    private static NotesDatabaseHelper mInstance;
+
+    private static final String CREATE_NOTE_TABLE_SQL =
+        "CREATE TABLE " + TABLE.NOTE + "(" +
+            NoteColumns.ID + " INTEGER PRIMARY KEY," +
+            NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+            NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+            NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +
+            NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +
+            NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
+<<<<<<< HEAD
+            NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT 1," +
+            NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.TOP + " INTEGER NOT NULL DEFAULT 0" +
+        ")";
+
+=======
+            NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
+            NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
+        ")";
+
+
+>>>>>>> origin/Branch_liujie
+    private static final String CREATE_DATA_TABLE_SQL =
+        "CREATE TABLE " + TABLE.DATA + "(" +
+            DataColumns.ID + " INTEGER PRIMARY KEY," +
+            DataColumns.MIME_TYPE + " TEXT NOT NULL," +
+            DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+            NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+            DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +
+            DataColumns.DATA1 + " INTEGER," +
+            DataColumns.DATA2 + " INTEGER," +
+            DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
+            DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
+            DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
+        ")";
+
+    private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
+        "CREATE INDEX IF NOT EXISTS note_id_index ON " +
+        TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
+
+    /**
+     * Increase folder's note count when move note to the folder
+     */
+    private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
+        "CREATE TRIGGER increase_folder_count_on_update "+
+        " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
+        " BEGIN " +
+        "  UPDATE " + TABLE.NOTE +
+        "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
+        "  WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
+        " END";
+
+    /**
+     * Decrease folder's note count when move note from folder
+     */
+    private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
+        "CREATE TRIGGER decrease_folder_count_on_update " +
+        " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
+        " BEGIN " +
+        "  UPDATE " + TABLE.NOTE +
+        "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
+        "  WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
+        "  AND " + NoteColumns.NOTES_COUNT + ">0" + ";" +
+        " END";
+
+    /**
+     * Increase folder's note count when insert new note to the folder
+     */
+    private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
+        "CREATE TRIGGER increase_folder_count_on_insert " +
+        " AFTER INSERT ON " + TABLE.NOTE +
+        " BEGIN " +
+        "  UPDATE " + TABLE.NOTE +
+        "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
+        "  WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
+        " END";
+
+    /**
+     * Decrease folder's note count when delete note from the folder
+     */
+    private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
+        "CREATE TRIGGER decrease_folder_count_on_delete " +
+        " AFTER DELETE ON " + TABLE.NOTE +
+        " BEGIN " +
+        "  UPDATE " + TABLE.NOTE +
+        "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
+        "  WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
+        "  AND " + NoteColumns.NOTES_COUNT + ">0;" +
+        " END";
+
+    /**
+     * Update note's content when insert data with type {@link DataConstants#NOTE}
+     */
+    private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
+        "CREATE TRIGGER update_note_content_on_insert " +
+        " AFTER INSERT ON " + TABLE.DATA +
+        " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
+        " BEGIN" +
+        "  UPDATE " + TABLE.NOTE +
+        "   SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
+        "  WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
+        " END";
+
+    /**
+     * Update note's content when data with {@link DataConstants#NOTE} type has changed
+     */
+    private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
+        "CREATE TRIGGER update_note_content_on_update " +
+        " AFTER UPDATE ON " + TABLE.DATA +
+        " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
+        " BEGIN" +
+        "  UPDATE " + TABLE.NOTE +
+        "   SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
+        "  WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
+        " END";
+
+    /**
+     * Update note's content when data with {@link DataConstants#NOTE} type has deleted
+     */
+    private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
+        "CREATE TRIGGER update_note_content_on_delete " +
+        " AFTER delete ON " + TABLE.DATA +
+        " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
+        " BEGIN" +
+        "  UPDATE " + TABLE.NOTE +
+        "   SET " + NoteColumns.SNIPPET + "=''" +
+        "  WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" +
+        " END";
+
+    /**
+     * Delete datas belong to note which has been deleted
+     */
+    private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
+        "CREATE TRIGGER delete_data_on_delete " +
+        " AFTER DELETE ON " + TABLE.NOTE +
+        " BEGIN" +
+        "  DELETE FROM " + TABLE.DATA +
+        "   WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
+        " END";
+
+    /**
+     * Delete notes belong to folder which has been deleted
+     */
+    private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
+        "CREATE TRIGGER folder_delete_notes_on_delete " +
+        " AFTER DELETE ON " + TABLE.NOTE +
+        " BEGIN" +
+        "  DELETE FROM " + TABLE.NOTE +
+        "   WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
+        " END";
+
+    /**
+     * Move notes belong to folder which has been moved to trash folder
+     */
+    private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
+        "CREATE TRIGGER folder_move_notes_on_trash " +
+        " AFTER UPDATE ON " + TABLE.NOTE +
+        " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
+        " BEGIN" +
+        "  UPDATE " + TABLE.NOTE +
+        "   SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
+        "  WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
+        " END";
+
+    public NotesDatabaseHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+    }
+
+    public void createNoteTable(SQLiteDatabase db) {
+        db.execSQL(CREATE_NOTE_TABLE_SQL);
+        reCreateNoteTableTriggers(db);
+        createSystemFolder(db);
+        Log.d(TAG, "note table has been created");
+    }
+
+    private void reCreateNoteTableTriggers(SQLiteDatabase db) {
+        db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
+        db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update");
+        db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete");
+        db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete");
+        db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert");
+        db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete");
+        db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash");
+
+        db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
+        db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
+        db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER);
+        db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER);
+        db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER);
+        db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);
+        db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
+    }
+
+    private void createSystemFolder(SQLiteDatabase db) {
+        ContentValues values = new ContentValues();
+
+        /**
+         * call record foler for call notes
+         */
+        values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
+        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+        db.insert(TABLE.NOTE, null, values);
+
+        /**
+         * root folder which is default folder
+         */
+        values.clear();
+        values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
+        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+        db.insert(TABLE.NOTE, null, values);
+
+        /**
+         * temporary folder which is used for moving note
+         */
+        values.clear();
+        values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
+        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+        db.insert(TABLE.NOTE, null, values);
+
+        /**
+         * create trash folder
+         */
+        values.clear();
+        values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
+        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+        db.insert(TABLE.NOTE, null, values);
+    }
+
+    public void createDataTable(SQLiteDatabase db) {
+        db.execSQL(CREATE_DATA_TABLE_SQL);
+        reCreateDataTableTriggers(db);
+        db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
+        Log.d(TAG, "data table has been created");
+    }
+
+    private void reCreateDataTableTriggers(SQLiteDatabase db) {
+        db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
+        db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
+        db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete");
+
+        db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER);
+        db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER);
+        db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
+    }
+
+    static synchronized NotesDatabaseHelper getInstance(Context context) {
+        if (mInstance == null) {
+            mInstance = new NotesDatabaseHelper(context);
+        }
+        return mInstance;
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        createNoteTable(db);
+        createDataTable(db);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        boolean reCreateTriggers = false;
+        boolean skipV2 = false;
+
+        if (oldVersion == 1) {
+            upgradeToV2(db);
+            skipV2 = true; // this upgrade including the upgrade from v2 to v3
+            oldVersion++;
+        }
+
+        if (oldVersion == 2 && !skipV2) {
+            upgradeToV3(db);
+            reCreateTriggers = true;
+            oldVersion++;
+        }
+
+        if (oldVersion == 3) {
+            upgradeToV4(db);
+            oldVersion++;
+        }
+
+<<<<<<< HEAD
+        if (oldVersion == 4) {
+            upgradeToV5(db);
+            oldVersion++;
+        }
+=======
+>>>>>>> origin/Branch_liujie
+
+        if (reCreateTriggers) {
+            reCreateNoteTableTriggers(db);
+            reCreateDataTableTriggers(db);
+        }
+
+        if (oldVersion != newVersion) {
+            throw new IllegalStateException("Upgrade notes database to version " + newVersion
+                    + "fails");
+        }
+    }
+
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> origin/Branch_liujie
+    private void upgradeToV2(SQLiteDatabase db) {
+        db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
+        db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
+        createNoteTable(db);
+        createDataTable(db);
+    }
+
+    private void upgradeToV3(SQLiteDatabase db) {
+        // drop unused triggers
+        db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
+        db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete");
+        db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update");
+        // add a column for gtask id
+        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
+                + " TEXT NOT NULL DEFAULT ''");
+        // add a trash system folder
+        ContentValues values = new ContentValues();
+        values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
+        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+        db.insert(TABLE.NOTE, null, values);
+    }
+
+    private void upgradeToV4(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+                + " INTEGER NOT NULL DEFAULT 0");
+    }
+<<<<<<< HEAD
+
+    private void upgradeToV5(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.TOP
+                + " INTEGER NOT NULL DEFAULT 0");
+    }
+
+=======
+>>>>>>> origin/Branch_liujie
+}

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

@@ -33,18 +33,25 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes.DataColumns;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.data.NotesDatabaseHelper.TABLE;
+<<<<<<< HEAD
 import net.micode.notes.gtask.data.SqlNote;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.Iterator;
+=======
+>>>>>>> origin/Branch_liujie
 
 
 public class NotesProvider extends ContentProvider {
     private static final UriMatcher mMatcher;
 
+<<<<<<< HEAD
     private static NotesDatabaseHelper mHelper;
+=======
+    private NotesDatabaseHelper mHelper;
+>>>>>>> origin/Branch_liujie
 
     private static final String TAG = "NotesProvider";
 
@@ -308,6 +315,7 @@ public class NotesProvider extends ContentProvider {
         return null;
     }
 
+<<<<<<< HEAD
 
 
 
@@ -451,4 +459,6 @@ public class NotesProvider extends ContentProvider {
             db.execSQL(sql,bindArgs);
         }
     }
+=======
+>>>>>>> origin/Branch_liujie
 }

src/app/src/main/java/net/micode/notes/data/NotesProvider.java.orig

@@ -0,0 +1,464 @@
+/*
+ * 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.app.SearchManager;
+import android.content.ContentProvider;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.NotesDatabaseHelper.TABLE;
+<<<<<<< HEAD
+import net.micode.notes.gtask.data.SqlNote;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Iterator;
+=======
+>>>>>>> origin/Branch_liujie
+
+
+public class NotesProvider extends ContentProvider {
+    private static final UriMatcher mMatcher;
+
+<<<<<<< HEAD
+    private static NotesDatabaseHelper mHelper;
+=======
+    private NotesDatabaseHelper mHelper;
+>>>>>>> origin/Branch_liujie
+
+    private static final String TAG = "NotesProvider";
+
+    private static final int URI_NOTE            = 1;
+    private static final int URI_NOTE_ITEM       = 2;
+    private static final int URI_DATA            = 3;
+    private static final int URI_DATA_ITEM       = 4;
+
+    private static final int URI_SEARCH          = 5;
+    private static final int URI_SEARCH_SUGGEST  = 6;
+
+    static {
+        mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
+        mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM);
+        mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA);
+        mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM);
+        mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH);
+        mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST);
+        mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST);
+    }
+
+    /**
+     * x'0A' represents the '\n' character in sqlite. For title and content in the search result,
+     * we will trim '\n' and white space in order to show more information.
+     */
+    private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","
+        + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
+        + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + ","
+        + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + ","
+        + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + ","
+        + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
+        + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
+
+    private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
+        + " FROM " + TABLE.NOTE
+        + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
+        + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
+        + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
+
+    @Override
+    public boolean onCreate() {
+        mHelper = NotesDatabaseHelper.getInstance(getContext());
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        Cursor c = null;
+        SQLiteDatabase db = mHelper.getReadableDatabase();
+        String id = null;
+        switch (mMatcher.match(uri)) {
+            case URI_NOTE:
+                c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
+                        sortOrder);
+                break;
+            case URI_NOTE_ITEM:
+                id = uri.getPathSegments().get(1);
+                c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id
+                        + parseSelection(selection), selectionArgs, null, null, sortOrder);
+                break;
+            case URI_DATA:
+                c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
+                        sortOrder);
+                break;
+            case URI_DATA_ITEM:
+                id = uri.getPathSegments().get(1);
+                c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
+                        + parseSelection(selection), selectionArgs, null, null, sortOrder);
+                break;
+            case URI_SEARCH:
+            case URI_SEARCH_SUGGEST:
+                if (sortOrder != null || projection != null) {
+                    throw new IllegalArgumentException(
+                            "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");
+                }
+
+                String searchString = null;
+                if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) {
+                    if (uri.getPathSegments().size() > 1) {
+                        searchString = uri.getPathSegments().get(1);
+                    }
+                } else {
+                    searchString = uri.getQueryParameter("pattern");
+                }
+
+                if (TextUtils.isEmpty(searchString)) {
+                    return null;
+                }
+
+                try {
+                    searchString = String.format("%%%s%%", searchString);
+                    c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY,
+                            new String[] { searchString });
+                } catch (IllegalStateException ex) {
+                    Log.e(TAG, "got exception: " + ex.toString());
+                }
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown URI " + uri);
+        }
+        if (c != null) {
+            c.setNotificationUri(getContext().getContentResolver(), uri);
+        }
+        return c;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        SQLiteDatabase db = mHelper.getWritableDatabase();
+        long dataId = 0, noteId = 0, insertedId = 0;
+        switch (mMatcher.match(uri)) {
+            case URI_NOTE:
+                insertedId = noteId = db.insert(TABLE.NOTE, null, values);
+                break;
+            case URI_DATA:
+                if (values.containsKey(DataColumns.NOTE_ID)) {
+                    noteId = values.getAsLong(DataColumns.NOTE_ID);
+                } else {
+                    Log.d(TAG, "Wrong data format without note id:" + values.toString());
+                }
+                insertedId = dataId = db.insert(TABLE.DATA, null, values);
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown URI " + uri);
+        }
+        // Notify the note uri
+        if (noteId > 0) {
+            getContext().getContentResolver().notifyChange(
+                    ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
+        }
+
+        // Notify the data uri
+        if (dataId > 0) {
+            getContext().getContentResolver().notifyChange(
+                    ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
+        }
+
+        return ContentUris.withAppendedId(uri, insertedId);
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        int count = 0;
+        String id = null;
+        SQLiteDatabase db = mHelper.getWritableDatabase();
+        boolean deleteData = false;
+        switch (mMatcher.match(uri)) {
+            case URI_NOTE:
+                selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 ";
+                count = db.delete(TABLE.NOTE, selection, selectionArgs);
+                break;
+            case URI_NOTE_ITEM:
+                id = uri.getPathSegments().get(1);
+                /**
+                 * ID that smaller than 0 is system folder which is not allowed to
+                 * trash
+                 */
+                long noteId = Long.valueOf(id);
+                if (noteId <= 0) {
+                    break;
+                }
+                count = db.delete(TABLE.NOTE,
+                        NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
+                break;
+            case URI_DATA:
+                count = db.delete(TABLE.DATA, selection, selectionArgs);
+                deleteData = true;
+                break;
+            case URI_DATA_ITEM:
+                id = uri.getPathSegments().get(1);
+                count = db.delete(TABLE.DATA,
+                        DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
+                deleteData = true;
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown URI " + uri);
+        }
+        if (count > 0) {
+            if (deleteData) {
+                getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
+            }
+            getContext().getContentResolver().notifyChange(uri, null);
+        }
+        return count;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        int count = 0;
+        String id = null;
+        SQLiteDatabase db = mHelper.getWritableDatabase();
+        boolean updateData = false;
+        switch (mMatcher.match(uri)) {
+            case URI_NOTE:
+                increaseNoteVersion(-1, selection, selectionArgs);
+                count = db.update(TABLE.NOTE, values, selection, selectionArgs);
+                break;
+            case URI_NOTE_ITEM:
+                id = uri.getPathSegments().get(1);
+                increaseNoteVersion(Long.valueOf(id), selection, selectionArgs);
+                count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id
+                        + parseSelection(selection), selectionArgs);
+                break;
+            case URI_DATA:
+                count = db.update(TABLE.DATA, values, selection, selectionArgs);
+                updateData = true;
+                break;
+            case URI_DATA_ITEM:
+                id = uri.getPathSegments().get(1);
+                count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id
+                        + parseSelection(selection), selectionArgs);
+                updateData = true;
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown URI " + uri);
+        }
+
+        if (count > 0) {
+            if (updateData) {
+                getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
+            }
+            getContext().getContentResolver().notifyChange(uri, null);
+        }
+        return count;
+    }
+
+    private String parseSelection(String selection) {
+        return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
+    }
+
+    private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
+        StringBuilder sql = new StringBuilder(120);
+        sql.append("UPDATE ");
+        sql.append(TABLE.NOTE);
+        sql.append(" SET ");
+        sql.append(NoteColumns.VERSION);
+        sql.append("=" + NoteColumns.VERSION + "+1 ");
+
+        if (id > 0 || !TextUtils.isEmpty(selection)) {
+            sql.append(" WHERE ");
+        }
+        if (id > 0) {
+            sql.append(NoteColumns.ID + "=" + String.valueOf(id));
+        }
+        if (!TextUtils.isEmpty(selection)) {
+            String selectString = id > 0 ? parseSelection(selection) : selection;
+            for (String args : selectionArgs) {
+                selectString = selectString.replaceFirst("\\?", args);
+            }
+            sql.append(selectString);
+        }
+
+        mHelper.getWritableDatabase().execSQL(sql.toString());
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+<<<<<<< HEAD
+
+
+
+    public static JSONObject uploadnote()throws JSONException {
+        JSONObject js = new JSONObject();
+        SQLiteDatabase db;
+        db = mHelper.getReadableDatabase();
+        Cursor cursor = null;
+        cursor = db.query(NotesDatabaseHelper.TABLE.NOTE,
+                null, null, null, null, null, null);
+        //判断游标是否为空
+        if (cursor.moveToFirst()) {
+            for (int index = 1; index <= cursor.getCount(); index++) {
+                JSONObject note = new JSONObject();
+                note.put(NoteColumns.PARENT_ID,cursor.getString(1));
+                note.put(NoteColumns.ALERTED_DATE,cursor.getString(2));
+                note.put(NoteColumns.BG_COLOR_ID,cursor.getString(3));
+                note.put(NoteColumns.CREATED_DATE,cursor.getString(4));
+                note.put(NoteColumns.HAS_ATTACHMENT,cursor.getString(5));
+                note.put(NoteColumns.MODIFIED_DATE,cursor.getString(6));
+                note.put(NoteColumns.NOTES_COUNT,cursor.getString(7));
+                note.put(NoteColumns.SNIPPET,cursor.getString(8));
+                note.put(NoteColumns.TYPE,cursor.getString(9));
+                note.put(NoteColumns.WIDGET_ID,cursor.getString(10));
+                note.put(NoteColumns.WIDGET_TYPE,cursor.getString(11));
+                note.put(NoteColumns.SYNC_ID,cursor.getString(12));
+                note.put(NoteColumns.LOCAL_MODIFIED,cursor.getString(13));
+                note.put(NoteColumns.ORIGIN_PARENT_ID,cursor.getString(14));
+                note.put(NoteColumns.GTASK_ID,cursor.getString(15));
+                note.put(NoteColumns.VERSION,cursor.getString(16));
+                note.put(NoteColumns.TOP,cursor.getString(17));
+                js.put(cursor.getString(0),note);
+                if(!cursor.isLast()){
+                    cursor.moveToNext();
+                }
+            }
+        }
+        System.out.println(js);
+        return js;
+    }
+    public static JSONObject uploaddata()throws JSONException {
+        JSONObject js = new JSONObject();
+        SQLiteDatabase db;
+        db = mHelper.getReadableDatabase();
+        Cursor cursor = null;
+        cursor = db.query(NotesDatabaseHelper.TABLE.DATA,
+                null, null, null, null, null, null);
+        //判断游标是否为空
+        if (cursor.moveToFirst()) {
+            for (int index = 1; index <= cursor.getCount(); index++) {
+
+                JSONObject data = new JSONObject();
+                data.put(DataColumns.MIME_TYPE,cursor.getString(1));
+                data.put(DataColumns.NOTE_ID,cursor.getString(2));
+                data.put(DataColumns.CREATED_DATE,cursor.getString(3));
+                data.put(DataColumns.MODIFIED_DATE,cursor.getString(4));
+                data.put(DataColumns.CONTENT,cursor.getString(5));
+                data.put(DataColumns.DATA1,cursor.getString(6));
+                data.put(DataColumns.DATA2,cursor.getString(7));
+                data.put(DataColumns.DATA3,cursor.getString(8));
+                data.put(DataColumns.DATA4,cursor.getString(9));
+                data.put(DataColumns.DATA5,cursor.getString(10));
+                js.put(cursor.getString(0),data);
+                if(!cursor.isLast()){
+                    cursor.moveToNext();
+                }
+            }
+        }
+        System.out.println(js);
+        return js;
+    }
+
+    public static void syncTABLE(JSONObject JSONInfo) throws JSONException {
+        SQLiteDatabase db;
+        db = mHelper.getReadableDatabase();
+        String sql;
+        JSONObject NOTE = null;
+        JSONObject DATA = null;
+        try {
+            NOTE = (JSONObject) JSONInfo.get("NOTE");
+            DATA = (JSONObject) JSONInfo.get("DATA");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        sql = "DELETE FROM" + " " + TABLE.NOTE;
+        db.execSQL(sql);
+
+        assert NOTE != null;
+        Iterator<String> NOTEKeys = NOTE.keys();
+        while (NOTEKeys.hasNext()){
+            String NOTEKey = NOTEKeys.next();
+            JSONObject NOTEInfo = (JSONObject) NOTE.get(NOTEKey);
+            sql = "INSERT INTO note(_id,parent_id,alert_date,bg_color_id,created_date,has_attachment,modified_date," +
+                    "notes_count,snippet,type,widget_id,widget_type,sync_id,local_modified,origin_parent_id,gtask_id," +
+                    "version,top,star,passcode) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+            Object bindArgs[] = new Object[] {
+                    NOTEKey,
+                    NOTEInfo.getString("parent_id"),
+                    NOTEInfo.getString("alert_date"),
+                    NOTEInfo.getString("bg_color_id"),
+                    NOTEInfo.getString("created_date"),
+                    NOTEInfo.getString("has_attachment"),
+                    NOTEInfo.getString("modified_date"),
+                    "0",//NOTEInfo.getString("notes_count")
+                    "0",
+                    NOTEInfo.getString("snippet"),
+                    NOTEInfo.getString("type"),
+                    NOTEInfo.getString("widget_id"),
+                    NOTEInfo.getString("widget_type"),
+                    NOTEInfo.getString("sync_id"),
+                    NOTEInfo.getString("local_modified"),
+                    NOTEInfo.getString("origin_parent_id"),
+                    NOTEInfo.getString("gtask_id"),
+                    NOTEInfo.getString("version"),
+                    NOTEInfo.getString("top"),
+                    NOTEInfo.getString("star"),
+                    NOTEInfo.getString("passcode")
+            };
+            db.execSQL(sql,bindArgs);
+        }
+
+        assert DATA != null;
+        Iterator<String> DATAKeys = DATA.keys();
+        while (DATAKeys.hasNext()){
+            String DATAKey = DATAKeys.next();
+            JSONObject DATAInfo = (JSONObject) DATA.get(DATAKey);
+            sql = "INSERT INTO data(_id,mime_type,note_id,created_date,modified_date,content,data3,data4,data5)" +
+                    "values (?,?,?,?,?,?,?,?,?)";
+            Object bindArgs[] = new Object[] {
+                    DATAKey,
+                    DATAInfo.getString("mime_type"),
+                    DATAInfo.getString("note_id"),
+                    DATAInfo.getString("created_date"),
+                    DATAInfo.getString("modified_date"),
+                    DATAInfo.getString("content"),
+                    DATAInfo.getString("data3"),
+                    DATAInfo.getString("data4"),
+                    DATAInfo.getString("data5")
+            };
+            db.execSQL(sql,bindArgs);
+        }
+    }
+=======
+>>>>>>> origin/Branch_liujie
+}

src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java

@@ -49,7 +49,11 @@ public class SqlNote {
             NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE,
             NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID,
             NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID,
+<<<<<<< HEAD
             NoteColumns.VERSION,NoteColumns.TOP,
+=======
+            NoteColumns.VERSION
+>>>>>>> origin/Branch_liujie
     };
 
     public static final int ID_COLUMN = 0;
@@ -86,8 +90,11 @@ public class SqlNote {
 
     public static final int VERSION_COLUMN = 16;
 
+<<<<<<< HEAD
     public static final int Top_COLUMN = 17;
 
+=======
+>>>>>>> origin/Branch_liujie
     private Context mContext;
 
     private ContentResolver mContentResolver;
@@ -120,8 +127,11 @@ public class SqlNote {
 
     private long mVersion;
 
+<<<<<<< HEAD
     private String mTop;
 
+=======
+>>>>>>> origin/Branch_liujie
     private ContentValues mDiffNoteValues;
 
     private ArrayList<SqlData> mDataList;
@@ -143,7 +153,10 @@ public class SqlNote {
         mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
         mOriginParent = 0;
         mVersion = 0;
+<<<<<<< HEAD
         mTop = getmTop();
+=======
+>>>>>>> origin/Branch_liujie
         mDiffNoteValues = new ContentValues();
         mDataList = new ArrayList<SqlData>();
     }
@@ -157,7 +170,10 @@ public class SqlNote {
         if (mType == Notes.TYPE_NOTE)
             loadDataContent();
         mDiffNoteValues = new ContentValues();
+<<<<<<< HEAD
         mTop = getmTop();
+=======
+>>>>>>> origin/Branch_liujie
     }
 
     public SqlNote(Context context, long id) {
@@ -169,6 +185,7 @@ public class SqlNote {
         if (mType == Notes.TYPE_NOTE)
             loadDataContent();
         mDiffNoteValues = new ContentValues();
+<<<<<<< HEAD
         mTop = getmTop();
 
     }
@@ -177,6 +194,11 @@ public class SqlNote {
         return mTop;
     }
 
+=======
+
+    }
+
+>>>>>>> origin/Branch_liujie
     private void loadFromCursor(long id) {
         Cursor c = null;
         try {
@@ -209,7 +231,10 @@ public class SqlNote {
         mWidgetId = c.getInt(WIDGET_ID_COLUMN);
         mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
         mVersion = c.getLong(VERSION_COLUMN);
+<<<<<<< HEAD
         mTop = c.getString(Top_COLUMN);
+=======
+>>>>>>> origin/Branch_liujie
     }
 
     private void loadDataContent() {

src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java.orig

@@ -0,0 +1,542 @@
+/*
+ * 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.gtask.data;
+
+import android.appwidget.AppWidgetManager;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.gtask.exception.ActionFailureException;
+import net.micode.notes.tool.GTaskStringUtils;
+import net.micode.notes.tool.ResourceParser;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+
+public class SqlNote {
+    private static final String TAG = SqlNote.class.getSimpleName();
+
+    private static final int INVALID_ID = -99999;
+
+    public static final String[] PROJECTION_NOTE = new String[] {
+            NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID,
+            NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE,
+            NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE,
+            NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID,
+            NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID,
+<<<<<<< HEAD
+            NoteColumns.VERSION,NoteColumns.TOP,
+=======
+            NoteColumns.VERSION
+>>>>>>> origin/Branch_liujie
+    };
+
+    public static final int ID_COLUMN = 0;
+
+    public static final int ALERTED_DATE_COLUMN = 1;
+
+    public static final int BG_COLOR_ID_COLUMN = 2;
+
+    public static final int CREATED_DATE_COLUMN = 3;
+
+    public static final int HAS_ATTACHMENT_COLUMN = 4;
+
+    public static final int MODIFIED_DATE_COLUMN = 5;
+
+    public static final int NOTES_COUNT_COLUMN = 6;
+
+    public static final int PARENT_ID_COLUMN = 7;
+
+    public static final int SNIPPET_COLUMN = 8;
+
+    public static final int TYPE_COLUMN = 9;
+
+    public static final int WIDGET_ID_COLUMN = 10;
+
+    public static final int WIDGET_TYPE_COLUMN = 11;
+
+    public static final int SYNC_ID_COLUMN = 12;
+
+    public static final int LOCAL_MODIFIED_COLUMN = 13;
+
+    public static final int ORIGIN_PARENT_ID_COLUMN = 14;
+
+    public static final int GTASK_ID_COLUMN = 15;
+
+    public static final int VERSION_COLUMN = 16;
+
+<<<<<<< HEAD
+    public static final int Top_COLUMN = 17;
+
+=======
+>>>>>>> origin/Branch_liujie
+    private Context mContext;
+
+    private ContentResolver mContentResolver;
+
+    private boolean mIsCreate;
+
+    private long mId;
+
+    private long mAlertDate;
+
+    private int mBgColorId;
+
+    private long mCreatedDate;
+
+    private int mHasAttachment;
+
+    private long mModifiedDate;
+
+    private long mParentId;
+
+    private String mSnippet;
+
+    private int mType;
+
+    private int mWidgetId;
+
+    private int mWidgetType;
+
+    private long mOriginParent;
+
+    private long mVersion;
+
+<<<<<<< HEAD
+    private String mTop;
+
+=======
+>>>>>>> origin/Branch_liujie
+    private ContentValues mDiffNoteValues;
+
+    private ArrayList<SqlData> mDataList;
+
+    public SqlNote(Context context) {
+        mContext = context;
+        mContentResolver = context.getContentResolver();
+        mIsCreate = true;
+        mId = INVALID_ID;
+        mAlertDate = 0;
+        mBgColorId = ResourceParser.getDefaultBgId(context);
+        mCreatedDate = System.currentTimeMillis();
+        mHasAttachment = 0;
+        mModifiedDate = System.currentTimeMillis();
+        mParentId = 0;
+        mSnippet = "";
+        mType = Notes.TYPE_NOTE;
+        mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
+        mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+        mOriginParent = 0;
+        mVersion = 0;
+<<<<<<< HEAD
+        mTop = getmTop();
+=======
+>>>>>>> origin/Branch_liujie
+        mDiffNoteValues = new ContentValues();
+        mDataList = new ArrayList<SqlData>();
+    }
+
+    public SqlNote(Context context, Cursor c) {
+        mContext = context;
+        mContentResolver = context.getContentResolver();
+        mIsCreate = false;
+        loadFromCursor(c);
+        mDataList = new ArrayList<SqlData>();
+        if (mType == Notes.TYPE_NOTE)
+            loadDataContent();
+        mDiffNoteValues = new ContentValues();
+<<<<<<< HEAD
+        mTop = getmTop();
+=======
+>>>>>>> origin/Branch_liujie
+    }
+
+    public SqlNote(Context context, long id) {
+        mContext = context;
+        mContentResolver = context.getContentResolver();
+        mIsCreate = false;
+        loadFromCursor(id);
+        mDataList = new ArrayList<SqlData>();
+        if (mType == Notes.TYPE_NOTE)
+            loadDataContent();
+        mDiffNoteValues = new ContentValues();
+<<<<<<< HEAD
+        mTop = getmTop();
+
+    }
+
+    public String getmTop(){
+        return mTop;
+    }
+
+=======
+
+    }
+
+>>>>>>> origin/Branch_liujie
+    private void loadFromCursor(long id) {
+        Cursor c = null;
+        try {
+            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
+                    new String[] {
+                        String.valueOf(id)
+                    }, null);
+            if (c != null) {
+                c.moveToNext();
+                loadFromCursor(c);
+            } else {
+                Log.w(TAG, "loadFromCursor: cursor = null");
+            }
+        } finally {
+            if (c != null)
+                c.close();
+        }
+    }
+
+    private void loadFromCursor(Cursor c) {
+        mId = c.getLong(ID_COLUMN);
+        mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
+        mBgColorId = c.getInt(BG_COLOR_ID_COLUMN);
+        mCreatedDate = c.getLong(CREATED_DATE_COLUMN);
+        mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN);
+        mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN);
+        mParentId = c.getLong(PARENT_ID_COLUMN);
+        mSnippet = c.getString(SNIPPET_COLUMN);
+        mType = c.getInt(TYPE_COLUMN);
+        mWidgetId = c.getInt(WIDGET_ID_COLUMN);
+        mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
+        mVersion = c.getLong(VERSION_COLUMN);
+<<<<<<< HEAD
+        mTop = c.getString(Top_COLUMN);
+=======
+>>>>>>> origin/Branch_liujie
+    }
+
+    private void loadDataContent() {
+        Cursor c = null;
+        mDataList.clear();
+        try {
+            c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA,
+                    "(note_id=?)", new String[] {
+                        String.valueOf(mId)
+                    }, null);
+            if (c != null) {
+                if (c.getCount() == 0) {
+                    Log.w(TAG, "it seems that the note has not data");
+                    return;
+                }
+                while (c.moveToNext()) {
+                    SqlData data = new SqlData(mContext, c);
+                    mDataList.add(data);
+                }
+            } else {
+                Log.w(TAG, "loadDataContent: cursor = null");
+            }
+        } finally {
+            if (c != null)
+                c.close();
+        }
+    }
+
+    public boolean setContent(JSONObject js) {
+        try {
+            JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+            if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
+                Log.w(TAG, "cannot set system folder");
+            } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
+                // for folder we can only update the snnipet and type
+                String snippet = note.has(NoteColumns.SNIPPET) ? note
+                        .getString(NoteColumns.SNIPPET) : "";
+                if (mIsCreate || !mSnippet.equals(snippet)) {
+                    mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
+                }
+                mSnippet = snippet;
+
+                int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
+                        : Notes.TYPE_NOTE;
+                if (mIsCreate || mType != type) {
+                    mDiffNoteValues.put(NoteColumns.TYPE, type);
+                }
+                mType = type;
+            } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
+                JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
+                long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;
+                if (mIsCreate || mId != id) {
+                    mDiffNoteValues.put(NoteColumns.ID, id);
+                }
+                mId = id;
+
+                long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note
+                        .getLong(NoteColumns.ALERTED_DATE) : 0;
+                if (mIsCreate || mAlertDate != alertDate) {
+                    mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate);
+                }
+                mAlertDate = alertDate;
+
+                int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note
+                        .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
+                if (mIsCreate || mBgColorId != bgColorId) {
+                    mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId);
+                }
+                mBgColorId = bgColorId;
+
+                long createDate = note.has(NoteColumns.CREATED_DATE) ? note
+                        .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis();
+                if (mIsCreate || mCreatedDate != createDate) {
+                    mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate);
+                }
+                mCreatedDate = createDate;
+
+                int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note
+                        .getInt(NoteColumns.HAS_ATTACHMENT) : 0;
+                if (mIsCreate || mHasAttachment != hasAttachment) {
+                    mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment);
+                }
+                mHasAttachment = hasAttachment;
+
+                long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note
+                        .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis();
+                if (mIsCreate || mModifiedDate != modifiedDate) {
+                    mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate);
+                }
+                mModifiedDate = modifiedDate;
+
+                long parentId = note.has(NoteColumns.PARENT_ID) ? note
+                        .getLong(NoteColumns.PARENT_ID) : 0;
+                if (mIsCreate || mParentId != parentId) {
+                    mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId);
+                }
+                mParentId = parentId;
+
+                String snippet = note.has(NoteColumns.SNIPPET) ? note
+                        .getString(NoteColumns.SNIPPET) : "";
+                if (mIsCreate || !mSnippet.equals(snippet)) {
+                    mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
+                }
+                mSnippet = snippet;
+
+                int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
+                        : Notes.TYPE_NOTE;
+                if (mIsCreate || mType != type) {
+                    mDiffNoteValues.put(NoteColumns.TYPE, type);
+                }
+                mType = type;
+
+                int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
+                        : AppWidgetManager.INVALID_APPWIDGET_ID;
+                if (mIsCreate || mWidgetId != widgetId) {
+                    mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId);
+                }
+                mWidgetId = widgetId;
+
+                int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note
+                        .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE;
+                if (mIsCreate || mWidgetType != widgetType) {
+                    mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType);
+                }
+                mWidgetType = widgetType;
+
+                long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note
+                        .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0;
+                if (mIsCreate || mOriginParent != originParent) {
+                    mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent);
+                }
+                mOriginParent = originParent;
+
+                for (int i = 0; i < dataArray.length(); i++) {
+                    JSONObject data = dataArray.getJSONObject(i);
+                    SqlData sqlData = null;
+                    if (data.has(DataColumns.ID)) {
+                        long dataId = data.getLong(DataColumns.ID);
+                        for (SqlData temp : mDataList) {
+                            if (dataId == temp.getId()) {
+                                sqlData = temp;
+                            }
+                        }
+                    }
+
+                    if (sqlData == null) {
+                        sqlData = new SqlData(mContext);
+                        mDataList.add(sqlData);
+                    }
+
+                    sqlData.setContent(data);
+                }
+            }
+        } catch (JSONException e) {
+            Log.e(TAG, e.toString());
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    public JSONObject getContent() {
+        try {
+            JSONObject js = new JSONObject();
+
+            if (mIsCreate) {
+                Log.e(TAG, "it seems that we haven't created this in database yet");
+                return null;
+            }
+
+            JSONObject note = new JSONObject();
+            if (mType == Notes.TYPE_NOTE) {
+                note.put(NoteColumns.ID, mId);
+                note.put(NoteColumns.ALERTED_DATE, mAlertDate);
+                note.put(NoteColumns.BG_COLOR_ID, mBgColorId);
+                note.put(NoteColumns.CREATED_DATE, mCreatedDate);
+                note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment);
+                note.put(NoteColumns.MODIFIED_DATE, mModifiedDate);
+                note.put(NoteColumns.PARENT_ID, mParentId);
+                note.put(NoteColumns.SNIPPET, mSnippet);
+                note.put(NoteColumns.TYPE, mType);
+                note.put(NoteColumns.WIDGET_ID, mWidgetId);
+                note.put(NoteColumns.WIDGET_TYPE, mWidgetType);
+                note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent);
+                js.put(GTaskStringUtils.META_HEAD_NOTE, note);
+
+                JSONArray dataArray = new JSONArray();
+                for (SqlData sqlData : mDataList) {
+                    JSONObject data = sqlData.getContent();
+                    if (data != null) {
+                        dataArray.put(data);
+                    }
+                }
+                js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
+            } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) {
+                note.put(NoteColumns.ID, mId);
+                note.put(NoteColumns.TYPE, mType);
+                note.put(NoteColumns.SNIPPET, mSnippet);
+                js.put(GTaskStringUtils.META_HEAD_NOTE, note);
+            }
+
+            return js;
+        } catch (JSONException e) {
+            Log.e(TAG, e.toString());
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public void setParentId(long id) {
+        mParentId = id;
+        mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
+    }
+
+    public void setGtaskId(String gid) {
+        mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
+    }
+
+    public void setSyncId(long syncId) {
+        mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
+    }
+
+    public void resetLocalModified() {
+        mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
+    }
+
+    public long getId() {
+        return mId;
+    }
+
+    public long getParentId() {
+        return mParentId;
+    }
+
+    public String getSnippet() {
+        return mSnippet;
+    }
+
+    public boolean isNoteType() {
+        return mType == Notes.TYPE_NOTE;
+    }
+
+    public void commit(boolean validateVersion) {
+        if (mIsCreate) {
+            if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {
+                mDiffNoteValues.remove(NoteColumns.ID);
+            }
+
+            Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);
+            try {
+                mId = Long.valueOf(uri.getPathSegments().get(1));
+            } catch (NumberFormatException e) {
+                Log.e(TAG, "Get note id error :" + e.toString());
+                throw new ActionFailureException("create note failed");
+            }
+            if (mId == 0) {
+                throw new IllegalStateException("Create thread id failed");
+            }
+
+            if (mType == Notes.TYPE_NOTE) {
+                for (SqlData sqlData : mDataList) {
+                    sqlData.commit(mId, false, -1);
+                }
+            }
+        } else {
+            if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) {
+                Log.e(TAG, "No such note");
+                throw new IllegalStateException("Try to update note with invalid id");
+            }
+            if (mDiffNoteValues.size() > 0) {
+                mVersion ++;
+                int result = 0;
+                if (!validateVersion) {
+                    result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+                            + NoteColumns.ID + "=?)", new String[] {
+                        String.valueOf(mId)
+                    });
+                } else {
+                    result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+                            + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
+                            new String[] {
+                                    String.valueOf(mId), String.valueOf(mVersion)
+                            });
+                }
+                if (result == 0) {
+                    Log.w(TAG, "there is no update. maybe user updates note when syncing");
+                }
+            }
+
+            if (mType == Notes.TYPE_NOTE) {
+                for (SqlData sqlData : mDataList) {
+                    sqlData.commit(mId, validateVersion, mVersion);
+                }
+            }
+        }
+
+        // refresh local info
+        loadFromCursor(mId);
+        if (mType == Notes.TYPE_NOTE)
+            loadDataContent();
+
+        mDiffNoteValues.clear();
+        mIsCreate = false;
+    }
+}

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

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

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

@@ -0,0 +1,128 @@
+
+/*
+ * 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.gtask.remote;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+
+import net.micode.notes.R;
+import net.micode.notes.ui.NotesListActivity;
+import net.micode.notes.ui.NotesPreferenceActivity;
+
+
+public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
+
+    private static int GTASK_SYNC_NOTIFICATION_ID = 5234235;
+
+    public interface OnCompleteListener {
+        void onComplete();
+    }
+
+    private Context mContext;
+
+    private NotificationManager mNotifiManager;
+
+    private GTaskManager mTaskManager;
+
+    private OnCompleteListener mOnCompleteListener;
+
+    public GTaskASyncTask(Context context, OnCompleteListener listener) {
+        mContext = context;
+        mOnCompleteListener = listener;
+        mNotifiManager = (NotificationManager) mContext
+                .getSystemService(Context.NOTIFICATION_SERVICE);
+        mTaskManager = GTaskManager.getInstance();
+    }
+
+    public void cancelSync() {
+        mTaskManager.cancelSync();
+    }
+
+    public void publishProgess(String message) {
+        publishProgress(new String[] {
+            message
+        });
+    }
+
+    private void showNotification(int tickerId, String content) {
+        Notification notification = new Notification(R.drawable.notification, mContext
+                .getString(tickerId), System.currentTimeMillis());
+        notification.defaults = Notification.DEFAULT_LIGHTS;
+        notification.flags = Notification.FLAG_AUTO_CANCEL;
+        PendingIntent pendingIntent;
+        if (tickerId != R.string.ticker_success) {
+            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
+                    NotesPreferenceActivity.class), 0);
+
+        } else {
+            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
+                    NotesListActivity.class), 0);
+        }
+<<<<<<< HEAD
+
+        mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
+=======
+       /** notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
+                pendingIntent);
+        mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);**/
+>>>>>>> origin/Branch_liujie
+    }
+
+    @Override
+    protected Integer doInBackground(Void... unused) {
+        publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
+                .getSyncAccountName(mContext)));
+        return mTaskManager.sync(mContext, this);
+    }
+
+    @Override
+    protected void onProgressUpdate(String... progress) {
+        showNotification(R.string.ticker_syncing, progress[0]);
+        if (mContext instanceof GTaskSyncService) {
+            ((GTaskSyncService) mContext).sendBroadcast(progress[0]);
+        }
+    }
+
+    @Override
+    protected void onPostExecute(Integer result) {
+        if (result == GTaskManager.STATE_SUCCESS) {
+            showNotification(R.string.ticker_success, mContext.getString(
+                    R.string.success_sync_account, mTaskManager.getSyncAccount()));
+            NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis());
+        } else if (result == GTaskManager.STATE_NETWORK_ERROR) {
+            showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network));
+        } else if (result == GTaskManager.STATE_INTERNAL_ERROR) {
+            showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal));
+        } else if (result == GTaskManager.STATE_SYNC_CANCELLED) {
+            showNotification(R.string.ticker_cancel, mContext
+                    .getString(R.string.error_sync_cancelled));
+        }
+        if (mOnCompleteListener != null) {
+            new Thread(new Runnable() {
+
+                public void run() {
+                    mOnCompleteListener.onComplete();
+                }
+            }).start();
+        }
+    }
+}

src/app/src/main/java/net/micode/notes/model/Note.java

@@ -47,7 +47,10 @@ public class Note {
         long createdTime = System.currentTimeMillis();
         values.put(NoteColumns.CREATED_DATE, createdTime);
         values.put(NoteColumns.MODIFIED_DATE, createdTime);
+<<<<<<< HEAD
         //values.put(NoteColumns.TOP,"1");
+=======
+>>>>>>> origin/Branch_liujie
         values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
         values.put(NoteColumns.LOCAL_MODIFIED, 1);
         values.put(NoteColumns.PARENT_ID, folderId);
@@ -77,10 +80,13 @@ public class Note {
         mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
     }
 
+<<<<<<< HEAD
     public void setTopValue(String key, String value) {
         mNoteDiffValues.put(key, value);
     }
 
+=======
+>>>>>>> origin/Branch_liujie
     public void setTextData(String key, String value) {
         mNoteData.setTextData(key, value);
     }
@@ -140,8 +146,11 @@ public class Note {
 
         private ContentValues mTextDataValues;
 
+<<<<<<< HEAD
         private ContentValues mTopValues;
 
+=======
+>>>>>>> origin/Branch_liujie
         private long mCallDataId;
 
         private ContentValues mCallDataValues;
@@ -151,7 +160,10 @@ public class Note {
         public NoteData() {
             mTextDataValues = new ContentValues();
             mCallDataValues = new ContentValues();
+<<<<<<< HEAD
             mTopValues = new ContentValues();
+=======
+>>>>>>> origin/Branch_liujie
             mTextDataId = 0;
             mCallDataId = 0;
         }

src/app/src/main/java/net/micode/notes/model/Note.java.orig

@@ -0,0 +1,273 @@
+/*
+ * 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.model;
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.CallNote;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.Notes.TextNote;
+
+import java.util.ArrayList;
+
+
+public class Note {
+    private ContentValues mNoteDiffValues;
+    private NoteData mNoteData;
+    private static final String TAG = "Note";
+    /**
+     * Create a new note id for adding a new note to databases
+     */
+    public static synchronized long getNewNoteId(Context context, long folderId) {
+        // Create a new note in the database
+        ContentValues values = new ContentValues();
+        long createdTime = System.currentTimeMillis();
+        values.put(NoteColumns.CREATED_DATE, createdTime);
+        values.put(NoteColumns.MODIFIED_DATE, createdTime);
+<<<<<<< HEAD
+        //values.put(NoteColumns.TOP,"1");
+=======
+>>>>>>> origin/Branch_liujie
+        values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
+        values.put(NoteColumns.LOCAL_MODIFIED, 1);
+        values.put(NoteColumns.PARENT_ID, folderId);
+        Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
+
+        long noteId = 0;
+        try {
+            noteId = Long.valueOf(uri.getPathSegments().get(1));
+        } catch (NumberFormatException e) {
+            Log.e(TAG, "Get note id error :" + e.toString());
+            noteId = 0;
+        }
+        if (noteId == -1) {
+            throw new IllegalStateException("Wrong note id:" + noteId);
+        }
+        return noteId;
+    }
+
+    public Note() {
+        mNoteDiffValues = new ContentValues();
+        mNoteData = new NoteData();
+    }
+
+    public void setNoteValue(String key, String value) {
+        mNoteDiffValues.put(key, value);
+        mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
+        mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+    }
+
+<<<<<<< HEAD
+    public void setTopValue(String key, String value) {
+        mNoteDiffValues.put(key, value);
+    }
+
+=======
+>>>>>>> origin/Branch_liujie
+    public void setTextData(String key, String value) {
+        mNoteData.setTextData(key, value);
+    }
+
+    public void setTextDataId(long id) {
+        mNoteData.setTextDataId(id);
+    }
+
+    public long getTextDataId() {
+        return mNoteData.mTextDataId;
+    }
+
+    public void setCallDataId(long id) {
+        mNoteData.setCallDataId(id);
+    }
+
+    public void setCallData(String key, String value) {
+        mNoteData.setCallData(key, value);
+    }
+
+    public boolean isLocalModified() {
+        return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
+    }
+
+    public boolean syncNote(Context context, long noteId) {
+        if (noteId <= 0) {
+            throw new IllegalArgumentException("Wrong note id:" + noteId);
+        }
+
+        if (!isLocalModified()) {
+            return true;
+        }
+
+        /**
+         * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and
+         * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the
+         * note data info
+         */
+        if (context.getContentResolver().update(
+                ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null,
+                null) == 0) {
+            Log.e(TAG, "Update note error, should not happen");
+            // Do not return, fall through
+        }
+        mNoteDiffValues.clear();
+
+        if (mNoteData.isLocalModified()
+                && (mNoteData.pushIntoContentResolver(context, noteId) == null)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private class NoteData {
+        private long mTextDataId;
+
+        private ContentValues mTextDataValues;
+
+<<<<<<< HEAD
+        private ContentValues mTopValues;
+
+=======
+>>>>>>> origin/Branch_liujie
+        private long mCallDataId;
+
+        private ContentValues mCallDataValues;
+
+        private static final String TAG = "NoteData";
+
+        public NoteData() {
+            mTextDataValues = new ContentValues();
+            mCallDataValues = new ContentValues();
+<<<<<<< HEAD
+            mTopValues = new ContentValues();
+=======
+>>>>>>> origin/Branch_liujie
+            mTextDataId = 0;
+            mCallDataId = 0;
+        }
+
+        boolean isLocalModified() {
+            return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;
+        }
+
+        void setTextDataId(long id) {
+            if(id <= 0) {
+                throw new IllegalArgumentException("Text data id should larger than 0");
+            }
+            mTextDataId = id;
+        }
+
+        void setCallDataId(long id) {
+            if (id <= 0) {
+                throw new IllegalArgumentException("Call data id should larger than 0");
+            }
+            mCallDataId = id;
+        }
+
+        void setCallData(String key, String value) {
+            mCallDataValues.put(key, value);
+            mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
+            mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+        }
+
+        void setTextData(String key, String value) {
+            mTextDataValues.put(key, value);
+            mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
+            mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+        }
+
+        Uri pushIntoContentResolver(Context context, long noteId) {
+            /**
+             * Check for safety
+             */
+            if (noteId <= 0) {
+                throw new IllegalArgumentException("Wrong note id:" + noteId);
+            }
+
+            ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
+            ContentProviderOperation.Builder builder = null;
+
+            if(mTextDataValues.size() > 0) {
+                mTextDataValues.put(DataColumns.NOTE_ID, noteId);
+                if (mTextDataId == 0) {
+                    mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);
+                    Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
+                            mTextDataValues);
+                    try {
+                        setTextDataId(Long.valueOf(uri.getPathSegments().get(1)));
+                    } catch (NumberFormatException e) {
+                        Log.e(TAG, "Insert new text data fail with noteId" + noteId);
+                        mTextDataValues.clear();
+                        return null;
+                    }
+                } else {
+                    builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
+                            Notes.CONTENT_DATA_URI, mTextDataId));
+                    builder.withValues(mTextDataValues);
+                    operationList.add(builder.build());
+                }
+                mTextDataValues.clear();
+            }
+
+            if(mCallDataValues.size() > 0) {
+                mCallDataValues.put(DataColumns.NOTE_ID, noteId);
+                if (mCallDataId == 0) {
+                    mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE);
+                    Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
+                            mCallDataValues);
+                    try {
+                        setCallDataId(Long.valueOf(uri.getPathSegments().get(1)));
+                    } catch (NumberFormatException e) {
+                        Log.e(TAG, "Insert new call data fail with noteId" + noteId);
+                        mCallDataValues.clear();
+                        return null;
+                    }
+                } else {
+                    builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
+                            Notes.CONTENT_DATA_URI, mCallDataId));
+                    builder.withValues(mCallDataValues);
+                    operationList.add(builder.build());
+                }
+                mCallDataValues.clear();
+            }
+
+            if (operationList.size() > 0) {
+                try {
+                    ContentProviderResult[] results = context.getContentResolver().applyBatch(
+                            Notes.AUTHORITY, operationList);
+                    return (results == null || results.length == 0 || results[0] == null) ? null
+                            : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId);
+                } catch (RemoteException e) {
+                    Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
+                    return null;
+                } catch (OperationApplicationException e) {
+                    Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
+                    return null;
+                }
+            }
+            return null;
+        }
+    }
+}

src/app/src/main/java/net/micode/notes/model/WorkingNote.java

@@ -29,7 +29,10 @@ import net.micode.notes.data.Notes.DataColumns;
 import net.micode.notes.data.Notes.DataConstants;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.data.Notes.TextNote;
+<<<<<<< HEAD
 import net.micode.notes.data.NotesProvider;
+=======
+>>>>>>> origin/Branch_liujie
 import net.micode.notes.tool.ResourceParser.NoteBgResources;
 
 
@@ -61,6 +64,7 @@ public class WorkingNote {
 
     private boolean mIsDeleted;
 
+<<<<<<< HEAD
 
     /**记录已置顶便签*/
     private String mTop = "0";
@@ -69,6 +73,8 @@ public class WorkingNote {
     private int mClass;
 
 
+=======
+>>>>>>> origin/Branch_liujie
     private NoteSettingChangedListener mNoteSettingStatusListener;
 
     public static final String[] DATA_PROJECTION = new String[] {
@@ -87,8 +93,12 @@ public class WorkingNote {
             NoteColumns.BG_COLOR_ID,
             NoteColumns.WIDGET_ID,
             NoteColumns.WIDGET_TYPE,
+<<<<<<< HEAD
             NoteColumns.MODIFIED_DATE,
             NoteColumns.TOP,
+=======
+            NoteColumns.MODIFIED_DATE
+>>>>>>> origin/Branch_liujie
     };
 
     private static final int DATA_ID_COLUMN = 0;
@@ -111,7 +121,10 @@ public class WorkingNote {
 
     private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
 
+<<<<<<< HEAD
     private static final int NOTE_TOP_COLUMN = 6;
+=======
+>>>>>>> origin/Branch_liujie
 
     // New note construct
     private WorkingNote(Context context, long folderId) {
@@ -124,7 +137,10 @@ public class WorkingNote {
         mIsDeleted = false;
         mMode = 0;
         mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+<<<<<<< HEAD
         mTop = String.valueOf(getTopId());
+=======
+>>>>>>> origin/Branch_liujie
     }
 
     // Existing note construct
@@ -150,7 +166,10 @@ public class WorkingNote {
                 mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN);
                 mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN);
                 mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
+<<<<<<< HEAD
                 mTop = cursor.getString(NOTE_TOP_COLUMN);
+=======
+>>>>>>> origin/Branch_liujie
             }
             cursor.close();
         } else {
@@ -243,6 +262,7 @@ public class WorkingNote {
         mNoteSettingStatusListener = l;
     }
 
+<<<<<<< HEAD
     public void setTop(String Top){
         if (!mTop.equals(Top)) {
             mTop = Top;
@@ -253,6 +273,8 @@ public class WorkingNote {
         }
     }
 
+=======
+>>>>>>> origin/Branch_liujie
     public void setAlertDate(long date, boolean set) {
         if (date != mAlertDate) {
             mAlertDate = date;
@@ -312,10 +334,13 @@ public class WorkingNote {
         }
     }
 
+<<<<<<< HEAD
     public void setmContent(String text){
         mContent = text;
     }
 
+=======
+>>>>>>> origin/Branch_liujie
     public void convertToCallNote(String phoneNumber, long callDate) {
         mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
         mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
@@ -326,6 +351,7 @@ public class WorkingNote {
         return (mAlertDate > 0 ? true : false);
     }
 
+<<<<<<< HEAD
     public int getTopId() {
         if (mTop.equals("1")) {
             return 1;
@@ -334,6 +360,8 @@ public class WorkingNote {
         }
     }
 
+=======
+>>>>>>> origin/Branch_liujie
     public String getContent() {
         return mContent;
     }
@@ -385,12 +413,15 @@ public class WorkingNote {
         void onBackgroundColorChanged();
 
         /**
+<<<<<<< HEAD
          * Called when user set top
          */
         void onTopChanged(String Top);
 
 
         /**
+=======
+>>>>>>> origin/Branch_liujie
          * Called when user set clock
          */
         void onClockAlertChanged(long date, boolean set);
@@ -407,4 +438,21 @@ public class WorkingNote {
          */
         void onCheckListModeChanged(int oldMode, int newMode);
     }
+<<<<<<< HEAD
+=======
+     /* 设置便签的访问密码
+     * @param  password 新的访问密码
+     */
+    public void setPassword(String password){
+        //将该类的mPassword属性设置为新的访问密码
+        String mPassword = password;
+        //将修改后的便签密码写入到便签数据库中
+        mNote.setNoteValue(NoteColumns.PASSWORD,mPassword);
+    }
+
+    public String getmPassword(){
+        String mPassword="1234";
+        return mPassword;
+    }
+>>>>>>> origin/Branch_liujie
 }

src/app/src/main/java/net/micode/notes/model/WorkingNote.java.orig

@@ -0,0 +1,458 @@
+/*
+ * 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.model;
+
+import android.appwidget.AppWidgetManager;
+import android.content.ContentUris;
+import android.content.Context;
+import android.database.Cursor;
+import android.text.TextUtils;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.CallNote;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.DataConstants;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.Notes.TextNote;
+<<<<<<< HEAD
+import net.micode.notes.data.NotesProvider;
+=======
+>>>>>>> origin/Branch_liujie
+import net.micode.notes.tool.ResourceParser.NoteBgResources;
+
+
+public class WorkingNote {
+    // Note for the working note
+    private Note mNote;
+    // Note Id
+    private long mNoteId;
+    // Note content
+    private String mContent;
+    // Note mode
+    private int mMode;
+
+    private long mAlertDate;
+
+    private long mModifiedDate;
+
+    private int mBgColorId;
+
+    private int mWidgetId;
+
+    private int mWidgetType;
+
+    private long mFolderId;
+
+    private Context mContext;
+
+    private static final String TAG = "WorkingNote";
+
+    private boolean mIsDeleted;
+
+<<<<<<< HEAD
+
+    /**记录已置顶便签*/
+    private String mTop = "0";
+
+    /**记录便签所属类别*/
+    private int mClass;
+
+
+=======
+>>>>>>> origin/Branch_liujie
+    private NoteSettingChangedListener mNoteSettingStatusListener;
+
+    public static final String[] DATA_PROJECTION = new String[] {
+            DataColumns.ID,
+            DataColumns.CONTENT,
+            DataColumns.MIME_TYPE,
+            DataColumns.DATA1,
+            DataColumns.DATA2,
+            DataColumns.DATA3,
+            DataColumns.DATA4,
+    };
+
+    public static final String[] NOTE_PROJECTION = new String[] {
+            NoteColumns.PARENT_ID,
+            NoteColumns.ALERTED_DATE,
+            NoteColumns.BG_COLOR_ID,
+            NoteColumns.WIDGET_ID,
+            NoteColumns.WIDGET_TYPE,
+<<<<<<< HEAD
+            NoteColumns.MODIFIED_DATE,
+            NoteColumns.TOP,
+=======
+            NoteColumns.MODIFIED_DATE
+>>>>>>> origin/Branch_liujie
+    };
+
+    private static final int DATA_ID_COLUMN = 0;
+
+    private static final int DATA_CONTENT_COLUMN = 1;
+
+    private static final int DATA_MIME_TYPE_COLUMN = 2;
+
+    private static final int DATA_MODE_COLUMN = 3;
+
+    private static final int NOTE_PARENT_ID_COLUMN = 0;
+
+    private static final int NOTE_ALERTED_DATE_COLUMN = 1;
+
+    private static final int NOTE_BG_COLOR_ID_COLUMN = 2;
+
+    private static final int NOTE_WIDGET_ID_COLUMN = 3;
+
+    private static final int NOTE_WIDGET_TYPE_COLUMN = 4;
+
+    private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
+
+<<<<<<< HEAD
+    private static final int NOTE_TOP_COLUMN = 6;
+=======
+>>>>>>> origin/Branch_liujie
+
+    // New note construct
+    private WorkingNote(Context context, long folderId) {
+        mContext = context;
+        mAlertDate = 0;
+        mModifiedDate = System.currentTimeMillis();
+        mFolderId = folderId;
+        mNote = new Note();
+        mNoteId = 0;
+        mIsDeleted = false;
+        mMode = 0;
+        mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+<<<<<<< HEAD
+        mTop = String.valueOf(getTopId());
+=======
+>>>>>>> origin/Branch_liujie
+    }
+
+    // Existing note construct
+    private WorkingNote(Context context, long noteId, long folderId) {
+        mContext = context;
+        mNoteId = noteId;
+        mFolderId = folderId;
+        mIsDeleted = false;
+        mNote = new Note();
+        loadNote();
+    }
+
+    private void loadNote() {
+        Cursor cursor = mContext.getContentResolver().query(
+                ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
+                null, null);
+
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);
+                mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN);
+                mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN);
+                mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN);
+                mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN);
+                mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
+<<<<<<< HEAD
+                mTop = cursor.getString(NOTE_TOP_COLUMN);
+=======
+>>>>>>> origin/Branch_liujie
+            }
+            cursor.close();
+        } else {
+            Log.e(TAG, "No note with id:" + mNoteId);
+            throw new IllegalArgumentException("Unable to find note with id " + mNoteId);
+        }
+        loadNoteData();
+    }
+
+    private void loadNoteData() {
+        Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
+                DataColumns.NOTE_ID + "=?", new String[] {
+                    String.valueOf(mNoteId)
+                }, null);
+
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                do {
+                    String type = cursor.getString(DATA_MIME_TYPE_COLUMN);
+                    if (DataConstants.NOTE.equals(type)) {
+                        mContent = cursor.getString(DATA_CONTENT_COLUMN);
+                        mMode = cursor.getInt(DATA_MODE_COLUMN);
+                        mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN));
+                    } else if (DataConstants.CALL_NOTE.equals(type)) {
+                        mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN));
+                    } else {
+                        Log.d(TAG, "Wrong note type with type:" + type);
+                    }
+                } while (cursor.moveToNext());
+            }
+            cursor.close();
+        } else {
+            Log.e(TAG, "No data with id:" + mNoteId);
+            throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);
+        }
+    }
+
+    public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
+            int widgetType, int defaultBgColorId) {
+        WorkingNote note = new WorkingNote(context, folderId);
+        note.setBgColorId(defaultBgColorId);
+        note.setWidgetId(widgetId);
+        note.setWidgetType(widgetType);
+        return note;
+    }
+
+    public static WorkingNote load(Context context, long id) {
+        return new WorkingNote(context, id, 0);
+    }
+
+    public synchronized boolean saveNote() {
+        if (isWorthSaving()) {
+            if (!existInDatabase()) {
+                if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) {
+                    Log.e(TAG, "Create new note fail with id:" + mNoteId);
+                    return false;
+                }
+            }
+
+            mNote.syncNote(mContext, mNoteId);
+
+            /**
+             * Update widget content if there exist any widget of this note
+             */
+            if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+                    && mWidgetType != Notes.TYPE_WIDGET_INVALIDE
+                    && mNoteSettingStatusListener != null) {
+                mNoteSettingStatusListener.onWidgetChanged();
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean existInDatabase() {
+        return mNoteId > 0;
+    }
+
+    private boolean isWorthSaving() {
+        if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
+                || (existInDatabase() && !mNote.isLocalModified())) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
+        mNoteSettingStatusListener = l;
+    }
+
+<<<<<<< HEAD
+    public void setTop(String Top){
+        if (!mTop.equals(Top)) {
+            mTop = Top;
+            mNote.setTopValue(NoteColumns.TOP,mTop);
+        }
+        if (mNoteSettingStatusListener != null) {
+            mNoteSettingStatusListener.onTopChanged(Top);
+        }
+    }
+
+=======
+>>>>>>> origin/Branch_liujie
+    public void setAlertDate(long date, boolean set) {
+        if (date != mAlertDate) {
+            mAlertDate = date;
+            mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate));
+        }
+        if (mNoteSettingStatusListener != null) {
+            mNoteSettingStatusListener.onClockAlertChanged(date, set);
+        }
+    }
+
+    public void markDeleted(boolean mark) {
+        mIsDeleted = mark;
+        if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+                && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
+                mNoteSettingStatusListener.onWidgetChanged();
+        }
+    }
+
+    public void setBgColorId(int id) {
+        if (id != mBgColorId) {
+            mBgColorId = id;
+            if (mNoteSettingStatusListener != null) {
+                mNoteSettingStatusListener.onBackgroundColorChanged();
+            }
+            mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
+        }
+    }
+
+    public void setCheckListMode(int mode) {
+        if (mMode != mode) {
+            if (mNoteSettingStatusListener != null) {
+                mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
+            }
+            mMode = mode;
+            mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
+        }
+    }
+
+    public void setWidgetType(int type) {
+        if (type != mWidgetType) {
+            mWidgetType = type;
+            mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
+        }
+    }
+
+    public void setWidgetId(int id) {
+        if (id != mWidgetId) {
+            mWidgetId = id;
+            mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
+        }
+    }
+
+    public void setWorkingText(String text) {
+        if (!TextUtils.equals(mContent, text)) {
+            mContent = text;
+            mNote.setTextData(DataColumns.CONTENT, mContent);
+        }
+    }
+
+<<<<<<< HEAD
+    public void setmContent(String text){
+        mContent = text;
+    }
+
+=======
+>>>>>>> origin/Branch_liujie
+    public void convertToCallNote(String phoneNumber, long callDate) {
+        mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
+        mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
+        mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
+    }
+
+    public boolean hasClockAlert() {
+        return (mAlertDate > 0 ? true : false);
+    }
+
+<<<<<<< HEAD
+    public int getTopId() {
+        if (mTop.equals("1")) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+=======
+>>>>>>> origin/Branch_liujie
+    public String getContent() {
+        return mContent;
+    }
+
+    public long getAlertDate() {
+        return mAlertDate;
+    }
+
+    public long getModifiedDate() {
+        return mModifiedDate;
+    }
+
+    public int getBgColorResId() {
+        return NoteBgResources.getNoteBgResource(mBgColorId);
+    }
+
+    public int getBgColorId() {
+        return mBgColorId;
+    }
+
+    public int getTitleBgResId() {
+        return NoteBgResources.getNoteTitleBgResource(mBgColorId);
+    }
+
+    public int getCheckListMode() {
+        return mMode;
+    }
+
+    public long getNoteId() {
+        return mNoteId;
+    }
+
+    public long getFolderId() {
+        return mFolderId;
+    }
+
+    public int getWidgetId() {
+        return mWidgetId;
+    }
+
+    public int getWidgetType() {
+        return mWidgetType;
+    }
+
+    public interface NoteSettingChangedListener {
+        /**
+         * Called when the background color of current note has just changed
+         */
+        void onBackgroundColorChanged();
+
+        /**
+<<<<<<< HEAD
+         * Called when user set top
+         */
+        void onTopChanged(String Top);
+
+
+        /**
+=======
+>>>>>>> origin/Branch_liujie
+         * Called when user set clock
+         */
+        void onClockAlertChanged(long date, boolean set);
+
+        /**
+         * Call when user create note from widget
+         */
+        void onWidgetChanged();
+
+        /**
+         * Call when switch between check list mode and normal mode
+         * @param oldMode is previous mode before change
+         * @param newMode is new mode
+         */
+        void onCheckListModeChanged(int oldMode, int newMode);
+    }
+<<<<<<< HEAD
+=======
+     /* 设置便签的访问密码
+     * @param  password 新的访问密码
+     */
+    public void setPassword(String password){
+        //将该类的mPassword属性设置为新的访问密码
+        String mPassword = password;
+        //将修改后的便签密码写入到便签数据库中
+        mNote.setNoteValue(NoteColumns.PASSWORD,mPassword);
+    }
+
+    public String getmPassword(){
+        String mPassword="1234";
+        return mPassword;
+    }
+>>>>>>> origin/Branch_liujie
+}

src/app/src/main/java/net/micode/notes/tool/DataUtils.java

@@ -16,7 +16,10 @@
 
 package net.micode.notes.tool;
 
+<<<<<<< HEAD
 import android.app.Activity;
+=======
+>>>>>>> origin/Branch_liujie
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderResult;
 import android.content.ContentResolver;
@@ -26,6 +29,7 @@ import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.os.RemoteException;
 import android.util.Log;
+<<<<<<< HEAD
 import android.database.sqlite.SQLiteDatabase;
 import android.widget.Toast;
 
@@ -38,11 +42,20 @@ import net.micode.notes.data.NotesProvider;
 import net.micode.notes.gtask.data.SqlNote;
 import net.micode.notes.model.Note;
 import net.micode.notes.ui.NoteEditActivity;
+=======
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.CallNote;
+import net.micode.notes.data.Notes.NoteColumns;
+>>>>>>> origin/Branch_liujie
 import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
 
 import java.util.ArrayList;
 import java.util.HashSet;
+<<<<<<< HEAD
 import java.util.TreeSet;
+=======
+>>>>>>> origin/Branch_liujie
 
 
 public class DataUtils {

src/app/src/main/java/net/micode/notes/tool/DataUtils.java.orig

@@ -0,0 +1,318 @@
+/*
+ * 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.tool;
+
+<<<<<<< HEAD
+import android.app.Activity;
+=======
+>>>>>>> origin/Branch_liujie
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.OperationApplicationException;
+import android.database.Cursor;
+import android.os.RemoteException;
+import android.util.Log;
+<<<<<<< HEAD
+import android.database.sqlite.SQLiteDatabase;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.CallNote;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.NotesDatabaseHelper;
+import net.micode.notes.data.NotesProvider;
+import net.micode.notes.gtask.data.SqlNote;
+import net.micode.notes.model.Note;
+import net.micode.notes.ui.NoteEditActivity;
+=======
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.CallNote;
+import net.micode.notes.data.Notes.NoteColumns;
+>>>>>>> origin/Branch_liujie
+import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+<<<<<<< HEAD
+import java.util.TreeSet;
+=======
+>>>>>>> origin/Branch_liujie
+
+
+public class DataUtils {
+    public static final String TAG = "DataUtils";
+    public static boolean batchDeleteNotes(ContentResolver resolver, HashSet<Long> ids) {
+        if (ids == null) {
+            Log.d(TAG, "the ids is null");
+            return true;
+        }
+        if (ids.size() == 0) {
+            Log.d(TAG, "no id is in the hashset");
+            return true;
+        }
+
+        ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
+        for (long id : ids) {
+            if(id == Notes.ID_ROOT_FOLDER) {
+                Log.e(TAG, "Don't delete system folder root");
+                continue;
+            }
+            ContentProviderOperation.Builder builder = ContentProviderOperation
+                    .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
+            operationList.add(builder.build());
+        }
+        try {
+            ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
+            if (results == null || results.length == 0 || results[0] == null) {
+                Log.d(TAG, "delete notes failed, ids:" + ids.toString());
+                return false;
+            }
+            return true;
+        } catch (RemoteException e) {
+            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
+        } catch (OperationApplicationException e) {
+            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
+        }
+        return false;
+    }
+
+    public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) {
+        ContentValues values = new ContentValues();
+        values.put(NoteColumns.PARENT_ID, desFolderId);
+        values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId);
+        values.put(NoteColumns.LOCAL_MODIFIED, 1);
+        resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null);
+    }
+
+    public static boolean batchMoveToFolder(ContentResolver resolver, HashSet<Long> ids,
+            long folderId) {
+        if (ids == null) {
+            Log.d(TAG, "the ids is null");
+            return true;
+        }
+
+        ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
+        for (long id : ids) {
+            ContentProviderOperation.Builder builder = ContentProviderOperation
+                    .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
+            builder.withValue(NoteColumns.PARENT_ID, folderId);
+            builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);
+            operationList.add(builder.build());
+        }
+
+        try {
+            ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
+            if (results == null || results.length == 0 || results[0] == null) {
+                Log.d(TAG, "delete notes failed, ids:" + ids.toString());
+                return false;
+            }
+            return true;
+        } catch (RemoteException e) {
+            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
+        } catch (OperationApplicationException e) {
+            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
+        }
+        return false;
+    }
+
+    /**
+     * Get the all folder count except system folders {@link Notes#TYPE_SYSTEM}}
+     */
+    public static int getUserFolderCount(ContentResolver resolver) {
+        Cursor cursor =resolver.query(Notes.CONTENT_NOTE_URI,
+                new String[] { "COUNT(*)" },
+                NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?",
+                new String[] { String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)},
+                null);
+
+        int count = 0;
+        if(cursor != null) {
+            if(cursor.moveToFirst()) {
+                try {
+                    count = cursor.getInt(0);
+                } catch (IndexOutOfBoundsException e) {
+                    Log.e(TAG, "get folder count failed:" + e.toString());
+                } finally {
+                    cursor.close();
+                }
+            }
+        }
+        return count;
+    }
+
+    public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) {
+        Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
+                null,
+                NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER,
+                new String [] {String.valueOf(type)},
+                null);
+
+        boolean exist = false;
+        if (cursor != null) {
+            if (cursor.getCount() > 0) {
+                exist = true;
+            }
+            cursor.close();
+        }
+        return exist;
+    }
+
+    public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) {
+        Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
+                null, null, null, null);
+
+        boolean exist = false;
+        if (cursor != null) {
+            if (cursor.getCount() > 0) {
+                exist = true;
+            }
+            cursor.close();
+        }
+        return exist;
+    }
+
+    public static boolean existInDataDatabase(ContentResolver resolver, long dataId) {
+        Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId),
+                null, null, null, null);
+
+        boolean exist = false;
+        if (cursor != null) {
+            if (cursor.getCount() > 0) {
+                exist = true;
+            }
+            cursor.close();
+        }
+        return exist;
+    }
+
+    public static boolean checkVisibleFolderName(ContentResolver resolver, String name) {
+        Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null,
+                NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER +
+                " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER +
+                " AND " + NoteColumns.SNIPPET + "=?",
+                new String[] { name }, null);
+        boolean exist = false;
+        if(cursor != null) {
+            if(cursor.getCount() > 0) {
+                exist = true;
+            }
+            cursor.close();
+        }
+        return exist;
+    }
+
+    public static HashSet<AppWidgetAttribute> getFolderNoteWidget(ContentResolver resolver, long folderId) {
+        Cursor c = resolver.query(Notes.CONTENT_NOTE_URI,
+                new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE },
+                NoteColumns.PARENT_ID + "=?",
+                new String[] { String.valueOf(folderId) },
+                null);
+
+        HashSet<AppWidgetAttribute> set = null;
+        if (c != null) {
+            if (c.moveToFirst()) {
+                set = new HashSet<AppWidgetAttribute>();
+                do {
+                    try {
+                        AppWidgetAttribute widget = new AppWidgetAttribute();
+                        widget.widgetId = c.getInt(0);
+                        widget.widgetType = c.getInt(1);
+                        set.add(widget);
+                    } catch (IndexOutOfBoundsException e) {
+                        Log.e(TAG, e.toString());
+                    }
+                } while (c.moveToNext());
+            }
+            c.close();
+        }
+        return set;
+    }
+
+    public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) {
+        Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
+                new String [] { CallNote.PHONE_NUMBER },
+                CallNote.NOTE_ID + "=? AND " + CallNote.MIME_TYPE + "=?",
+                new String [] { String.valueOf(noteId), CallNote.CONTENT_ITEM_TYPE },
+                null);
+
+        if (cursor != null && cursor.moveToFirst()) {
+            try {
+                return cursor.getString(0);
+            } catch (IndexOutOfBoundsException e) {
+                Log.e(TAG, "Get call number fails " + e.toString());
+            } finally {
+                cursor.close();
+            }
+        }
+        return "";
+    }
+
+    public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) {
+        Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
+                new String [] { CallNote.NOTE_ID },
+                CallNote.CALL_DATE + "=? AND " + CallNote.MIME_TYPE + "=? AND PHONE_NUMBERS_EQUAL("
+                + CallNote.PHONE_NUMBER + ",?)",
+                new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber },
+                null);
+
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                try {
+                    return cursor.getLong(0);
+                } catch (IndexOutOfBoundsException e) {
+                    Log.e(TAG, "Get call note id fails " + e.toString());
+                }
+            }
+            cursor.close();
+        }
+        return 0;
+    }
+
+    public static String getSnippetById(ContentResolver resolver, long noteId) {
+        Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI,
+                new String [] { NoteColumns.SNIPPET },
+                NoteColumns.ID + "=?",
+                new String [] { String.valueOf(noteId)},
+                null);
+
+        if (cursor != null) {
+            String snippet = "";
+            if (cursor.moveToFirst()) {
+                snippet = cursor.getString(0);
+            }
+            cursor.close();
+            return snippet;
+        }
+        throw new IllegalArgumentException("Note is not found with id: " + noteId);
+    }
+
+    public static String getFormattedSnippet(String snippet) {
+        if (snippet != null) {
+            snippet = snippet.trim();
+            int index = snippet.indexOf('\n');
+            if (index != -1) {
+                snippet = snippet.substring(0, index);
+            }
+        }
+        return snippet;
+    }
+}

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

@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/Branch_liujie
 /*
  * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
  *

src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java.orig

@@ -0,0 +1,162 @@
+<<<<<<< HEAD
+
+=======
+>>>>>>> origin/Branch_liujie
+/*
+ * 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.ui;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.DialogInterface.OnDismissListener;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.PowerManager;
+import android.provider.Settings;
+import android.view.Window;
+import android.view.WindowManager;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.tool.DataUtils;
+
+import java.io.IOException;
+
+
+public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
+    private long mNoteId;
+    private String mSnippet;
+    private static final int SNIPPET_PREW_MAX_LEN = 60;
+    MediaPlayer mPlayer;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        final Window win = getWindow();
+        win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+
+        if (!isScreenOn()) {
+            win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                    | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+                    | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
+                    | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
+        }
+
+        Intent intent = getIntent();
+
+        try {
+            mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1));
+            mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId);
+            mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0,
+                    SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info)
+                    : mSnippet;
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        mPlayer = new MediaPlayer();
+        if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
+            showActionDialog();
+            playAlarmSound();
+        } else {
+            finish();
+        }
+    }
+
+    private boolean isScreenOn() {
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        return pm.isScreenOn();
+    }
+
+    private void playAlarmSound() {
+        Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
+
+        int silentModeStreams = Settings.System.getInt(getContentResolver(),
+                Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
+
+        if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) {
+            mPlayer.setAudioStreamType(silentModeStreams);
+        } else {
+            mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM);
+        }
+        try {
+            mPlayer.setDataSource(this, url);
+            mPlayer.prepare();
+            mPlayer.setLooping(true);
+            mPlayer.start();
+        } catch (IllegalArgumentException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (SecurityException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IllegalStateException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    private void showActionDialog() {
+        AlertDialog.Builder dialog = new AlertDialog.Builder(this);
+        dialog.setTitle(R.string.app_name);
+        dialog.setMessage(mSnippet);
+        dialog.setPositiveButton(R.string.notealert_ok, this);
+        if (isScreenOn()) {
+            dialog.setNegativeButton(R.string.notealert_enter, this);
+        }
+        dialog.show().setOnDismissListener(this);
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        switch (which) {
+            case DialogInterface.BUTTON_NEGATIVE:
+                Intent intent = new Intent(this, NoteEditActivity.class);
+                intent.setAction(Intent.ACTION_VIEW);
+                intent.putExtra(Intent.EXTRA_UID, mNoteId);
+                startActivity(intent);
+                break;
+            default:
+                break;
+        }
+    }
+
+    public void onDismiss(DialogInterface dialog) {
+        stopAlarmSound();
+        finish();
+    }
+
+    private void stopAlarmSound() {
+        if (mPlayer != null) {
+            mPlayer.stop();
+            mPlayer.release();
+            mPlayer = null;
+        }
+    }
+}

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

@@ -16,6 +16,7 @@
 
 package net.micode.notes.ui;
 
+<<<<<<< HEAD
 import android.Manifest;
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -43,6 +44,13 @@ import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
+=======
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.AlertDialog;
+import android.app.Dialog;
+>>>>>>> origin/Branch_liujie
 import android.app.PendingIntent;
 import android.app.SearchManager;
 import android.appwidget.AppWidgetManager;
@@ -52,6 +60,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Paint;
+<<<<<<< HEAD
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.telecom.Call;
@@ -63,6 +72,16 @@ import android.text.TextWatcher;
 import android.text.format.DateUtils;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.ImageSpan;
+=======
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.text.style.BackgroundColorSpan;
+>>>>>>> origin/Branch_liujie
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -71,12 +90,19 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
+<<<<<<< HEAD
 import android.widget.Button;
+=======
+import android.view.inputmethod.InputMethodManager;
+>>>>>>> origin/Branch_liujie
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
+<<<<<<< HEAD
 import android.widget.ImageButton;
+=======
+>>>>>>> origin/Branch_liujie
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -92,6 +118,7 @@ import net.micode.notes.tool.ResourceParser;
 import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
 import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
 import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
+<<<<<<< HEAD
 import net.micode.notes.ui.translate_demo.RespondBean;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
@@ -102,10 +129,18 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+=======
+import net.micode.notes.widget.NoteWidgetProvider_2x;
+import net.micode.notes.widget.NoteWidgetProvider_4x;
+
+import java.util.HashMap;
+import java.util.HashSet;
+>>>>>>> origin/Branch_liujie
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+<<<<<<< HEAD
 import  net.micode.notes.ui.translate_demo.MD5Utils;
 import  net.micode.notes.ui.translate_demo.BaiduTranslateService;
 
@@ -122,13 +157,21 @@ import retrofit2.converter.gson.GsonConverterFactory;
 public class NoteEditActivity<关闭> extends AppCompatActivity implements OnClickListener,
         NoteSettingChangedListener, OnTextViewChangeListener {
 
+=======
+
+public class NoteEditActivity extends Activity implements OnClickListener,
+        NoteSettingChangedListener, OnTextViewChangeListener {
+>>>>>>> origin/Branch_liujie
     private class HeadViewHolder {
         public TextView tvModified;
 
         public ImageView ivAlertIcon;
 
+<<<<<<< HEAD
         public TextView tvToptext;
 
+=======
+>>>>>>> origin/Branch_liujie
         public TextView tvAlertDate;
 
         public ImageView ibSetBgColor;
@@ -187,8 +230,11 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     private SharedPreferences mSharedPrefs;
     private int mFontSizeId;
 
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> origin/Branch_liujie
     private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
 
     private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
@@ -196,6 +242,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     public static final String TAG_CHECKED = String.valueOf('\u221A');
     public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
 
+<<<<<<< HEAD
     public static final int TAKE_PHOTO = 1;
     public static final int CHOOSE_PHOTO = 2;
     private final int PHOTO_SUCCESS = 3;
@@ -212,6 +259,8 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
 
 
 
+=======
+>>>>>>> origin/Branch_liujie
     private LinearLayout mEditTextList;
 
     private String mUserQuery;
@@ -227,6 +276,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
             return;
         }
         initResources();
+<<<<<<< HEAD
 
 
         final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn);
@@ -247,6 +297,10 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
 
 
 
+=======
+    }
+
+>>>>>>> origin/Branch_liujie
     /**
      * Current activity may be killed when the memory is low. Once it is killed, for another time
      * user load this activity, we should restore the former state
@@ -379,8 +433,47 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
          * is not ready
          */
         showAlertHeader();
+<<<<<<< HEAD
         convertToImage();
         showTopHeader();
+=======
+        //密码验证
+        final String mPassword = mWorkingNote.getmPassword();//读取数据库中的密码
+        if (mPassword!=null) {
+            //创建dialog，插入edittext，用户输入密码并做出检验。
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);
+            //编辑Text
+            final EditText etName = (EditText) view.findViewById(R.id.et_foler_name);
+            etName.setText("");
+            etName.setHint("请输入密码");
+            builder.setTitle("密码");
+            builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    //获取输入的字符串
+                    String password = etName.getText().toString();
+                    Log.d("mPassword: ", mPassword);
+                    Log.d("password: ", password);
+                    //判断密码正确性
+                    if (!password.equals(mPassword)) {
+                        Log.d("密码不正确,正确密码是：",mPassword);
+                        dialog.dismiss();
+                        onBackPressed();
+                    }
+                }
+            });
+            builder.setNegativeButton("cancel", new DialogInterface.OnClickListener(){
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    dialog.dismiss();
+                    onBackPressed();
+                }
+            });
+            final Dialog dialog = builder.setView(view).show();
+            dialog.show();
+        }
+>>>>>>> origin/Branch_liujie
     }
 
     private void showAlertHeader() {
@@ -397,6 +490,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         } else {
             mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
             mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
+<<<<<<< HEAD
         }
     }
 
@@ -407,6 +501,9 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         } else{
             mNoteHeaderHolder.tvToptext.setVisibility(View.GONE);
         }
+=======
+        };
+>>>>>>> origin/Branch_liujie
     }
 
     @Override
@@ -455,8 +552,13 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
                 || ev.getX() > (x + view.getWidth())
                 || ev.getY() < y
                 || ev.getY() > (y + view.getHeight())) {
+<<<<<<< HEAD
             return false;
         }
+=======
+                    return false;
+                }
+>>>>>>> origin/Branch_liujie
         return true;
     }
 
@@ -466,7 +568,10 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
         mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon);
         mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
+<<<<<<< HEAD
         mNoteHeaderHolder.tvToptext = (TextView) findViewById(R.id.tv_set_top);
+=======
+>>>>>>> origin/Branch_liujie
         mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
         mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
         mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
@@ -486,18 +591,26 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
         /**
          * HACKME: Fix bug of store the resource id in shared preference.
+<<<<<<< HEAD
          *          * The id may larger than the length of resources, in this case,
          *          * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
+=======
+         * The id may larger than the length of resources, in this case,
+         * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
+>>>>>>> origin/Branch_liujie
          */
         if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
             mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
         }
         mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
+<<<<<<< HEAD
 
 
         speech_sum();
         local_sel();
         translate();
+=======
+>>>>>>> origin/Branch_liujie
     }
 
     @Override
@@ -507,11 +620,16 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
             Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
         }
         clearSettingState();
+<<<<<<< HEAD
 
     }
 
 
 
+=======
+    }
+
+>>>>>>> origin/Branch_liujie
     private void updateWidget() {
         Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
         if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
@@ -524,7 +642,11 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         }
 
         intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
+<<<<<<< HEAD
                 mWorkingNote.getWidgetId()
+=======
+            mWorkingNote.getWidgetId()
+>>>>>>> origin/Branch_liujie
         });
 
         sendBroadcast(intent);
@@ -536,7 +658,11 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         if (id == R.id.btn_set_bg_color) {
             mNoteBgColorSelector.setVisibility(View.VISIBLE);
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
+<<<<<<< HEAD
                     View.VISIBLE);
+=======
+                    -                    View.VISIBLE);
+>>>>>>> origin/Branch_liujie
         } else if (sBgSelectorBtnsMap.containsKey(id)) {
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
                     View.GONE);
@@ -556,6 +682,49 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
             }
             mFontSizeSelector.setVisibility(View.GONE);
         }
+<<<<<<< HEAD
+=======
+        //添加设置密码的点击
+        if (id==R.id.m_locker){
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            final View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text,null);
+            //编辑Text
+            final EditText etName = (EditText)view.findViewById(R.id.et_foler_name);
+            etName.setText("");
+            etName.setHint("请输入密码");
+            builder.setTitle("为便签设置新密码");
+            builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                @TargetApi(Build.VERSION_CODES.CUPCAKE)
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    //获取输入的字符串
+                    String password = etName.getText().toString();
+                    //设置密码
+                    mWorkingNote.setPassword(password);
+                    //设置密码成功提示
+                    Toast.makeText(NoteEditActivity.this, "密码设置成功", Toast.LENGTH_SHORT).show();
+                    //关闭软键盘
+                    InputMethodManager inputMethodManager = (InputMethodManager)
+                            getSystemService(Context.INPUT_METHOD_SERVICE);
+                    inputMethodManager.hideSoftInputFromWindow(etName.getWindowToken(),0);
+                    //关闭dialog
+                    dialog.dismiss();
+                }
+            });
+            builder.setNegativeButton("cancel", new DialogInterface.OnClickListener() {
+                @TargetApi(Build.VERSION_CODES.CUPCAKE)
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    //关闭软键盘
+                    InputMethodManager inputMethodManager = (InputMethodManager)
+                            getSystemService(Context.INPUT_METHOD_SERVICE);
+                    inputMethodManager.hideSoftInputFromWindow(etName.getWindowToken(),0);
+                }
+            });
+            final Dialog dialog = builder.setView(view).show();
+            dialog.show();
+        }
+>>>>>>> origin/Branch_liujie
     }
 
     @Override
@@ -598,11 +767,14 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         } else {
             getMenuInflater().inflate(R.menu.note_edit, menu);
         }
+<<<<<<< HEAD
         if (mWorkingNote.getTopId() == 1 ) {
             menu.findItem(R.id.menu_set_top).setVisible(false);
         } else if(mWorkingNote.getTopId() == 0){
             menu.findItem(R.id.menu_cancel_top).setVisible(false);
         }
+=======
+>>>>>>> origin/Branch_liujie
         if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
             menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode);
         } else {
@@ -622,11 +794,28 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
             case R.id.menu_new_note:
                 createNewNote();
                 break;
+<<<<<<< HEAD
             case R.id.menu_set_top:
                 mWorkingNote.setTop((mWorkingNote.getTopId())==1 ? "0" : "1");
                 break;
             case R.id.menu_cancel_top:
                 mWorkingNote.setTop((mWorkingNote.getTopId())==0 ? "1" : "0");
+=======
+            case R.id.menu_count_word://数字统计
+                AlertDialog.Builder builder1 = new AlertDialog.Builder(this);//对话框对象
+                builder1.setIcon(android.R.drawable.ic_dialog_alert);//对话框图标
+                TextView content=(TextView)findViewById(R.id.note_edit_view);
+                int c =content.length();
+                builder1.setMessage("字数统计为："+ c);
+                builder1.setPositiveButton(android.R.string.ok,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                finish();
+                            }
+                        });//确定按钮
+                builder1.setNegativeButton(android.R.string.cancel, null);//取消按钮
+                builder1.show();//对话框启动
+>>>>>>> origin/Branch_liujie
                 break;
             case R.id.menu_delete:
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -664,9 +853,12 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
             case R.id.menu_delete_remind:
                 mWorkingNote.setAlertDate(0, false);
                 break;
+<<<<<<< HEAD
             case R.id.menu_font_select:
                 showSingleAlertDiglog();
                 break;
+=======
+>>>>>>> origin/Branch_liujie
             default:
                 break;
         }
@@ -732,6 +924,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
         return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
     }
 
+<<<<<<< HEAD
     public void onTopChanged(String Top){
         /**
          * User could set clock to an unsaved note, so before setting the
@@ -752,6 +945,8 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     }
 
 
+=======
+>>>>>>> origin/Branch_liujie
     public void onClockAlertChanged(long date, boolean set) {
         /**
          * User could set clock to an unsaved note, so before setting the
@@ -1010,6 +1205,7 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
     private void showToast(int resId, int duration) {
         Toast.makeText(this, resId, duration).show();
     }
+<<<<<<< HEAD
 
 
 
@@ -1615,3 +1811,6 @@ public class NoteEditActivity<关闭> extends AppCompatActivity implements OnCli
 }
 
 
+=======
+}
+>>>>>>> origin/Branch_liujie

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

@@ -37,7 +37,11 @@ import net.micode.notes.R;
 import java.util.HashMap;
 import java.util.Map;
 
+<<<<<<< HEAD
 public class NoteEditText extends android.support.v7.widget.AppCompatEditText {
+=======
+public class NoteEditText extends EditText {
+>>>>>>> origin/Branch_liujie
     private static final String TAG = "NoteEditText";
     private int mIndex;
     private int mSelectionStartBeforeDelete;

src/app/src/main/java/net/micode/notes/ui/NoteEditText.java.orig

@@ -0,0 +1,221 @@
+/*
+ * 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.ui;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.text.Layout;
+import android.text.Selection;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.style.URLSpan;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.KeyEvent;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.MotionEvent;
+import android.widget.EditText;
+
+import net.micode.notes.R;
+
+import java.util.HashMap;
+import java.util.Map;
+
+<<<<<<< HEAD
+public class NoteEditText extends android.support.v7.widget.AppCompatEditText {
+=======
+public class NoteEditText extends EditText {
+>>>>>>> origin/Branch_liujie
+    private static final String TAG = "NoteEditText";
+    private int mIndex;
+    private int mSelectionStartBeforeDelete;
+
+    private static final String SCHEME_TEL = "tel:" ;
+    private static final String SCHEME_HTTP = "http:" ;
+    private static final String SCHEME_EMAIL = "mailto:" ;
+
+    private static final Map<String, Integer> sSchemaActionResMap = new HashMap<String, Integer>();
+    static {
+        sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel);
+        sSchemaActionResMap.put(SCHEME_HTTP, R.string.note_link_web);
+        sSchemaActionResMap.put(SCHEME_EMAIL, R.string.note_link_email);
+    }
+
+    /**
+     * Call by the {@link NoteEditActivity} to delete or add edit text
+     */
+    public interface OnTextViewChangeListener {
+        /**
+         * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens
+         * and the text is null
+         */
+        void onEditTextDelete(int index, String text);
+
+        /**
+         * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER}
+         * happen
+         */
+        void onEditTextEnter(int index, String text);
+
+        /**
+         * Hide or show item option when text change
+         */
+        void onTextChange(int index, boolean hasText);
+    }
+
+    private OnTextViewChangeListener mOnTextViewChangeListener;
+
+    public NoteEditText(Context context) {
+        super(context, null);
+        mIndex = 0;
+    }
+
+    public void setIndex(int index) {
+        mIndex = index;
+    }
+
+    public void setOnTextViewChangeListener(OnTextViewChangeListener listener) {
+        mOnTextViewChangeListener = listener;
+    }
+
+    public NoteEditText(Context context, AttributeSet attrs) {
+        super(context, attrs, android.R.attr.editTextStyle);
+    }
+
+    public NoteEditText(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        // TODO Auto-generated constructor stub
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+
+                int x = (int) event.getX();
+                int y = (int) event.getY();
+                x -= getTotalPaddingLeft();
+                y -= getTotalPaddingTop();
+                x += getScrollX();
+                y += getScrollY();
+
+                Layout layout = getLayout();
+                int line = layout.getLineForVertical(y);
+                int off = layout.getOffsetForHorizontal(line, x);
+                Selection.setSelection(getText(), off);
+                break;
+        }
+
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_ENTER:
+                if (mOnTextViewChangeListener != null) {
+                    return false;
+                }
+                break;
+            case KeyEvent.KEYCODE_DEL:
+                mSelectionStartBeforeDelete = getSelectionStart();
+                break;
+            default:
+                break;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        switch(keyCode) {
+            case KeyEvent.KEYCODE_DEL:
+                if (mOnTextViewChangeListener != null) {
+                    if (0 == mSelectionStartBeforeDelete && mIndex != 0) {
+                        mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString());
+                        return true;
+                    }
+                } else {
+                    Log.d(TAG, "OnTextViewChangeListener was not seted");
+                }
+                break;
+            case KeyEvent.KEYCODE_ENTER:
+                if (mOnTextViewChangeListener != null) {
+                    int selectionStart = getSelectionStart();
+                    String text = getText().subSequence(selectionStart, length()).toString();
+                    setText(getText().subSequence(0, selectionStart));
+                    mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text);
+                } else {
+                    Log.d(TAG, "OnTextViewChangeListener was not seted");
+                }
+                break;
+            default:
+                break;
+        }
+        return super.onKeyUp(keyCode, event);
+    }
+
+    @Override
+    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
+        if (mOnTextViewChangeListener != null) {
+            if (!focused && TextUtils.isEmpty(getText())) {
+                mOnTextViewChangeListener.onTextChange(mIndex, false);
+            } else {
+                mOnTextViewChangeListener.onTextChange(mIndex, true);
+            }
+        }
+        super.onFocusChanged(focused, direction, previouslyFocusedRect);
+    }
+
+    @Override
+    protected void onCreateContextMenu(ContextMenu menu) {
+        if (getText() instanceof Spanned) {
+            int selStart = getSelectionStart();
+            int selEnd = getSelectionEnd();
+
+            int min = Math.min(selStart, selEnd);
+            int max = Math.max(selStart, selEnd);
+
+            final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class);
+            if (urls.length == 1) {
+                int defaultResId = 0;
+                for(String schema: sSchemaActionResMap.keySet()) {
+                    if(urls[0].getURL().indexOf(schema) >= 0) {
+                        defaultResId = sSchemaActionResMap.get(schema);
+                        break;
+                    }
+                }
+
+                if (defaultResId == 0) {
+                    defaultResId = R.string.note_link_other;
+                }
+
+                menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener(
+                        new OnMenuItemClickListener() {
+                            public boolean onMenuItemClick(MenuItem item) {
+                                // goto a new intent
+                                urls[0].onClick(NoteEditText.this);
+                                return true;
+                            }
+                        });
+            }
+        }
+        super.onCreateContextMenu(menu);
+    }
+}

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

@@ -40,7 +40,10 @@ public class NoteItemData {
         NoteColumns.TYPE,
         NoteColumns.WIDGET_ID,
         NoteColumns.WIDGET_TYPE,
+<<<<<<< HEAD
         NoteColumns.TOP,
+=======
+>>>>>>> origin/Branch_liujie
     };
 
     private static final int ID_COLUMN                    = 0;
@@ -55,7 +58,10 @@ public class NoteItemData {
     private static final int TYPE_COLUMN                  = 9;
     private static final int WIDGET_ID_COLUMN             = 10;
     private static final int WIDGET_TYPE_COLUMN           = 11;
+<<<<<<< HEAD
     private static final int TOP_ID_COLUMN                = 12;
+=======
+>>>>>>> origin/Branch_liujie
 
     private long mId;
     private long mAlertDate;
@@ -71,7 +77,10 @@ public class NoteItemData {
     private int mWidgetType;
     private String mName;
     private String mPhoneNumber;
+<<<<<<< HEAD
     private String mTop;
+=======
+>>>>>>> origin/Branch_liujie
 
     private boolean mIsLastItem;
     private boolean mIsFirstItem;
@@ -94,7 +103,10 @@ public class NoteItemData {
         mType = cursor.getInt(TYPE_COLUMN);
         mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
         mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
+<<<<<<< HEAD
         mTop = cursor.getString(TOP_ID_COLUMN);
+=======
+>>>>>>> origin/Branch_liujie
 
         mPhoneNumber = "";
         if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
@@ -138,6 +150,7 @@ public class NoteItemData {
         }
     }
 
+<<<<<<< HEAD
     public boolean isTOP() {
         if(mTop.equals("1")) {
             return true;
@@ -146,6 +159,8 @@ public class NoteItemData {
         }
     }
 
+=======
+>>>>>>> origin/Branch_liujie
     public boolean isOneFollowingFolder() {
         return mIsOneNoteFollowingFolder;
     }

src/app/src/main/java/net/micode/notes/ui/NoteItemData.java.orig

@@ -0,0 +1,251 @@
+/*
+ * 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.ui;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.text.TextUtils;
+
+import net.micode.notes.data.Contact;
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.tool.DataUtils;
+
+
+public class NoteItemData {
+    static final String [] PROJECTION = new String [] {
+        NoteColumns.ID,
+        NoteColumns.ALERTED_DATE,
+        NoteColumns.BG_COLOR_ID,
+        NoteColumns.CREATED_DATE,
+        NoteColumns.HAS_ATTACHMENT,
+        NoteColumns.MODIFIED_DATE,
+        NoteColumns.NOTES_COUNT,
+        NoteColumns.PARENT_ID,
+        NoteColumns.SNIPPET,
+        NoteColumns.TYPE,
+        NoteColumns.WIDGET_ID,
+        NoteColumns.WIDGET_TYPE,
+<<<<<<< HEAD
+        NoteColumns.TOP,
+=======
+>>>>>>> origin/Branch_liujie
+    };
+
+    private static final int ID_COLUMN                    = 0;
+    private static final int ALERTED_DATE_COLUMN          = 1;
+    private static final int BG_COLOR_ID_COLUMN           = 2;
+    private static final int CREATED_DATE_COLUMN          = 3;
+    private static final int HAS_ATTACHMENT_COLUMN        = 4;
+    private static final int MODIFIED_DATE_COLUMN         = 5;
+    private static final int NOTES_COUNT_COLUMN           = 6;
+    private static final int PARENT_ID_COLUMN             = 7;
+    private static final int SNIPPET_COLUMN               = 8;
+    private static final int TYPE_COLUMN                  = 9;
+    private static final int WIDGET_ID_COLUMN             = 10;
+    private static final int WIDGET_TYPE_COLUMN           = 11;
+<<<<<<< HEAD
+    private static final int TOP_ID_COLUMN                = 12;
+=======
+>>>>>>> origin/Branch_liujie
+
+    private long mId;
+    private long mAlertDate;
+    private int mBgColorId;
+    private long mCreatedDate;
+    private boolean mHasAttachment;
+    private long mModifiedDate;
+    private int mNotesCount;
+    private long mParentId;
+    private String mSnippet;
+    private int mType;
+    private int mWidgetId;
+    private int mWidgetType;
+    private String mName;
+    private String mPhoneNumber;
+<<<<<<< HEAD
+    private String mTop;
+=======
+>>>>>>> origin/Branch_liujie
+
+    private boolean mIsLastItem;
+    private boolean mIsFirstItem;
+    private boolean mIsOnlyOneItem;
+    private boolean mIsOneNoteFollowingFolder;
+    private boolean mIsMultiNotesFollowingFolder;
+
+    public NoteItemData(Context context, Cursor cursor) {
+        mId = cursor.getLong(ID_COLUMN);
+        mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
+        mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN);
+        mCreatedDate = cursor.getLong(CREATED_DATE_COLUMN);
+        mHasAttachment = (cursor.getInt(HAS_ATTACHMENT_COLUMN) > 0) ? true : false;
+        mModifiedDate = cursor.getLong(MODIFIED_DATE_COLUMN);
+        mNotesCount = cursor.getInt(NOTES_COUNT_COLUMN);
+        mParentId = cursor.getLong(PARENT_ID_COLUMN);
+        mSnippet = cursor.getString(SNIPPET_COLUMN);
+        mSnippet = mSnippet.replace(NoteEditActivity.TAG_CHECKED, "").replace(
+                NoteEditActivity.TAG_UNCHECKED, "");
+        mType = cursor.getInt(TYPE_COLUMN);
+        mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
+        mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
+<<<<<<< HEAD
+        mTop = cursor.getString(TOP_ID_COLUMN);
+=======
+>>>>>>> origin/Branch_liujie
+
+        mPhoneNumber = "";
+        if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
+            mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId);
+            if (!TextUtils.isEmpty(mPhoneNumber)) {
+                mName = Contact.getContact(context, mPhoneNumber);
+                if (mName == null) {
+                    mName = mPhoneNumber;
+                }
+            }
+        }
+
+        if (mName == null) {
+            mName = "";
+        }
+        checkPostion(cursor);
+    }
+
+    private void checkPostion(Cursor cursor) {
+        mIsLastItem = cursor.isLast() ? true : false;
+        mIsFirstItem = cursor.isFirst() ? true : false;
+        mIsOnlyOneItem = (cursor.getCount() == 1);
+        mIsMultiNotesFollowingFolder = false;
+        mIsOneNoteFollowingFolder = false;
+
+        if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {
+            int position = cursor.getPosition();
+            if (cursor.moveToPrevious()) {
+                if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
+                        || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {
+                    if (cursor.getCount() > (position + 1)) {
+                        mIsMultiNotesFollowingFolder = true;
+                    } else {
+                        mIsOneNoteFollowingFolder = true;
+                    }
+                }
+                if (!cursor.moveToNext()) {
+                    throw new IllegalStateException("cursor move to previous but can't move back");
+                }
+            }
+        }
+    }
+
+<<<<<<< HEAD
+    public boolean isTOP() {
+        if(mTop.equals("1")) {
+            return true;
+        }else {
+            return false;
+        }
+    }
+
+=======
+>>>>>>> origin/Branch_liujie
+    public boolean isOneFollowingFolder() {
+        return mIsOneNoteFollowingFolder;
+    }
+
+    public boolean isMultiFollowingFolder() {
+        return mIsMultiNotesFollowingFolder;
+    }
+
+    public boolean isLast() {
+        return mIsLastItem;
+    }
+
+    public String getCallName() {
+        return mName;
+    }
+
+    public boolean isFirst() {
+        return mIsFirstItem;
+    }
+
+    public boolean isSingle() {
+        return mIsOnlyOneItem;
+    }
+
+    public long getId() {
+        return mId;
+    }
+
+    public long getAlertDate() {
+        return mAlertDate;
+    }
+
+    public long getCreatedDate() {
+        return mCreatedDate;
+    }
+
+    public boolean hasAttachment() {
+        return mHasAttachment;
+    }
+
+    public long getModifiedDate() {
+        return mModifiedDate;
+    }
+
+    public int getBgColorId() {
+        return mBgColorId;
+    }
+
+    public long getParentId() {
+        return mParentId;
+    }
+
+    public int getNotesCount() {
+        return mNotesCount;
+    }
+
+    public long getFolderId () {
+        return mParentId;
+    }
+
+    public int getType() {
+        return mType;
+    }
+
+    public int getWidgetType() {
+        return mWidgetType;
+    }
+
+    public int getWidgetId() {
+        return mWidgetId;
+    }
+
+    public String getSnippet() {
+        return mSnippet;
+    }
+
+    public boolean hasAlert() {
+        return (mAlertDate > 0);
+    }
+
+    public boolean isCallRecord() {
+        return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
+    }
+
+    public static int getNoteType(Cursor cursor) {
+        return cursor.getInt(TYPE_COLUMN);
+    }
+}

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

@@ -17,7 +17,10 @@
 package net.micode.notes.ui;
 
 import android.app.Activity;
+<<<<<<< HEAD
 import android.support.v7.app.AppCompatActivity;
+=======
+>>>>>>> origin/Branch_liujie
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.appwidget.AppWidgetManager;
@@ -79,7 +82,13 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.HashSet;
 
+<<<<<<< HEAD
 public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener {
+=======
+public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
+    public static int secret_mode = 0;
+
+>>>>>>> origin/Branch_liujie
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
     private static final int FOLDER_LIST_QUERY_TOKEN      = 1;
@@ -136,14 +145,20 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
     private final static int REQUEST_CODE_OPEN_NODE = 102;
     private final static int REQUEST_CODE_NEW_NODE  = 103;
 
+<<<<<<< HEAD
     static Activity NoteListActivity;
 
+=======
+>>>>>>> origin/Branch_liujie
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.note_list);
+<<<<<<< HEAD
         NoteListActivity = this;
 
+=======
+>>>>>>> origin/Branch_liujie
         initResources();
 
         /**
@@ -416,10 +431,42 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
     private void startAsyncNotesListQuery() {
         String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
                 : NORMAL_SELECTION;
+<<<<<<< HEAD
         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");
+=======
+        if(secret_mode == 0) {
+            mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+                    Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{
+                            String.valueOf(mCurrentFolderId)
+                    }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+        }
+        else{
+            String str1 = "5201314";
+            String [] PROJECTION = new String [] {  //定义一个新的PROJECTION数组，只换掉SNIPPET
+                    NoteColumns.ID,
+                    NoteColumns.ALERTED_DATE,
+                    NoteColumns.BG_COLOR_ID,
+                    NoteColumns.CREATED_DATE,
+                    NoteColumns.HAS_ATTACHMENT,
+                    NoteColumns.MODIFIED_DATE,
+                    NoteColumns.NOTES_COUNT,
+                    NoteColumns.PARENT_ID,
+//                    NoteColumns.SNIPPET,
+                    str1,
+                    NoteColumns.TYPE,
+                    NoteColumns.WIDGET_ID,
+                    NoteColumns.WIDGET_TYPE,
+            };
+            mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+                    Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{
+                            String.valueOf(mCurrentFolderId)
+                    }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+
+        }
+>>>>>>> origin/Branch_liujie
     }
 
     private final class BackgroundQueryHandler extends AsyncQueryHandler {
@@ -768,6 +815,10 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.clear();
+<<<<<<< HEAD
+=======
+
+>>>>>>> origin/Branch_liujie
         if (mState == ListEditState.NOTE_LIST) {
             getMenuInflater().inflate(R.menu.note_list, menu);
             // set sync or sync_cancel
@@ -790,6 +841,51 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
                 showCreateOrModifyFolderDialog(true);
                 break;
             }
+<<<<<<< HEAD
+=======
+            case R.id.menu_secret: {    //进入私密模式
+                secret_mode = 1;
+                AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
+                dialog.setTitle("重要提醒");
+                dialog.setMessage("您确认进入私密模式吗？");
+                dialog.setCancelable(false);
+                dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        startAsyncNotesListQuery();
+                        Toast.makeText(NotesListActivity.this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
+                    }
+                });
+                dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which){}
+                });
+                dialog.show();
+                startAsyncNotesListQuery();
+                Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
+                break;
+            }
+            case R.id.menu_quit_secret:{    //退出私密模式
+                secret_mode = 0;
+                AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
+                dialog.setTitle("重要提醒");
+                dialog.setMessage("您确认退出私密模式吗？");
+                dialog.setCancelable(false);
+                dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        startAsyncNotesListQuery();
+                        Toast.makeText(NotesListActivity.this,"您已退出私密模式",Toast.LENGTH_SHORT).show();
+                    }
+                });
+                dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which){}
+                });
+                dialog.show();
+                break;
+            }
+>>>>>>> origin/Branch_liujie
             case R.id.menu_export_text: {
                 exportNoteToText();
                 break;

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

@@ -37,7 +37,10 @@ public class NotesListItem extends LinearLayout {
     private TextView mCallName;
     private NoteItemData mItemData;
     private CheckBox mCheckBox;
+<<<<<<< HEAD
     private ImageView mTop;
+=======
+>>>>>>> origin/Branch_liujie
 
     public NotesListItem(Context context) {
         super(context);
@@ -47,7 +50,10 @@ public class NotesListItem extends LinearLayout {
         mTime = (TextView) findViewById(R.id.tv_time);
         mCallName = (TextView) findViewById(R.id.tv_name);
         mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
+<<<<<<< HEAD
         mTop = (ImageView) findViewById(R.id.iv_top_icon);
+=======
+>>>>>>> origin/Branch_liujie
     }
 
     public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
@@ -95,20 +101,26 @@ public class NotesListItem extends LinearLayout {
                     mAlert.setVisibility(View.GONE);
                 }
             }
+<<<<<<< HEAD
             if(data.isTOP()){
                 mTop.setImageResource(R.drawable.menu_top);
                 mTop.setVisibility(View.VISIBLE);
             } else{
                 mTop.setVisibility((View.GONE));
             }
+=======
+>>>>>>> origin/Branch_liujie
         }
         mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
 
         setBackground(data);
     }
 
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> origin/Branch_liujie
     private void setBackground(NoteItemData data) {
         int id = data.getBgColorId();
         if (data.getType() == Notes.TYPE_NOTE) {

src/app/src/main/java/net/micode/notes/ui/NotesListItem.java.orig

@@ -0,0 +1,144 @@
+/*
+ * 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.ui;
+
+import android.content.Context;
+import android.text.format.DateUtils;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.tool.DataUtils;
+import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
+
+
+public class NotesListItem extends LinearLayout {
+    private ImageView mAlert;
+    private TextView mTitle;
+    private TextView mTime;
+    private TextView mCallName;
+    private NoteItemData mItemData;
+    private CheckBox mCheckBox;
+<<<<<<< HEAD
+    private ImageView mTop;
+=======
+>>>>>>> origin/Branch_liujie
+
+    public NotesListItem(Context context) {
+        super(context);
+        inflate(context, R.layout.note_item, this);
+        mAlert = (ImageView) findViewById(R.id.iv_alert_icon);
+        mTitle = (TextView) findViewById(R.id.tv_title);
+        mTime = (TextView) findViewById(R.id.tv_time);
+        mCallName = (TextView) findViewById(R.id.tv_name);
+        mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
+<<<<<<< HEAD
+        mTop = (ImageView) findViewById(R.id.iv_top_icon);
+=======
+>>>>>>> origin/Branch_liujie
+    }
+
+    public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
+        if (choiceMode && data.getType() == Notes.TYPE_NOTE) {
+            mCheckBox.setVisibility(View.VISIBLE);
+            mCheckBox.setChecked(checked);
+        } else {
+            mCheckBox.setVisibility(View.GONE);
+        }
+
+        mItemData = data;
+        if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
+            mCallName.setVisibility(View.GONE);
+            mAlert.setVisibility(View.VISIBLE);
+            mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
+            mTitle.setText(context.getString(R.string.call_record_folder_name)
+                    + context.getString(R.string.format_folder_files_count, data.getNotesCount()));
+            mAlert.setImageResource(R.drawable.call_record);
+        } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) {
+            mCallName.setVisibility(View.VISIBLE);
+            mCallName.setText(data.getCallName());
+            mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem);
+            mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
+            if (data.hasAlert()) {
+                mAlert.setImageResource(R.drawable.clock);
+                mAlert.setVisibility(View.VISIBLE);
+            } else {
+                mAlert.setVisibility(View.GONE);
+            }
+        } else {
+            mCallName.setVisibility(View.GONE);
+            mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
+
+            if (data.getType() == Notes.TYPE_FOLDER) {
+                mTitle.setText(data.getSnippet()
+                        + context.getString(R.string.format_folder_files_count,
+                                data.getNotesCount()));
+                mAlert.setVisibility(View.GONE);
+            } else {
+                mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
+                if (data.hasAlert()) {
+                    mAlert.setImageResource(R.drawable.clock);
+                    mAlert.setVisibility(View.VISIBLE);
+                } else {
+                    mAlert.setVisibility(View.GONE);
+                }
+            }
+<<<<<<< HEAD
+            if(data.isTOP()){
+                mTop.setImageResource(R.drawable.menu_top);
+                mTop.setVisibility(View.VISIBLE);
+            } else{
+                mTop.setVisibility((View.GONE));
+            }
+=======
+>>>>>>> origin/Branch_liujie
+        }
+        mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
+
+        setBackground(data);
+    }
+
+<<<<<<< HEAD
+
+
+=======
+>>>>>>> origin/Branch_liujie
+    private void setBackground(NoteItemData data) {
+        int id = data.getBgColorId();
+        if (data.getType() == Notes.TYPE_NOTE) {
+            if (data.isSingle() || data.isOneFollowingFolder()) {
+                setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id));
+            } else if (data.isLast()) {
+                setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id));
+            } else if (data.isFirst() || data.isMultiFollowingFolder()) {
+                setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id));
+            } else {
+                setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id));
+            }
+        } else {
+            setBackgroundResource(NoteItemBgResources.getFolderBgRes());
+        }
+    }
+
+    public NoteItemData getItemData() {
+        return mItemData;
+    }
+}

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

@@ -19,4 +19,8 @@
   <item android:state_pressed="true" android:color="#88555555" />
   <item android:state_selected="true" android:color="#ff999999" />
   <item android:color="#ff000000" />
+<<<<<<< HEAD
 </selector>
+=======
+</selector>
+>>>>>>> origin/Branch_liujie

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true" android:color="#88555555" />
+  <item android:state_selected="true" android:color="#ff999999" />
+  <item android:color="#ff000000" />
+<<<<<<< HEAD
+</selector>
+=======
+</selector>
+>>>>>>> origin/Branch_liujie

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

@@ -17,6 +17,10 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:color="#50000000" />
+<<<<<<< HEAD
 </selector>
 
 
+=======
+</selector>
+>>>>>>> origin/Branch_liujie

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="#50000000" />
+<<<<<<< HEAD
+</selector>
+
+
+=======
+</selector>
+>>>>>>> origin/Branch_liujie

src/app/src/main/res/layout/account_dialog_title.xml

@@ -15,15 +15,24 @@
      limitations under the License.
 -->
 
+<<<<<<< HEAD
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical">
+=======
+<LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+>>>>>>> origin/Branch_liujie
 
     <TextView
         android:id="@+id/account_dialog_title"
         style="?android:attr/textAppearanceMedium"
+<<<<<<< HEAD
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="-2.7dip"
@@ -31,6 +40,15 @@
         android:ellipsize="end"
         android:gravity="center"
         android:singleLine="true" />
+=======
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:layout_marginTop="-2.7dip"
+        android:layout_marginBottom="-2.7dip"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"/>
+>>>>>>> origin/Branch_liujie
 
     <TextView
         android:id="@+id/account_dialog_subtitle"
@@ -38,6 +56,10 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="5dip"
         android:layout_marginBottom="1dip"
+<<<<<<< HEAD
         android:gravity="center" />
+=======
+        android:gravity="center"/>
+>>>>>>> origin/Branch_liujie
 
 </LinearLayout>

src/app/src/main/res/layout/account_dialog_title.xml.orig

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<<<<<<< HEAD
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+=======
+<LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+>>>>>>> origin/Branch_liujie
+
+    <TextView
+        android:id="@+id/account_dialog_title"
+        style="?android:attr/textAppearanceMedium"
+<<<<<<< HEAD
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-2.7dip"
+        android:layout_marginBottom="-2.7dip"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:singleLine="true" />
+=======
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:layout_marginTop="-2.7dip"
+        android:layout_marginBottom="-2.7dip"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"/>
+>>>>>>> origin/Branch_liujie
+
+    <TextView
+        android:id="@+id/account_dialog_subtitle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="1dip"
+<<<<<<< HEAD
+        android:gravity="center" />
+=======
+        android:gravity="center"/>
+>>>>>>> origin/Branch_liujie
+
+</LinearLayout>

src/app/src/main/res/layout/note_edit.xml

@@ -15,7 +15,11 @@
      limitations under the License.
 -->
 
+<<<<<<< HEAD
 <FrameLayout xmlns:tools="http://schemas.android.com/tools"
+=======
+<FrameLayout
+>>>>>>> origin/Branch_liujie
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@drawable/list_background"
@@ -26,6 +30,7 @@
         android:layout_height="fill_parent"
         android:orientation="vertical">
 
+<<<<<<< HEAD
 
         <TextView
             android:id="@+id/local_sel"
@@ -33,11 +38,14 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center" />
 
+=======
+>>>>>>> origin/Branch_liujie
         <LinearLayout
             android:id="@+id/note_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
 
+<<<<<<< HEAD
 
 
 
@@ -64,6 +72,8 @@
 
 
 
+=======
+>>>>>>> origin/Branch_liujie
             <TextView
                 android:id="@+id/tv_modified_date"
                 android:layout_width="0dip"
@@ -89,6 +99,7 @@
                 android:layout_marginRight="8dip"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
+<<<<<<< HEAD
             <ImageView
                 android:id="@+id/btn_set_bg_color"
                 android:layout_width="wrap_content"
@@ -106,6 +117,13 @@
                 android:layout_marginRight="8dip"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
+=======
+            <ImageButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:background="@drawable/bg_btn_set_color" />
+>>>>>>> origin/Branch_liujie
         </LinearLayout>
 
         <LinearLayout
@@ -130,8 +148,12 @@
 
                 <LinearLayout
                     android:layout_width="fill_parent"
+<<<<<<< HEAD
                     android:layout_height="fill_parent"
                     android:orientation="horizontal">
+=======
+                    android:layout_height="fill_parent">
+>>>>>>> origin/Branch_liujie
 
                     <net.micode.notes.ui.NoteEditText
                         android:id="@+id/note_edit_view"
@@ -155,6 +177,7 @@
                 </LinearLayout>
             </ScrollView>
 
+<<<<<<< HEAD
             <TextView
                 android:id="@+id/num_word"
                 android:layout_width="match_parent"
@@ -168,6 +191,8 @@
                 android:layout_gravity="right"
                 android:text="点击获得地理信息"/>
 
+=======
+>>>>>>> origin/Branch_liujie
             <ImageView
                 android:layout_width="fill_parent"
                 android:layout_height="7dip"
@@ -176,6 +201,10 @@
     </LinearLayout>
 
     <ImageView
+<<<<<<< HEAD
+=======
+        android:id="@+id/btn_set_bg_color"
+>>>>>>> origin/Branch_liujie
         android:layout_height="43dip"
         android:layout_width="wrap_content"
         android:background="@drawable/bg_color_btn_mask"

src/app/src/main/res/layout/note_edit.xml.orig

@@ -0,0 +1,487 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<<<<<<< HEAD
+<FrameLayout xmlns:tools="http://schemas.android.com/tools"
+=======
+<FrameLayout
+>>>>>>> origin/Branch_liujie
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@drawable/list_background"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
+
+<<<<<<< HEAD
+
+        <TextView
+            android:id="@+id/local_sel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+=======
+>>>>>>> origin/Branch_liujie
+        <LinearLayout
+            android:id="@+id/note_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+<<<<<<< HEAD
+
+
+
+            <Button
+                android:id="@+id/iatBtn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="#6AE48E8E"
+                android:text="朗读"
+                android:visibility="visible" />
+
+            <Button
+                android:id="@+id/translate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="#61B8F1F8"
+                android:text="翻译" />
+
+            <ImageButton
+                android:id="@+id/add_img_btn"
+                android:layout_width="45dp"
+                android:layout_height="match_parent"
+                android:src="@android:drawable/ic_menu_gallery" />
+
+
+
+=======
+>>>>>>> origin/Branch_liujie
+            <TextView
+                android:id="@+id/tv_modified_date"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="left|center_vertical"
+                android:layout_marginRight="8dip"
+                android:textAppearance="@style/TextAppearanceSecondaryItem" />
+
+            <ImageView
+                android:id="@+id/iv_alert_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:background="@drawable/title_alert" />
+
+            <TextView
+                android:id="@+id/tv_alert_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="2dip"
+                android:layout_marginRight="8dip"
+                android:textAppearance="@style/TextAppearanceSecondaryItem" />
+
+<<<<<<< HEAD
+            <ImageView
+                android:id="@+id/btn_set_bg_color"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:padding="10dp"
+                android:background="@drawable/bg_btn_set_color" />
+
+            <TextView
+                android:id="@+id/tv_set_top"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="2dip"
+                android:layout_marginRight="8dip"
+                android:textAppearance="@style/TextAppearanceSecondaryItem" />
+
+=======
+            <ImageButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:background="@drawable/bg_btn_set_color" />
+>>>>>>> origin/Branch_liujie
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/sv_note_edit"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="fill_parent"
+                android:layout_height="7dip"
+                android:background="@drawable/bg_color_btn_mask" />
+
+            <ScrollView
+                android:layout_width="fill_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1"
+                android:scrollbars="none"
+                android:overScrollMode="never"
+                android:layout_gravity="left|top"
+                android:fadingEdgeLength="0dip">
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+<<<<<<< HEAD
+                    android:layout_height="fill_parent"
+                    android:orientation="horizontal">
+=======
+                    android:layout_height="fill_parent">
+>>>>>>> origin/Branch_liujie
+
+                    <net.micode.notes.ui.NoteEditText
+                        android:id="@+id/note_edit_view"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="left|top"
+                        android:background="@null"
+                        android:autoLink="all"
+                        android:linksClickable="false"
+                        android:minLines="12"
+                        android:textAppearance="@style/TextAppearancePrimaryItem"
+                        android:lineSpacingMultiplier="1.2" />
+
+                    <LinearLayout
+                        android:id="@+id/note_edit_list"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:layout_marginLeft="-10dip"
+                        android:visibility="gone" />
+                </LinearLayout>
+            </ScrollView>
+
+<<<<<<< HEAD
+            <TextView
+                android:id="@+id/num_word"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                 />
+
+            <Button
+                android:id="@+id/location"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:text="点击获得地理信息"/>
+
+=======
+>>>>>>> origin/Branch_liujie
+            <ImageView
+                android:layout_width="fill_parent"
+                android:layout_height="7dip"
+                android:background="@drawable/bg_color_btn_mask" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <ImageView
+<<<<<<< HEAD
+=======
+        android:id="@+id/btn_set_bg_color"
+>>>>>>> origin/Branch_liujie
+        android:layout_height="43dip"
+        android:layout_width="wrap_content"
+        android:background="@drawable/bg_color_btn_mask"
+        android:layout_gravity="top|right" />
+
+    <LinearLayout
+        android:id="@+id/note_bg_color_selector"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/note_edit_color_selector_panel"
+        android:layout_marginTop="30dip"
+        android:layout_marginRight="8dip"
+        android:layout_gravity="top|right"
+        android:visibility="gone">
+
+        <FrameLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_bg_yellow"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/iv_bg_yellow_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:layout_marginRight="5dip"
+                android:focusable="false"
+                android:visibility="gone"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_bg_blue"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/iv_bg_blue_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:layout_marginRight="3dip"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_bg_white"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/iv_bg_white_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:layout_marginRight="2dip"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_bg_green"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/iv_bg_green_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_bg_red"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/iv_bg_red_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/font_size_selector"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/font_size_selector_bg"
+        android:layout_gravity="bottom"
+        android:visibility="gone">
+
+        <FrameLayout
+            android:id="@+id/ll_font_small"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="center"
+                android:gravity="center">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/font_small"
+                    android:layout_marginBottom="5dip" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/menu_font_small"
+                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/iv_small_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:layout_marginRight="6dip"
+                android:layout_marginBottom="-7dip"
+                android:focusable="false"
+                android:visibility="gone"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/ll_font_normal"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="center"
+                android:gravity="center">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/font_normal"
+                    android:layout_marginBottom="5dip" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/menu_font_normal"
+                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/iv_medium_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:layout_marginRight="6dip"
+                android:layout_marginBottom="-7dip"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/ll_font_large"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="center"
+                android:gravity="center">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/font_large"
+                    android:layout_marginBottom="5dip" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/menu_font_large"
+                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/iv_large_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:layout_marginRight="6dip"
+                android:layout_marginBottom="-7dip"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/ll_font_super"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="center"
+                android:gravity="center">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/font_super"
+                    android:layout_marginBottom="5dip" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/menu_font_super"
+                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/iv_super_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:layout_marginRight="6dip"
+                android:layout_marginBottom="-7dip"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>

src/app/src/main/res/layout/note_item.xml

@@ -75,6 +75,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right"/>
+<<<<<<< HEAD
 
     <ImageView
         android:id="@+id/iv_top_icon"
@@ -83,4 +84,6 @@
         android:layout_gravity="top|right"
         android:layout_marginRight="40sp" />
 
+=======
+>>>>>>> origin/Branch_liujie
 </FrameLayout>

src/app/src/main/res/layout/note_item.xml.orig

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/note_item"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:gravity="center_vertical">
+
+        <LinearLayout
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="0dip"
+                android:layout_weight="1"
+                android:textAppearance="@style/TextAppearancePrimaryItem"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical">
+
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/tv_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/TextAppearanceSecondaryItem" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <CheckBox
+            android:id="@android:id/checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:focusable="false"
+            android:clickable="false"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/iv_alert_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|right"/>
+<<<<<<< HEAD
+
+    <ImageView
+        android:id="@+id/iv_top_icon"
+        android:layout_width="17dp"
+        android:layout_height="17dp"
+        android:layout_gravity="top|right"
+        android:layout_marginRight="40sp" />
+
+=======
+>>>>>>> origin/Branch_liujie
+</FrameLayout>

src/app/src/main/res/layout/note_list.xml

@@ -39,6 +39,7 @@
 
         <ListView
             android:id="@+id/notes_list"
+<<<<<<< HEAD
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
@@ -46,13 +47,30 @@
             android:divider="@null"
             android:fadingEdge="@null"
             android:listSelector="@android:color/transparent" />
+=======
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:cacheColorHint="@null"
+            android:listSelector="@android:color/transparent"
+            android:divider="@null"
+            android:fadingEdge="@null" />
+>>>>>>> origin/Branch_liujie
     </LinearLayout>
 
     <Button
         android:id="@+id/btn_new_note"
+<<<<<<< HEAD
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:background="@drawable/new_note"
         android:focusable="false" />
+=======
+        android:background="@drawable/new_note"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="false"
+        android:layout_gravity="bottom" />
+>>>>>>> origin/Branch_liujie
 </FrameLayout>

src/app/src/main/res/layout/note_list.xml.orig

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@drawable/list_background">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_title_bar"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/title_bar_bg"
+            android:visibility="gone"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textColor="#FFEAD1AE"
+            android:textSize="@dimen/text_font_size_medium" />
+
+        <ListView
+            android:id="@+id/notes_list"
+<<<<<<< HEAD
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:cacheColorHint="@null"
+            android:divider="@null"
+            android:fadingEdge="@null"
+            android:listSelector="@android:color/transparent" />
+=======
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:cacheColorHint="@null"
+            android:listSelector="@android:color/transparent"
+            android:divider="@null"
+            android:fadingEdge="@null" />
+>>>>>>> origin/Branch_liujie
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_new_note"
+<<<<<<< HEAD
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="@drawable/new_note"
+        android:focusable="false" />
+=======
+        android:background="@drawable/new_note"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="false"
+        android:layout_gravity="bottom" />
+>>>>>>> origin/Branch_liujie
+</FrameLayout>

src/app/src/main/res/menu/call_note_edit.xml

@@ -45,8 +45,11 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+<<<<<<< HEAD
 
     <item
         android:id="@+id/menu_make_password"
         android:title="@string/menu_set_password" />
+=======
+>>>>>>> origin/Branch_liujie
 </menu>

src/app/src/main/res/menu/call_note_edit.xml.orig

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_delete"
+        android:title="@string/menu_delete" />
+
+    <item
+        android:id="@+id/menu_font_size"
+        android:title="@string/menu_font_size"/>
+
+    <item
+        android:id="@+id/menu_list_mode"
+        android:title="@string/menu_list_mode" />
+
+    <item
+        android:id="@+id/menu_share"
+        android:title="@string/menu_share"/>
+
+    <item
+        android:id="@+id/menu_send_to_desktop"
+        android:title="@string/menu_send_to_desktop"/>
+
+    <item
+        android:id="@+id/menu_alert"
+        android:title="@string/menu_alert" />
+
+    <item
+        android:id="@+id/menu_delete_remind"
+        android:title="@string/menu_remove_remind" />
+<<<<<<< HEAD
+
+    <item
+        android:id="@+id/menu_make_password"
+        android:title="@string/menu_set_password" />
+=======
+>>>>>>> origin/Branch_liujie
+</menu>

src/app/src/main/res/menu/note_edit.xml

@@ -23,6 +23,7 @@
         android:title="@string/notelist_menu_new"/>
 
     <item
+<<<<<<< HEAD
         android:id="@+id/menu_set_top"
         android:title="@string/menu_set_top"/>
 
@@ -31,11 +32,17 @@
         android:title="@string/menu_cancel_top"/>
 
     <item
+=======
+>>>>>>> origin/Branch_liujie
         android:id="@+id/menu_delete"
         android:title="@string/menu_delete"/>
 
     <item
+<<<<<<< HEAD
         android:id="@+id/menu_setFont_size"
+=======
+        android:id="@+id/menu_font_size"
+>>>>>>> origin/Branch_liujie
         android:title="@string/menu_font_size"/>
 
     <item
@@ -59,6 +66,20 @@
         android:title="@string/menu_remove_remind" />
 
     <item
+<<<<<<< HEAD
         android:id="@+id/menu_font_select"
         android:title="@string/menu_font_style" />
+=======
+        android:id="@+id/menu_count_word"
+        android:title="@string/menu_count_word" />
+
+    <item
+        android:id="@+id/menu_set_passcode"
+        android:title="@string/menu_set_passcode"/>
+
+    <item
+        android:id="@+id/menu_delete_passcode"
+        android:title="@string/menu_delete_passcode"/>
+
+>>>>>>> origin/Branch_liujie
 </menu>

src/app/src/main/res/menu/note_edit.xml.orig

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_new_note"
+        android:title="@string/notelist_menu_new"/>
+
+    <item
+<<<<<<< HEAD
+        android:id="@+id/menu_set_top"
+        android:title="@string/menu_set_top"/>
+
+    <item
+        android:id="@+id/menu_cancel_top"
+        android:title="@string/menu_cancel_top"/>
+
+    <item
+=======
+>>>>>>> origin/Branch_liujie
+        android:id="@+id/menu_delete"
+        android:title="@string/menu_delete"/>
+
+    <item
+<<<<<<< HEAD
+        android:id="@+id/menu_setFont_size"
+=======
+        android:id="@+id/menu_font_size"
+>>>>>>> origin/Branch_liujie
+        android:title="@string/menu_font_size"/>
+
+    <item
+        android:id="@+id/menu_list_mode"
+        android:title="@string/menu_list_mode" />
+
+    <item
+        android:id="@+id/menu_share"
+        android:title="@string/menu_share"/>
+
+    <item
+        android:id="@+id/menu_send_to_desktop"
+        android:title="@string/menu_send_to_desktop"/>
+
+    <item
+        android:id="@+id/menu_alert"
+        android:title="@string/menu_alert" />
+
+    <item
+        android:id="@+id/menu_delete_remind"
+        android:title="@string/menu_remove_remind" />
+
+    <item
+<<<<<<< HEAD
+        android:id="@+id/menu_font_select"
+        android:title="@string/menu_font_style" />
+=======
+        android:id="@+id/menu_count_word"
+        android:title="@string/menu_count_word" />
+
+    <item
+        android:id="@+id/menu_set_passcode"
+        android:title="@string/menu_set_passcode"/>
+
+    <item
+        android:id="@+id/menu_delete_passcode"
+        android:title="@string/menu_delete_passcode"/>
+
+>>>>>>> origin/Branch_liujie
+</menu>

src/app/src/main/res/menu/note_list.xml

@@ -36,4 +36,17 @@
     <item
         android:id="@+id/menu_search"
         android:title="@string/menu_search"/>
+<<<<<<< HEAD
+=======
+
+    <item
+        android:id="@+id/menu_secret"
+        android:title="@string/menu_secret"/>
+
+    <item
+        android:id="@+id/menu_quit_secret"
+        android:title="@string/menu_quit_secret"/>
+
+
+>>>>>>> origin/Branch_liujie
 </menu>

src/app/src/main/res/menu/note_list.xml.orig

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_new_folder"
+        android:title="@string/menu_create_folder"/>
+
+    <item
+        android:id="@+id/menu_export_text"
+        android:title="@string/menu_export_text"/>
+
+    <item
+        android:id="@+id/menu_sync"
+        android:title="@string/menu_sync"/>
+
+    <item
+        android:id="@+id/menu_setting"
+        android:title="@string/menu_setting" />
+
+    <item
+        android:id="@+id/menu_search"
+        android:title="@string/menu_search"/>
+<<<<<<< HEAD
+=======
+
+    <item
+        android:id="@+id/menu_secret"
+        android:title="@string/menu_secret"/>
+
+    <item
+        android:id="@+id/menu_quit_secret"
+        android:title="@string/menu_quit_secret"/>
+
+
+>>>>>>> origin/Branch_liujie
+</menu>

src/app/src/main/res/menu/note_list_options.xml

@@ -16,12 +16,20 @@
 -->
 
 <menu
+<<<<<<< HEAD
     xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android">
+=======
+    xmlns:android="http://schemas.android.com/apk/res/android">
+>>>>>>> origin/Branch_liujie
     <item
         android:id="@+id/move"
         android:title="@string/menu_move"
         android:icon="@drawable/menu_move"
+<<<<<<< HEAD
         app:showAsAction="always|withText" />
+=======
+        android:showAsAction="always|withText" />
+>>>>>>> origin/Branch_liujie
 
     <item
         android:id="@+id/delete"

src/app/src/main/res/menu/note_list_options.xml.orig

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<menu
+<<<<<<< HEAD
+    xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android">
+=======
+    xmlns:android="http://schemas.android.com/apk/res/android">
+>>>>>>> origin/Branch_liujie
+    <item
+        android:id="@+id/move"
+        android:title="@string/menu_move"
+        android:icon="@drawable/menu_move"
+<<<<<<< HEAD
+        app:showAsAction="always|withText" />
+=======
+        android:showAsAction="always|withText" />
+>>>>>>> origin/Branch_liujie
+
+    <item
+        android:id="@+id/delete"
+        android:title="@string/menu_delete"
+        android:icon="@drawable/menu_delete"
+        android:showAsAction="always|withText" />
+</menu>

src/app/src/main/res/menu/sub_folder.xml

@@ -23,6 +23,15 @@
         android:title="@string/notelist_menu_new"/>
 
     <item
+<<<<<<< HEAD
         android:id="@+id/menu_key"
         android:title="@string/notelist_menu_key"/>
+=======
+        android:id="@+id/menu_secret"
+        android:title="@string/menu_secret"/>
+
+    <item
+        android:id="@+id/menu_quit_secret"
+        android:title="@string/menu_quit_secret"/>
+>>>>>>> origin/Branch_liujie
 </menu>

src/app/src/main/res/menu/sub_folder.xml.orig

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_new_note"
+        android:title="@string/notelist_menu_new"/>
+
+    <item
+<<<<<<< HEAD
+        android:id="@+id/menu_key"
+        android:title="@string/notelist_menu_key"/>
+=======
+        android:id="@+id/menu_secret"
+        android:title="@string/menu_secret"/>
+
+    <item
+        android:id="@+id/menu_quit_secret"
+        android:title="@string/menu_quit_secret"/>
+>>>>>>> origin/Branch_liujie
+</menu>

src/app/src/main/res/values-ko-rKR/arrays.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<resources>
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array>
+</resources>

src/app/src/main/res/values-ko-rKR/strings.xml

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">메일</string>
+    <string name="menu_count_word">단어 수를 계산합니다</string>
+    <string name="menu_set_passcode">암호를 설정하세요</string>
+    <string name="menu_delete_passcode">비밀번호 삭제</string>
+    <string name="menu_secret">개인 정보 보호 모드</string>
+    <string name="menu_quit_secret">비공개 모드를 종료합니다</string>
+    <string name="app_widget2x2">메일 2x2</string>
+    <string name="app_widget4x4">메일 4x4</string>
+    <string name="widget_havenot_content">연합되는 주를 창조하기 위하여 찾아내는 연합되는 주 없음, 누르기.</string>
+    <string name="widget_under_visit_mode">기밀 형태는, 주 내용을 볼 수 없다</string>
+    <string name="notelist_string_info">...</string>
+    <string name="notelist_menu_new">새 메모</string>
+    <string name="delete_remind_time_message">미리 알림 성공적으로 삭제</string>
+    <string name="set_remind_time_message">알람 생성</string>
+    <string name="note_alert_expired">기간이 만료됨</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MMMd kk:mm</string>
+    <string name="notealert_ok">알겠어요</string>
+    <string name="notealert_enter">보기</string>
+    <string name="note_link_tel">호출 전화</string>
+    <string name="note_link_email">전자 우편 보내기</string>
+    <string name="note_link_web">웹 페이지 찾아보기</string>
+    <string name="note_link_other">지도 열기</string>
+    <!-- Text export file information -->
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
+    <!-- notes list string -->
+    <string name="format_folder_files_count">(%d)</string>
+    <string name="menu_create_folder">새 폴더 만들기</string>
+    <string name="menu_export_text">텍스트 내보내기</string>
+    <string name="menu_sync">동기화</string>
+    <string name="menu_sync_cancel">동기화 해제</string>
+    <string name="menu_setting">설정</string>
+    <string name="menu_search">검색</string>
+    <string name="menu_delete">삭제</string>
+    <string name="menu_move">편지함으로 이동</string>
+    <string name="menu_select_title">%d 항목 선택됨</string>
+    <string name="menu_select_none">선택된 항목이 없습니다. 작업이 올바르지 않습니다</string>
+    <string name="menu_select_all">모두 선택</string>
+    <string name="menu_deselect_all">모두 선택 해제</string>
+    <string name="menu_font_size">텍스트 크기</string>
+    <string name="menu_font_small">작은</string>
+    <string name="menu_font_normal">가운데</string>
+    <string name="menu_font_large">큰</string>
+    <string name="menu_font_super">초대</string>
+    <string name="menu_list_mode">상세한 명부 본에 들어간다</string>
+    <string name="menu_normal_mode">목록 모드 끝내기</string>
+    <string name="menu_folder_view">폴더 보기</string>
+    <string name="menu_folder_delete">폴더 삭제</string>
+    <string name="menu_folder_change_name">폴더 이름 바꾸기</string>
+    <string name="folder_exist">폴더%1 s이 (가) 이미 존재합니다. 이름을 바꾸십시오.</string>
+    <string name="menu_share">나누기</string>
+    <string name="menu_send_to_desktop">데스크톱으로 보내기</string>
+    <string name="menu_alert">깨우쳐 주다</string>
+    <string name="menu_remove_remind">알람 삭제</string>
+    <string name="menu_title_select_folder">편지함 선택</string>
+    <string name="menu_move_parent_folder">상위 디렉토리r</string>
+    <string name="info_note_enter_desktop">데스크톱에 추가됨</string>
+    <string name="alert_message_delete_folder">폴더 및 그 아래에 있는 메모를 삭제하시겠습니까?</string>
+    <string name="alert_title_delete">삭제</string>
+    <string name="alert_message_delete_notes">선택한%d 노트를 삭제하시겠습니까?</string>
+    <string name="alert_message_delete_note">이 메모 지우시겠습니까?</string>
+    <string name="format_move_notes_to_folder">선택한%1달러 d 노트북은%2달러 s 폴더에 옮겨졌습니다</string>
+    <!-- Error information -->
+    <string name="error_sdcard_unmounted">SD 카드가 사용되어 운영되지 않고 있습니다</string>
+    <string name="error_sdcard_export">텍스트를 내보낼 때 오류가 발생했습니다. SD 카드를 확인하십시오.</string>
+    <string name="error_note_not_exist">확인할 노트가 없습니다</string>
+    <string name="error_note_empty_for_clock">빈 노트북에 알람을 설정할 수 없습니다</string>
+    <string name="error_note_empty_for_send_to_desktop">데스크톱에 빈 메모 보낼 수 없음</string>
+    <string name="success_sdcard_export">내보내기 성공</string>
+    <string name="failed_sdcard_export">내보내기 실패</string>
+    <string name="format_exported_file_location">텍스트 파일 (%1$s)을 SD 카드에서 출력했습니다 (%2$s) 디렉터리로</string>
+    <!-- Sync -->
+    <string name="ticker_syncing">동기화 메모 …</string>
+    <string name="ticker_success">동기화 성공</string>
+    <string name="ticker_fail">동기화 실패</string>
+    <string name="ticker_cancel">동기화 해제</string>
+    <string name="success_sync_account">%1$s 동기화 성공</string>
+    <string name="error_sync_network">동기화에 실패했습니다. 네트워크와 계정 설정을 확인하십시오.</string>
+    <string name="error_sync_internal">동기화 실패, 내부 오류 발생</string>
+    <string name="error_sync_cancelled">동기화 해제</string>
+    <string name="sync_progress_login">로그인%1$s …</string>
+    <string name="sync_progress_init_list">서버 메모 목록 가져오는 중 …</string>
+    <string name="sync_progress_syncing">로컬 메모 동기화 중 …</string>
+    <!-- Preferences -->
+    <string name="preferences_title">설정</string>
+    <string name="preferences_account_title">동기화 계정</string>
+    <string name="preferences_account_summary">google task와 나란히 메모</string>
+    <string name="preferences_last_sync_time">지난 번에%1$s 동기화</string>
+    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_add_account">계좌 번호 추가</string>
+    <string name="preferences_menu_change_account">계좌 번호를 바꾸다</string>
+    <string name="preferences_menu_remove_account">계정 삭제</string>
+    <string name="preferences_menu_cancel">취소</string>
+    <string name="preferences_button_sync_immediately">지금 동기화</string>
+    <string name="preferences_button_sync_cancel">동기화 해제</string>
+    <string name="preferences_dialog_change_account_title">커런트 계정%1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">동기식 계정 변경시 과거 계정 동기식 정보가 지워지므로 재전환시 데이터가 중복될 수 있습니다.</string>
+    <string name="preferences_dialog_select_account_title">동기화 메모</string>
+    <string name="preferences_dialog_select_account_tips">이 계정의 구글 작업 내용과 동기화하기 위해 구글 계정을 선택하십시오</string>
+    <string name="preferences_toast_cannot_change_account">동기화하는 중 계정 정보를 수정할 수 없습니다.</string>
+    <string name="preferences_toast_success_set_accout">계정이%1$s로 설정되었습니다.</string>
+    <string name="preferences_bg_random_appear_title">새 메모 배경 색상 임의적으로</string>
+
+    <string name="button_delete">삭제</string>
+    <string name="call_record_folder_name">통화 메모</string>
+    <string name="hint_foler_name">이름을 입력하십시오.</string>
+
+    <string name="search_label">메모 찾는 중</string>
+    <string name="search_hint">메모 찾기</string>
+    <string name="search_setting_description">메모의 글</string>
+    <string name="search">메모</string>
+    <string name="datetime_dialog_ok">설정</string>
+    <string name="datetime_dialog_cancel">취소</string>
+    <plurals name="search_results_title">
+         <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
+        <!-- Case of 0 or 2 or more results. -->
+        <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 가닥입니다“<xliff:g id="SEARCH">%2$s</xliff:g>” 검색 결과에 부합하는</item>
+    </plurals>
+
+</resources>

src/app/src/main/res/values-zh-rCN/strings.xml

@@ -18,14 +18,25 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">便签</string>
+<<<<<<< HEAD
+=======
+    <string name="menu_count_word">统计字数</string>
+    <string name="menu_set_passcode">设定密码</string>
+    <string name="menu_delete_passcode">删除密码</string>
+    <string name="menu_secret">私密模式</string>
+    <string name="menu_quit_secret">退出私密模式</string>
+>>>>>>> origin/Branch_liujie
     <string name="app_widget2x2">便签2x2</string>
     <string name="app_widget4x4">便签4x4</string>
     <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
     <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
     <string name="notelist_string_info">...</string>
     <string name="notelist_menu_new">新建便签</string>
+<<<<<<< HEAD
     <string name="menu_set_top">置顶签</string>
     <string name="menu_cancel_top">取消置顶</string>
+=======
+>>>>>>> origin/Branch_liujie
     <string name="delete_remind_time_message">成功删除提醒</string>
     <string name="set_remind_time_message">创建提醒</string>
     <string name="note_alert_expired">已过期</string>
@@ -65,8 +76,11 @@
     <string name="menu_send_to_desktop">发送到桌面</string>
     <string name="menu_alert">提醒我</string>
     <string name="menu_remove_remind">删除提醒</string>
+<<<<<<< HEAD
     <string name="menu_font_style">设置字体</string>
     <string name="menu_set_password">删设置密码</string>
+=======
+>>>>>>> origin/Branch_liujie
     <string name="menu_title_select_folder">选择文件夹</string>
     <string name="menu_move_parent_folder">上一级文件夹</string>
     <string name="info_note_enter_desktop">已添加到桌面</string>
@@ -79,7 +93,10 @@
     <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
     <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
     <string name="error_note_not_exist">要查看的便签不存在</string>
+<<<<<<< HEAD
     <string name="error_note_empty_for_top">不能置顶空便签</string>
+=======
+>>>>>>> origin/Branch_liujie
     <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
     <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
     <string name="success_sdcard_export">导出成功</string>
@@ -124,7 +141,10 @@
     <string name="search">便签</string>
     <string name="datetime_dialog_ok">设置</string>
     <string name="datetime_dialog_cancel">取消</string>
+<<<<<<< HEAD
     <string name="notelist_menu_key" >关键</string>
+=======
+>>>>>>> origin/Branch_liujie
     <plurals name="search_results_title">
         <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 条符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果</item>
     </plurals>

src/app/src/main/res/values-zh-rCN/strings.xml.orig

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">便签</string>
+<<<<<<< HEAD
+=======
+    <string name="menu_count_word">统计字数</string>
+    <string name="menu_set_passcode">设定密码</string>
+    <string name="menu_delete_passcode">删除密码</string>
+    <string name="menu_secret">私密模式</string>
+    <string name="menu_quit_secret">退出私密模式</string>
+>>>>>>> origin/Branch_liujie
+    <string name="app_widget2x2">便签2x2</string>
+    <string name="app_widget4x4">便签4x4</string>
+    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
+    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
+    <string name="notelist_string_info">...</string>
+    <string name="notelist_menu_new">新建便签</string>
+<<<<<<< HEAD
+    <string name="menu_set_top">置顶签</string>
+    <string name="menu_cancel_top">取消置顶</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <string name="delete_remind_time_message">成功删除提醒</string>
+    <string name="set_remind_time_message">创建提醒</string>
+    <string name="note_alert_expired">已过期</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notealert_enter">查看</string>
+    <string name="note_link_tel">呼叫电话</string>
+    <string name="note_link_email">发送邮件</string>
+    <string name="note_link_web">浏览网页</string>
+    <string name="note_link_other">打开地图</string>
+    <!-- note list string -->
+    <string name="menu_create_folder">新建文件夹</string>
+    <string name="menu_export_text">导出文本</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_search">搜索</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_move">移动到文件夹</string>
+    <string name="menu_select_title">选中了 %d 项</string>
+    <string name="menu_select_none">没有选中项，操作无效</string>
+    <string name="menu_select_all">全选</string>
+    <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">进入清单模式</string>
+    <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_folder_view">查看文件夹</string>
+    <string name="menu_folder_delete">刪除文件夹</string>
+    <string name="menu_folder_change_name">修改文件夹名称</string>
+    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_remove_remind">删除提醒</string>
+<<<<<<< HEAD
+    <string name="menu_font_style">设置字体</string>
+    <string name="menu_set_password">删设置密码</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="menu_move_parent_folder">上一级文件夹</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="alert_title_delete">删除</string>
+    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
+    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
+    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
+    <!-- export text -->
+    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
+    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
+    <string name="error_note_not_exist">要查看的便签不存在</string>
+<<<<<<< HEAD
+    <string name="error_note_empty_for_top">不能置顶空便签</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
+    <string name="success_sdcard_export">导出成功</string>
+    <string name="failed_sdcard_export">导出失败</string>
+    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
+    <!-- Sync -->
+    <string name="ticker_syncing">同步便签...</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_fail">同步失败</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="success_sync_account">与%1$s同步成功</string>
+    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
+    <string name="error_sync_internal">同步失败，发生内部错误</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="sync_progress_login">登录%1$s...</string>
+    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
+    <string name="sync_progress_syncing">正在同步本地便签...</string>
+    <!-- Preferences -->
+    <string name="preferences_title">设置</string>
+    <string name="preferences_account_title">同步账号</string>
+    <string name="preferences_account_summary">与google task同步便签记录</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_add_account">添加账号</string>
+    <string name="preferences_menu_change_account">更换账号</string>
+    <string name="preferences_menu_remove_account">删除账号</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
+    <string name="preferences_dialog_select_account_title">同步便签</string>
+    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
+    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
+    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="button_delete">删除</string>
+    <string name="call_record_folder_name">通话便签</string>
+    <string name="hint_foler_name">请输入名称</string>
+    <string name="search_label">正在搜索便签</string>
+    <string name="search_hint">搜索便签</string>
+    <string name="search_setting_description">便签中的文字</string>
+    <string name="search">便签</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="datetime_dialog_cancel">取消</string>
+<<<<<<< HEAD
+    <string name="notelist_menu_key" >关键</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <plurals name="search_results_title">
+        <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 条符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果</item>
+    </plurals>
+
+</resources>

src/app/src/main/res/values-zh-rTW/strings.xml

@@ -18,14 +18,25 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">便簽</string>
+<<<<<<< HEAD
+=======
+    <string name="menu_count_word">統計字數</string>
+    <string name="menu_set_passcode">設定密碼</string>
+    <string name="menu_delete_passcode">刪除密碼</string>
+    <string name="menu_secret">私密模式</string>
+    <string name="menu_quit_secret">退出私密模式</string>
+>>>>>>> origin/Branch_liujie
     <string name="app_widget2x2">便簽2x2</string>
     <string name="app_widget4x4">便簽4x4</string>
     <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
     <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
     <string name="notelist_string_info">...</string>
     <string name="notelist_menu_new">新建便簽</string>
+<<<<<<< HEAD
     <string name="menu_set_top">置顶</string>
     <string name="menu_cancel_top">取消置顶</string>
+=======
+>>>>>>> origin/Branch_liujie
     <string name="delete_remind_time_message">成功刪除提醒</string>
     <string name="set_remind_time_message">創建提醒</string>
     <string name="note_alert_expired">已過期</string>
@@ -66,8 +77,11 @@
     <string name="menu_send_to_desktop">發送到桌面</string>
     <string name="menu_alert">提醒我</string>
     <string name="menu_remove_remind">刪除提醒</string>
+<<<<<<< HEAD
     <string name="menu_font_style">设置字体</string>
     <string name="menu_set_password">设置密码</string>
+=======
+>>>>>>> origin/Branch_liujie
     <string name="menu_title_select_folder">選擇文件夾</string>
     <string name="menu_move_parent_folder">上一級文件夾</string>
     <string name="info_note_enter_desktop">已添加到桌面</string>
@@ -78,7 +92,10 @@
     <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
     <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
     <string name="error_note_not_exist">要查看的便籤不存在</string>
+<<<<<<< HEAD
     <string name="error_note_empty_for_top">不能置顶空便籤</string>
+=======
+>>>>>>> origin/Branch_liujie
     <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
     <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
     <string name="success_sdcard_export">導出成功</string>
@@ -125,7 +142,10 @@
     <string name="search">便籤</string>
     <string name="datetime_dialog_ok">設置</string>
     <string name="datetime_dialog_cancel">取消</string>
+<<<<<<< HEAD
     <string name="notelist_menu_key" >关键</string>
+=======
+>>>>>>> origin/Branch_liujie
     <plurals name="search_results_title">
         <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 條符合”<xliff:g id="SEARCH">%2$s</xliff:g>“的搜尋結果</item>
     </plurals>

src/app/src/main/res/values-zh-rTW/strings.xml.orig

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">便簽</string>
+<<<<<<< HEAD
+=======
+    <string name="menu_count_word">統計字數</string>
+    <string name="menu_set_passcode">設定密碼</string>
+    <string name="menu_delete_passcode">刪除密碼</string>
+    <string name="menu_secret">私密模式</string>
+    <string name="menu_quit_secret">退出私密模式</string>
+>>>>>>> origin/Branch_liujie
+    <string name="app_widget2x2">便簽2x2</string>
+    <string name="app_widget4x4">便簽4x4</string>
+    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
+    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
+    <string name="notelist_string_info">...</string>
+    <string name="notelist_menu_new">新建便簽</string>
+<<<<<<< HEAD
+    <string name="menu_set_top">置顶</string>
+    <string name="menu_cancel_top">取消置顶</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <string name="delete_remind_time_message">成功刪除提醒</string>
+    <string name="set_remind_time_message">創建提醒</string>
+    <string name="note_alert_expired">已過期</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notealert_enter">查看</string>
+    <string name="note_link_tel">呼叫電話</string>
+    <string name="note_link_email">發送郵件</string>
+    <string name="note_link_web">浏覽網頁</string>
+    <string name="note_link_other">打開地圖</string>
+    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
+    <!-- note list string -->
+    <string name="menu_create_folder">新建文件夾</string>
+    <string name="menu_export_text">導出文本</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_setting">設置</string>
+    <string name="menu_search">搜尋</string>
+    <string name="menu_delete">刪除</string>
+    <string name="menu_move">移動到文件夾</string>
+    <string name="menu_select_title">選中了 %d 項</string>
+    <string name="menu_select_none">沒有選中項，操作無效</string>
+    <string name="menu_select_all">全選</string>
+    <string name="menu_deselect_all">取消全選</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">進入清單模式</string>
+    <string name="menu_normal_mode">退出清單模式</string>
+    <string name="menu_folder_view">查看文件夾</string>
+    <string name="menu_folder_delete">刪除文件夾</string>
+    <string name="menu_folder_change_name">修改文件夾名稱</string>
+    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_send_to_desktop">發送到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_remove_remind">刪除提醒</string>
+<<<<<<< HEAD
+    <string name="menu_font_style">设置字体</string>
+    <string name="menu_set_password">设置密码</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <string name="menu_title_select_folder">選擇文件夾</string>
+    <string name="menu_move_parent_folder">上一級文件夾</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="alert_title_delete">刪除</string>
+    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
+    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
+    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
+    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
+    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
+    <string name="error_note_not_exist">要查看的便籤不存在</string>
+<<<<<<< HEAD
+    <string name="error_note_empty_for_top">不能置顶空便籤</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
+    <string name="success_sdcard_export">導出成功</string>
+    <string name="failed_sdcard_export">導出失敗</string>
+    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
+    <!-- Sync -->
+    <string name="ticker_syncing">同步便簽...</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_fail">同步失敗</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="success_sync_account">與%1$s同步成功</string>
+    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
+    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="sync_progress_login">登陸%1$s...</string>
+    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
+    <string name="sync_progress_syncing">正在同步本地便籤...</string>
+    <!-- Preferences -->
+    <string name="preferences_title">設置</string>
+    <string name="preferences_account_title">同步賬號</string>
+    <string name="preferences_account_summary">与google task同步便簽記錄</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_add_account">添加賬號</string>
+    <string name="preferences_menu_change_account">更換賬號</string>
+    <string name="preferences_menu_remove_account">刪除賬號</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
+    <string name="preferences_dialog_select_account_title">同步便簽</string>
+    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
+    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
+    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
+
+    <string name="button_delete">刪除</string>
+    <string name="call_record_folder_name">通話便籤</string>
+    <string name="hint_foler_name">請輸入名稱</string>
+
+    <string name="search_label">正在搜索便籤</string>
+    <string name="search_hint">搜索便籤</string>
+    <string name="search_setting_description">便籤中的文字</string>
+    <string name="search">便籤</string>
+    <string name="datetime_dialog_ok">設置</string>
+    <string name="datetime_dialog_cancel">取消</string>
+<<<<<<< HEAD
+    <string name="notelist_menu_key" >关键</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <plurals name="search_results_title">
+        <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 條符合”<xliff:g id="SEARCH">%2$s</xliff:g>“的搜尋結果</item>
+    </plurals>
+
+</resources>

src/app/src/main/res/values/ids.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="m_locker" type="id" />
+</resources>

src/app/src/main/res/values/strings.xml

@@ -18,14 +18,25 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Notes</string>
+<<<<<<< HEAD
+=======
+    <string name="menu_count_word">Count word</string>
+    <string name="menu_set_passcode">Set passcode</string>
+    <string name="menu_delete_passcode">Delete passcode</string>
+    <string name="menu_secret">secret model</string>
+    <string name="menu_quit_secret">quit secret model</string>
+>>>>>>> origin/Branch_liujie
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
     <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
     <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
     <string name="notelist_string_info">...</string>
     <string name="notelist_menu_new">Add note</string>
+<<<<<<< HEAD
     <string name="menu_set_top">Set top</string>
     <string name="menu_cancel_top">Cancel top</string>
+=======
+>>>>>>> origin/Branch_liujie
     <string name="delete_remind_time_message">Delete reminder successfully</string>
     <string name="set_remind_time_message">Set reminder</string>
     <string name="note_alert_expired">Expired</string>
@@ -69,8 +80,11 @@
     <string name="menu_send_to_desktop">Send to home</string>
     <string name="menu_alert">Remind me</string>
     <string name="menu_remove_remind">Delete reminder</string>
+<<<<<<< HEAD
     <string name="menu_font_style">Set font</string>
     <string name="menu_set_password">Set password</string>
+=======
+>>>>>>> origin/Branch_liujie
     <string name="menu_title_select_folder">Select folder</string>
     <string name="menu_move_parent_folder">Parent folder</string>
     <string name="info_note_enter_desktop">Note added to home</string>
@@ -83,7 +97,10 @@
     <string name="error_sdcard_unmounted">SD card busy, not available now</string>
     <string name="error_sdcard_export">Export failed, please check SD card</string>
     <string name="error_note_not_exist">The note is not exist</string>
+<<<<<<< HEAD
     <string name="error_note_empty_for_top">Sorry, can not set top on empty note</string>
+=======
+>>>>>>> origin/Branch_liujie
     <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
     <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
     <string name="success_sdcard_export">Export successful</string>
@@ -131,7 +148,10 @@
     <string name="search">Notes</string>
     <string name="datetime_dialog_ok">set</string>
     <string name="datetime_dialog_cancel">cancel</string>
+<<<<<<< HEAD
     <string name="notelist_menu_key" >key</string>
+=======
+>>>>>>> origin/Branch_liujie
     <plurals name="search_results_title">
          <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
         <!-- Case of 0 or 2 or more results. -->

src/app/src/main/res/values/strings.xml.orig

@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Notes</string>
+<<<<<<< HEAD
+=======
+    <string name="menu_count_word">Count word</string>
+    <string name="menu_set_passcode">Set passcode</string>
+    <string name="menu_delete_passcode">Delete passcode</string>
+    <string name="menu_secret">secret model</string>
+    <string name="menu_quit_secret">quit secret model</string>
+>>>>>>> origin/Branch_liujie
+    <string name="app_widget2x2">Notes 2x2</string>
+    <string name="app_widget4x4">Notes 4x4</string>
+    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
+    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
+    <string name="notelist_string_info">...</string>
+    <string name="notelist_menu_new">Add note</string>
+<<<<<<< HEAD
+    <string name="menu_set_top">Set top</string>
+    <string name="menu_cancel_top">Cancel top</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <string name="delete_remind_time_message">Delete reminder successfully</string>
+    <string name="set_remind_time_message">Set reminder</string>
+    <string name="note_alert_expired">Expired</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MMMd kk:mm</string>
+    <string name="notealert_ok">Got it</string>
+    <string name="notealert_enter">Take a look</string>
+    <string name="note_link_tel">Call</string>
+    <string name="note_link_email">Send email</string>
+    <string name="note_link_web">Browse web</string>
+    <string name="note_link_other">Open map</string>
+    <!-- Text export file information -->
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
+    <!-- notes list string -->
+    <string name="format_folder_files_count">(%d)</string>
+    <string name="menu_create_folder">New Folder</string>
+    <string name="menu_export_text">Export text</string>
+    <string name="menu_sync">Sync</string>
+    <string name="menu_sync_cancel">Cancel syncing</string>
+    <string name="menu_setting">Settings</string>
+    <string name="menu_search">Search</string>
+    <string name="menu_delete">Delete</string>
+    <string name="menu_move">Move to folder</string>
+    <string name="menu_select_title">%d selected</string>
+    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
+    <string name="menu_select_all">Select all</string>
+    <string name="menu_deselect_all">Deselect all</string>
+    <string name="menu_font_size">Font size</string>
+    <string name="menu_font_small">Small</string>
+    <string name="menu_font_normal">Medium</string>
+    <string name="menu_font_large">Large</string>
+    <string name="menu_font_super">Super</string>
+    <string name="menu_list_mode">Enter check list</string>
+    <string name="menu_normal_mode">Leave check list</string>
+    <string name="menu_folder_view">View folder</string>
+    <string name="menu_folder_delete">Delete folder</string>
+    <string name="menu_folder_change_name">Change folder name</string>
+    <string name="folder_exist">The folder %1$s exist, please rename</string>
+    <string name="menu_share">Share</string>
+    <string name="menu_send_to_desktop">Send to home</string>
+    <string name="menu_alert">Remind me</string>
+    <string name="menu_remove_remind">Delete reminder</string>
+<<<<<<< HEAD
+    <string name="menu_font_style">Set font</string>
+    <string name="menu_set_password">Set password</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <string name="menu_title_select_folder">Select folder</string>
+    <string name="menu_move_parent_folder">Parent folder</string>
+    <string name="info_note_enter_desktop">Note added to home</string>
+    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
+    <string name="alert_title_delete">Delete selected notes</string>
+    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
+    <string name="alert_message_delete_note">Confirm to delete this note?</string>
+    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
+    <!-- Error information -->
+    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
+    <string name="error_sdcard_export">Export failed, please check SD card</string>
+    <string name="error_note_not_exist">The note is not exist</string>
+<<<<<<< HEAD
+    <string name="error_note_empty_for_top">Sorry, can not set top on empty note</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
+    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
+    <string name="success_sdcard_export">Export successful</string>
+    <string name="failed_sdcard_export">Export fail</string>
+    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
+    <!-- Sync -->
+    <string name="ticker_syncing">Syncing notes...</string>
+    <string name="ticker_success">Sync is successful</string>
+    <string name="ticker_fail">Sync is failed</string>
+    <string name="ticker_cancel">Sync is canceled</string>
+    <string name="success_sync_account">Sync is successful with account %1$s</string>
+    <string name="error_sync_network">Sync failed, please check network and account settings</string>
+    <string name="error_sync_internal">Sync failed, internal error occurs</string>
+    <string name="error_sync_cancelled">Sync is canceled</string>
+    <string name="sync_progress_login">Logging into %1$s...</string>
+    <string name="sync_progress_init_list">Getting remote note list...</string>
+    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
+    <!-- Preferences -->
+    <string name="preferences_title">Settings</string>
+    <string name="preferences_account_title">Sync account</string>
+    <string name="preferences_account_summary">Sync notes with google task</string>
+    <string name="preferences_last_sync_time">Last sync time %1$s</string>
+    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_add_account">Add account</string>
+    <string name="preferences_menu_change_account">Change sync account</string>
+    <string name="preferences_menu_remove_account">Remove sync account</string>
+    <string name="preferences_menu_cancel">Cancel</string>
+    <string name="preferences_button_sync_immediately">Sync immediately</string>
+    <string name="preferences_button_sync_cancel">Cancel syncing</string>
+    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
+    <string name="preferences_dialog_select_account_title">Sync notes</string>
+    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
+    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
+    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
+    <string name="preferences_bg_random_appear_title">New note background color random</string>
+
+    <string name="button_delete">Delete</string>
+    <string name="call_record_folder_name">Call notes</string>
+    <string name="hint_foler_name">Input name</string>
+
+    <string name="search_label">Searching Notes</string>
+    <string name="search_hint">Search notes</string>
+    <string name="search_setting_description">Text in your notes</string>
+    <string name="search">Notes</string>
+    <string name="datetime_dialog_ok">set</string>
+    <string name="datetime_dialog_cancel">cancel</string>
+<<<<<<< HEAD
+    <string name="notelist_menu_key" >key</string>
+=======
+>>>>>>> origin/Branch_liujie
+    <plurals name="search_results_title">
+         <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
+        <!-- Case of 0 or 2 or more results. -->
+        <item quantity="other"><xliff:g id="number" example="15">%1$s</xliff:g> results for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
+    </plurals>
+
+</resources>

src/app/src/main/res/values/styles.xml

@@ -63,7 +63,12 @@
     </style>
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+<<<<<<< HEAD
         <item name="android:displayOptions" />
         <item name="android:visibility">gone</item>
+=======
+        <!--item name="android:displayOptions" /-->
+        <item name="android:visibility">visible</item>
+>>>>>>> origin/Branch_liujie
     </style>
 </resources>

src/app/src/main/res/values/styles.xml.orig

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+-->
+
+<resources>
+    <style name="TextAppearanceSuper">
+        <item name="android:textSize">@dimen/text_font_size_super</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceLarge">
+        <item name="android:textSize">@dimen/text_font_size_large</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceMedium">
+        <item name="android:textSize">@dimen/text_font_size_medium</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceNormal">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+
+    <style name="TextAppearancePrimaryItem">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+
+    <style name="TextAppearanceSecondaryItem">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+
+    <style name="TextAppearanceUnderMenuIcon">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="HighlightTextAppearancePrimary">
+    <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+
+    <style name="HighlightTextAppearanceSecondary">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+
+    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
+    </style>
+
+    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+<<<<<<< HEAD
+        <item name="android:displayOptions" />
+        <item name="android:visibility">gone</item>
+=======
+        <!--item name="android:displayOptions" /-->
+        <item name="android:visibility">visible</item>
+>>>>>>> origin/Branch_liujie
+    </style>
+</resources>