Merge remote-tracking branch 'origin/hxs_xiaomi1' into luoxinxin

# Conflicts:
#	src/Notes-master/src/net/micode/notes/data/NotesProvider.java
#	src/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java
#	src/Notes-master/src/net/micode/notes/model/WorkingNote.java
#	src/Notes-master/src/net/micode/notes/tool/DataUtils.java

src/Notes-master/AndroidManifest.xml

@@ -83,12 +83,21 @@
                 android:resource="@xml/searchable" />
         </activity>
         <activity
+<<<<<<< HEAD:hxs_xiaomi2/res/AndroidManifest.xml
+            android:name=".ui.PassWordEditActivity"
+            android:theme="@style/NoteActionBarStyle">
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+=======
         android:name=".ui.PassWordEditActivity"
         android:theme="@style/NoteActionBarStyle">
         <intent-filter>
             <category android:name="android.intent.category.DEFAULT"/>
         </intent-filter>
     </activity>
+>>>>>>> d01c3b5117a761c71533cfaeda365327c587bd93:src/Notes-master/AndroidManifest.xml
 
         <activity
             android:name=".account.RegisterActivity"

src/Notes-master/res/AndroidManifest.xml

@@ -0,0 +1,160 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="net.micode.notes"
+    android:versionCode="1"
+    android:versionName="0.1" >
+
+    <!--uses-sdk android:minSdkVersion="14" /-->
+
+    <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" />
+    <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" />
+
+    <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"
+            android:theme="@style/NoteTheme"
+
+            android:windowSoftInputMode="adjustPan" >
+            <!--android:uiOptions="splitActionBarWhenNarrow"-->
+
+            <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"
+            android:theme="@style/NoteTheme" >
+
+            <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>
+        <activity
+            android:name=".ui.PassWordEditActivity"
+            android:theme="@style/NoteActionBarStyle">
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </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/Notes-master/res/layout/dialog_edit_text.xml

@@ -14,63 +14,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="center_vertical">
-    <LinearLayout
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-        <TextView
-            android:id="@+id/old_password_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="输入原密码："/>
-
-        <EditText
-            android:id="@+id/old_password"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:password="true"/>
-    </LinearLayout>
-    <LinearLayout
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-        <TextView
-            android:id="@+id/new_password_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="输入新建密码："/>
-
-        <EditText
-            android:id="@+id/new_password"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:password="true"/>
-    </LinearLayout>
 
-    <LinearLayout
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-        <TextView
-            android:id="@+id/new_password_again_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="确认密码："/>
-
-        <EditText
-            android:id="@+id/new_password_again"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:password="true"/>
-    </LinearLayout>
-
-</LinearLayout>
+<EditText
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/et_foler_name"
+    android:layout_width="fill_parent"
+    android:hint="@string/hint_foler_name"
+    android:layout_height="fill_parent" />

src/Notes-master/res/layout/note_item.xml

@@ -17,7 +17,6 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/note_item"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
@@ -76,10 +75,4 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right"/>
-
-    <ImageView
-        android:id="@+id/iv_locker_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|left"/>
 </FrameLayout>

src/Notes-master/res/menu/note_edit.xml

@@ -58,4 +58,9 @@
     <item
         android:id="@+id/menu_delete_passwd"
         android:title="Delete password" />
+    <item
+        android:id="@+id/menu_font_select"
+
+        android:title="@string/menu_font_style" />
+
 </menu>

src/Notes-master/res/values-zh-rCN/strings.xml

@@ -83,6 +83,7 @@
     <!-- TOP -->
     <string name="menu_top">置顶</string>
     <string name="note_top">置顶</string>
+    <string name="menu_font_style">选择字体</string>
     <!-- Sync -->
     <string name="ticker_syncing">同步便签...</string>
     <string name="ticker_success">同步成功</string>

src/Notes-master/res/values-zh-rTW/strings.xml

@@ -91,6 +91,7 @@
     <string name="sync_progress_login">登陸%1$s...</string>
     <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
     <string name="sync_progress_syncing">正在同步本地便籤...</string>
+    <string name="menu_font_style">選擇字体</string>
     <!-- Preferences -->
     <string name="preferences_title">設置</string>
     <string name="preferences_account_title">同步賬號</string>

src/Notes-master/res/values/strings.xml

@@ -89,6 +89,7 @@
     <!-- TOP -->
     <string name="menu_top">menu top</string>
     <string name="note_top">note top</string>
+    <string name="menu_font_style">Select font</string>
     <!-- Sync -->
     <string name="ticker_syncing">Syncing notes...</string>
     <string name="ticker_success">Sync is successful</string>