Merge branch 'master' of https://bdgit.educoder.net/prnuf6cjx/xiaominote

# Conflicts:
#	doc/实践资源-小米便签开源代码的泛读报告模板.docx

src/Notes-master2/.idea/deploymentTargetDropDown.xml

@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-08-17T02:13:24.037444900Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-08-18T00:45:19.165672800Z" />
   </component>
 </project>

src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

@@ -1,7 +1,7 @@
-#Tue Aug 16 23:03:01 CST 2022
+#Mon Aug 29 23:45:12 CST 2022
 E\:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-E\:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
 E\:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+E\:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
 E\:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
 E\:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
 E\:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat

src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
     <string-array name="format_for_exported_note">
-        <item>-%s</item>      <!-- format_folder_name -->
-        <item>--%s</item>     <!-- format_folder_note_date -->
-        <item>--%s</item>     <!-- format_note_date -->
-        <item>--%s</item>     <!-- format_note_content -->
+        <item>-%s</item>      
+        <item>--%s</item>     
+        <item>--%s</item>     
+        <item>--%s</item>     
     </string-array>
     <string-array name="menu_share_ways">
         <item>Messaging</item>
@@ -18,7 +18,7 @@
     <dimen name="text_font_size_super">33sp</dimen>
     <plurals name="search_results_title">
          <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-        <!-- Case of 0 or 2 or more results. -->
+        
         <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
     </plurals>
     <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
@@ -132,8 +132,8 @@
         <item name="android:textColor">@color/secondary_text_dark</item>
     </style>
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+        <!--item name="android:displayOptions" /-->
+        <item name="android:visibility">visible</item>
     </style>
     <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>

src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/merger.xml

@@ -41,8 +41,8 @@
     </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">
-        <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+        
+        <item name="android:visibility">visible</item>
     </style></file><file path="E:\AndroidStudioProjects\Notes-master2\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
         <item>短信</item>
         <item>邮件</item>

src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Wed Aug 17 10:13:30 CST 2022
+#Mon Aug 29 23:45:24 CST 2022
 base.0=E\:\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex

src/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -20,254 +20,253 @@
 20    android:versionName="0.1" >
 21
 22    <uses-sdk
-22-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44
+22-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44
 23        android:minSdkVersion="14"
-23-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:15-41
+23-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:24:15-41
 24        android:targetSdkVersion="30" />
-24-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44
+24-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44
 25
 26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-26-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:25:5-81
-26-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:25:22-78
+26-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:5-81
+26-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:22-78
 27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:5-88
-27-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:22-85
+27-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:5-88
+27-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:22-85
 28    <uses-permission android:name="android.permission.INTERNET" />
-28-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:5-67
-28-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:22-64
+28-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:5-67
+28-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:22-64
 29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:5-72
-29-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:22-69
+29-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:5-72
+29-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:22-69
 30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:5-74
-30-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:22-71
+30-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:5-74
+30-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:22-71
 31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:5-80
-31-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:22-77
+31-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:5-80
+31-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:22-77
 32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:5-71
-32-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:22-68
+32-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:5-71
+32-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:22-68
 33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:5-74
-33-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:22-71
+33-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:5-74
+33-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:22-71
 34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:5-81
-34-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:22-78
+34-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:34:5-81
+34-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:34:22-78
 35
 36    <application
-36-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:35:5-149:19
+36-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:36:5-151:19
 37        android:debuggable="true"
 38        android:icon="@drawable/icon_app"
-38-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:36:9-42
+38-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:37:9-42
 39        android:label="@string/app_name"
-39-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:37:9-41
+39-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:38:9-41
 40        android:testOnly="true" >
 41        <activity
-41-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:38:9-51:20
+41-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:39:9-52:20
 42            android:name="net.micode.notes.ui.NotesListActivity"
-42-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:39:13-49
+42-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:40:13-49
 43            android:configChanges="keyboardHidden|orientation|screenSize"
-43-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:40:13-74
+43-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:41:13-74
 44            android:label="@string/app_name"
-44-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:41:13-45
+44-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:42:13-45
 45            android:launchMode="singleTop"
-45-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:42:13-43
+45-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:43:13-43
 46            android:theme="@style/NoteTheme"
-46-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:43:13-45
-47            android:uiOptions="splitActionBarWhenNarrow"
-47-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:44:13-57
-48            android:windowSoftInputMode="adjustPan" >
-48-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:45:13-52
-49            <intent-filter>
-49-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:47:13-50:29
-50                <action android:name="android.intent.action.MAIN" />
-50-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:48:17-69
-50-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:48:25-66
-51
-52                <category android:name="android.intent.category.LAUNCHER" />
-52-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:17-77
-52-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:27-74
-53            </intent-filter>
-54        </activity>
-55        <activity
-55-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:53:9-81:20
-56            android:name="net.micode.notes.ui.NoteEditActivity"
-56-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:54:13-48
-57            android:configChanges="keyboardHidden|orientation|screenSize"
-57-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:55:13-74
-58            android:launchMode="singleTop"
-58-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:56:13-43
-59            android:theme="@style/NoteTheme" >
-59-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:57:13-45
-60            <intent-filter>
-60-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:59:13-64:29
-61                <action android:name="android.intent.action.VIEW" />
-61-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:17-69
-61-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:25-66
-62
-63                <category android:name="android.intent.category.DEFAULT" />
-63-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76
-63-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73
-64
-65                <data android:mimeType="vnd.android.cursor.item/text_note" />
-65-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78
-65-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75
-66                <data android:mimeType="vnd.android.cursor.item/call_note" />
-66-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78
-66-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75
-67            </intent-filter>
-68            <intent-filter>
-68-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:66:13-71:29
-69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-69-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:67:17-79
-69-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:67:25-76
-70
-71                <category android:name="android.intent.category.DEFAULT" />
-71-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76
-71-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73
-72
-73                <data android:mimeType="vnd.android.cursor.item/text_note" />
-73-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78
-73-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75
-74                <data android:mimeType="vnd.android.cursor.item/call_note" />
-74-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78
-74-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75
-75            </intent-filter>
-76            <intent-filter>
-76-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:73:13-76:29
-77                <action android:name="android.intent.action.SEARCH" />
-77-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:74:17-71
-77-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:74:25-68
-78
-79                <category android:name="android.intent.category.DEFAULT" />
-79-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76
-79-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73
-80            </intent-filter>
-81
-82            <meta-data
-82-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:78:13-80:54
-83                android:name="android.app.searchable"
-83-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:79:17-54
-84                android:resource="@xml/searchable" />
-84-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:80:17-51
-85        </activity>
-86
-87        <provider
-87-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:83:9-86:43
-88            android:name="net.micode.notes.data.NotesProvider"
-88-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:84:13-63
-89            android:authorities="micode_notes"
-89-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:85:13-47
-90            android:multiprocess="true" />
-90-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:86:13-40
-91
-92        <receiver
-92-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:88:9-100:20
-93            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-93-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:89:13-57
-94            android:label="@string/app_widget2x2" >
-94-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:90:13-50
-95            <intent-filter>
-95-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:91:13-95:29
-96                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-96-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:17-84
-96-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:25-81
-97                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-97-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:17-85
-97-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:25-82
-98                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-98-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85
-98-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82
-99            </intent-filter>
-100
-101            <meta-data
-101-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:97:13-99:58
-102                android:name="android.appwidget.provider"
-102-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:98:17-58
-103                android:resource="@xml/widget_2x_info" />
-103-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:99:17-55
-104        </receiver>
-105        <receiver
-105-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:101:9-114:20
-106            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-106-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:102:13-57
-107            android:label="@string/app_widget4x4" >
-107-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:103:13-50
-108            <intent-filter>
-108-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:91:13-95:29
-109                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-109-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:17-84
-109-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:25-81
-110                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-110-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:17-85
-110-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:25-82
-111                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-111-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85
-111-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82
-112            </intent-filter>
-113
-114            <meta-data
-114-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:97:13-99:58
-115                android:name="android.appwidget.provider"
-115-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:98:17-58
-116                android:resource="@xml/widget_4x_info" />
-116-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:99:17-55
-117        </receiver>
-118        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-118-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:116:9-120:20
-118-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:116:19-55
-119            <intent-filter>
-119-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:117:13-119:29
-120                <action android:name="android.intent.action.BOOT_COMPLETED" />
-120-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:17-79
-120-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:25-76
-121            </intent-filter>
-122        </receiver>
-123        <receiver
-123-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:122:9-125:20
-124            android:name="net.micode.notes.ui.AlarmReceiver"
-124-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:123:13-61
-125            android:process=":remote" >
-125-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:124:13-38
-126        </receiver>
-127
-128        <activity
-128-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:127:9-132:20
-129            android:name="net.micode.notes.ui.AlarmAlertActivity"
-129-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:128:13-50
-130            android:label="@string/app_name"
-130-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:129:13-45
-131            android:launchMode="singleInstance"
-131-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:130:13-48
-132            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-132-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:131:13-75
-133        </activity>
-134        <activity
-134-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:134:9-139:20
-135            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-135-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:135:13-71
-136            android:label="@string/preferences_title"
-136-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:136:13-54
-137            android:launchMode="singleTop"
-137-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:137:13-43
-138            android:theme="@android:style/Theme.Holo.Light" >
-138-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:138:13-60
-139        </activity>
-140
-141        <service
-141-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:141:9-144:19
-142            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:142:13-74
-143            android:exported="false" >
-143-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:143:13-37
-144        </service>
-145
-146        <meta-data
-146-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:146:9-148:52
-147            android:name="android.app.default_searchable"
-147-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:147:13-58
-148            android:value=".ui.NoteEditActivity" />
-148-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:148:13-49
-149    </application>
-150
-151</manifest>
+46-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:44:13-45
+47            android:windowSoftInputMode="adjustPan" >
+47-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:46:13-52
+48            <intent-filter>
+48-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:48:13-51:29
+49                <action android:name="android.intent.action.MAIN" />
+49-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:17-69
+49-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:25-66
+50
+51                <category android:name="android.intent.category.LAUNCHER" />
+51-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:50:17-77
+51-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:50:27-74
+52            </intent-filter>
+53        </activity>
+54        <activity
+54-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:54:9-83:20
+55            android:name="net.micode.notes.ui.NoteEditActivity"
+55-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:55:13-48
+56            android:configChanges="keyboardHidden|orientation|screenSize"
+56-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:56:13-74
+57            android:launchMode="singleTop"
+57-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:57:13-43
+58            android:theme="@style/NoteTheme" >
+58-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:58:13-45
+59            <intent-filter android:scheme="http" >
+59-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:13-66:29
+59-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:28-49
+60                <action android:name="android.intent.action.VIEW" />
+60-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-69
+60-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:25-66
+61
+62                <category android:name="android.intent.category.DEFAULT" />
+62-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:63:17-76
+62-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:63:27-73
+63
+64                <data android:mimeType="vnd.android.cursor.item/text_note" />
+64-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:64:17-78
+64-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:64:23-75
+65                <data android:mimeType="vnd.android.cursor.item/call_note" />
+65-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:64:17-78
+65-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:64:23-75
+66            </intent-filter>
+67            <intent-filter>
+67-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:68:13-73:29
+68                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+68-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:69:17-79
+68-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:69:25-76
+69
+70                <category android:name="android.intent.category.DEFAULT" />
+70-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:63:17-76
+70-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:63:27-73
+71
+72                <data android:mimeType="vnd.android.cursor.item/text_note" />
+72-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:64:17-78
+72-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:64:23-75
+73                <data android:mimeType="vnd.android.cursor.item/call_note" />
+73-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:64:17-78
+73-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:64:23-75
+74            </intent-filter>
+75            <intent-filter>
+75-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:75:13-78:29
+76                <action android:name="android.intent.action.SEARCH" />
+76-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:76:17-71
+76-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:76:25-68
+77
+78                <category android:name="android.intent.category.DEFAULT" />
+78-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:63:17-76
+78-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:63:27-73
+79            </intent-filter>
+80
+81            <meta-data
+81-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:80:13-82:54
+82                android:name="android.app.searchable"
+82-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:81:17-54
+83                android:resource="@xml/searchable" />
+83-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:82:17-51
+84        </activity>
+85
+86        <provider
+86-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:85:9-88:43
+87            android:name="net.micode.notes.data.NotesProvider"
+87-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:86:13-63
+88            android:authorities="micode_notes"
+88-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:87:13-47
+89            android:multiprocess="true" />
+89-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:88:13-40
+90
+91        <receiver
+91-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:90:9-102:20
+92            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+92-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:91:13-57
+93            android:label="@string/app_widget2x2" >
+93-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:13-50
+94            <intent-filter>
+94-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:13-97:29
+95                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+95-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:17-84
+95-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:25-81
+96                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+96-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85
+96-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82
+97                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+97-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:96:17-85
+97-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:96:25-82
+98            </intent-filter>
+99
+100            <meta-data
+100-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:99:13-101:58
+101                android:name="android.appwidget.provider"
+101-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:100:17-58
+102                android:resource="@xml/widget_2x_info" />
+102-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:101:17-55
+103        </receiver>
+104        <receiver
+104-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:103:9-116:20
+105            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+105-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:104:13-57
+106            android:label="@string/app_widget4x4" >
+106-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:105:13-50
+107            <intent-filter>
+107-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:13-97:29
+108                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+108-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:17-84
+108-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:25-81
+109                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+109-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85
+109-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82
+110                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+110-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:96:17-85
+110-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:96:25-82
+111            </intent-filter>
+112
+113            <meta-data
+113-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:99:13-101:58
+114                android:name="android.appwidget.provider"
+114-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:100:17-58
+115                android:resource="@xml/widget_4x_info" />
+115-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:101:17-55
+116        </receiver>
+117        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+117-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:9-122:20
+117-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:19-55
+118            <intent-filter>
+118-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:119:13-121:29
+119                <action android:name="android.intent.action.BOOT_COMPLETED" />
+119-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:120:17-79
+119-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:120:25-76
+120            </intent-filter>
+121        </receiver>
+122        <receiver
+122-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:124:9-127:20
+123            android:name="net.micode.notes.ui.AlarmReceiver"
+123-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:125:13-61
+124            android:process=":remote" >
+124-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:126:13-38
+125        </receiver>
+126
+127        <activity
+127-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:129:9-134:20
+128            android:name="net.micode.notes.ui.AlarmAlertActivity"
+128-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:130:13-50
+129            android:label="@string/app_name"
+129-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:131:13-45
+130            android:launchMode="singleInstance"
+130-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:132:13-48
+131            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+131-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:133:13-75
+132        </activity>
+133        <activity
+133-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:136:9-141:20
+134            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+134-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:137:13-71
+135            android:label="@string/preferences_title"
+135-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:138:13-54
+136            android:launchMode="singleTop"
+136-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:139:13-43
+137            android:theme="@android:style/Theme.Holo.Light" >
+137-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:140:13-60
+138        </activity>
+139
+140        <service
+140-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:143:9-146:19
+141            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+141-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:144:13-74
+142            android:exported="false" >
+142-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:145:13-37
+143        </service>
+144
+145        <meta-data
+145-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:148:9-150:52
+146            android:name="android.app.default_searchable"
+146-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:149:13-58
+147            android:value=".ui.NoteEditActivity" />
+147-->E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:150:13-49
+148    </application>
+149
+150</manifest>

src/Notes-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml

@@ -44,7 +44,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -57,7 +56,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme" >
-            <intent-filter>
+            <intent-filter android:scheme="http" >
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />

src/Notes-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -44,7 +44,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -57,7 +56,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme" >
-            <intent-filter>
+            <intent-filter android:scheme="http" >
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />

src/Notes-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json

@@ -92,92 +92,82 @@
                 {
                     "source": "E:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "13,14,15,16,17",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "589,641,694,747,799",
+                        "startOffsets": "477,529,582,635,687",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "636,689,742,794,846"
+                        "endOffsets": "524,577,630,682,734"
                     }
                 },
                 {
                     "source": "E:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
                     },
                     "to": {
                         "startLines": "2,8",
                         "startColumns": "4,4",
-                        "startOffsets": "105,412",
+                        "startOffsets": "105,300",
                         "endLines": "7,11",
                         "endColumns": "19,19",
-                        "endOffsets": "407,527"
+                        "endOffsets": "295,415"
                     }
                 },
                 {
                     "source": "E:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
-                        "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
                         "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
                         "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
                     }
                 },
                 {
                     "source": "E:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endColumns": "56",
-                        "endOffsets": "764"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "12",
                         "startColumns": "4",
-                        "startOffsets": "532",
+                        "startOffsets": "420",
                         "endColumns": "56",
-                        "endOffsets": "584"
+                        "endOffsets": "472"
                     }
                 },
                 {
                     "source": "E:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
-                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                        "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,2851,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "125,129,133,137,140,144,148,152,156,160,164",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203",
+                        "startOffsets": "8124,8328,8539,8755,8915,9098,9283,9468,9671,9877,10060",
                         "endLines": "128,132,136,139,143,147,151,155,159,163,167",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399"
+                        "endOffsets": "8323,8534,8750,8910,9093,9278,9463,9666,9872,10055,10256"
                     }
                 }
             ]

src/Notes-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json

@@ -6,92 +6,82 @@
                 {
                     "source": "E:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "13,14,15,16,17",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "589,641,694,747,799",
+                        "startOffsets": "477,529,582,635,687",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "636,689,742,794,846"
+                        "endOffsets": "524,577,630,682,734"
                     }
                 },
                 {
                     "source": "E:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
                     },
                     "to": {
                         "startLines": "2,8",
                         "startColumns": "4,4",
-                        "startOffsets": "105,412",
+                        "startOffsets": "105,300",
                         "endLines": "7,11",
                         "endColumns": "19,19",
-                        "endOffsets": "407,527"
+                        "endOffsets": "295,415"
                     }
                 },
                 {
                     "source": "E:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
-                        "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
                         "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
                         "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
                     }
                 },
                 {
                     "source": "E:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endColumns": "56",
-                        "endOffsets": "764"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "12",
                         "startColumns": "4",
-                        "startOffsets": "532",
+                        "startOffsets": "420",
                         "endColumns": "56",
-                        "endOffsets": "584"
+                        "endOffsets": "472"
                     }
                 },
                 {
                     "source": "E:\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
-                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                        "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,2851,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "125,129,133,137,140,144,148,152,156,160,164",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203",
+                        "startOffsets": "8124,8328,8539,8755,8915,9098,9283,9468,9671,9877,10060",
                         "endLines": "128,132,136,139,143,147,151,155,159,163,167",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399"
+                        "endOffsets": "8323,8534,8750,8910,9093,9278,9463,9666,9872,10055,10256"
                     }
                 }
             ]

src/Notes-master2/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml

@@ -44,7 +44,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -57,7 +56,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme" >
-            <intent-filter>
+            <intent-filter android:scheme="http" >
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />

src/Notes-master2/app/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,235 +1,239 @@
 -- Merging decision tree log ---
 manifest
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12
+INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12
+INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12
+INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12
+INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12
+INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12
+INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12
 	package
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:19:5-31
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:20:5-31
 		INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml
 		INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml
 	android:versionName
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:21:5-30
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:22:5-30
 		INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml
 		INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml
+	xmlns:tools
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:19:5-51
 	xmlns:android
 		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:11-69
 	android:versionCode
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:20:5-28
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:21:5-28
 		INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml
 		INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml
 uses-sdk
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44
+INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44
+INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44
+INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44
+INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44
 	android:targetSdkVersion
 		INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44
 		INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:15-41
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:24:15-41
 		INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml
 		INJECTED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml
 uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:25:5-81
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:5-81
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:25:22-78
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:22-78
 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:5-88
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:5-88
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:22-85
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:22-85
 uses-permission#android.permission.INTERNET
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:5-67
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:5-67
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:22-64
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:22-64
 uses-permission#android.permission.READ_CONTACTS
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:5-72
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:5-72
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:22-69
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:22-69
 uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:5-74
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:5-74
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:22-71
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:22-71
 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:5-80
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:5-80
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:22-77
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:22-77
 uses-permission#android.permission.GET_ACCOUNTS
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:5-71
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:5-71
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:22-68
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:22-68
 uses-permission#android.permission.USE_CREDENTIALS
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:5-74
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:5-74
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:22-71
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:22-71
 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:5-81
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:34:5-81
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:22-78
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:34:22-78
 application
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:35:5-149:19
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:36:5-151:19
 	android:label
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:37:9-41
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:38:9-41
 	android:icon
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:36:9-42
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:37:9-42
 activity#net.micode.notes.ui.NotesListActivity
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:38:9-51:20
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:39:9-52:20
 	android:label
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:41:13-45
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:42:13-45
 	android:launchMode
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:42:13-43
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:43:13-43
 	android:windowSoftInputMode
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:45:13-52
-	android:uiOptions
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:44:13-57
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:46:13-52
 	android:configChanges
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:40:13-74
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:41:13-74
 	android:theme
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:43:13-45
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:44:13-45
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:39:13-49
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:40:13-49
 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:47:13-50:29
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:48:13-51:29
 action#android.intent.action.MAIN
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:48:17-69
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:17-69
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:48:25-66
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:25-66
 category#android.intent.category.LAUNCHER
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:17-77
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:50:17-77
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:27-74
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:50:27-74
 activity#net.micode.notes.ui.NoteEditActivity
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:53:9-81:20
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:54:9-83:20
 	android:launchMode
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:56:13-43
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:57:13-43
 	android:configChanges
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:55:13-74
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:56:13-74
 	android:theme
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:57:13-45
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:58:13-45
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:54:13-48
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:55:13-48
 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:59:13-64:29
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:13-66:29
+	android:scheme
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:28-49
+	tools:ignore
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:17-47
 action#android.intent.action.VIEW
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:17-69
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-69
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:25-66
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:25-66
 category#android.intent.category.DEFAULT
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:63:17-76
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:63:27-73
 data
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:64:17-78
 	android:mimeType
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:64:23-75
 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:66:13-71:29
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:68:13-73:29
 action#android.intent.action.INSERT_OR_EDIT
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:67:17-79
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:69:17-79
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:67:25-76
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:69:25-76
 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:73:13-76:29
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:75:13-78:29
 action#android.intent.action.SEARCH
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:74:17-71
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:76:17-71
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:74:25-68
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:76:25-68
 meta-data#android.app.searchable
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:78:13-80:54
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:80:13-82:54
 	android:resource
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:80:17-51
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:82:17-51
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:79:17-54
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:81:17-54
 provider#net.micode.notes.data.NotesProvider
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:83:9-86:43
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:85:9-88:43
 	android:authorities
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:85:13-47
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:87:13-47
 	android:multiprocess
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:86:13-40
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:88:13-40
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:84:13-63
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:86:13-63
 receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:88:9-100:20
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:90:9-102:20
 	android:label
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:90:13-50
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:13-50
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:89:13-57
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:91:13-57
 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:91:13-95:29
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:13-97:29
 action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:17-84
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:17-84
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:25-81
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:25-81
 action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:17-85
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:25-82
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82
 action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:96:17-85
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:96:25-82
 meta-data#android.appwidget.provider
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:97:13-99:58
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:99:13-101:58
 	android:resource
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:99:17-55
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:101:17-55
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:98:17-58
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:100:17-58
 receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:101:9-114:20
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:103:9-116:20
 	android:label
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:103:13-50
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:105:13-50
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:102:13-57
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:104:13-57
 receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:116:9-120:20
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:9-122:20
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:116:19-55
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:19-55
 intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:117:13-119:29
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:119:13-121:29
 action#android.intent.action.BOOT_COMPLETED
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:17-79
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:120:17-79
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:25-76
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:120:25-76
 receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:122:9-125:20
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:124:9-127:20
 	android:process
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:124:13-38
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:126:13-38
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:123:13-61
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:125:13-61
 activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:127:9-132:20
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:129:9-134:20
 	android:label
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:129:13-45
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:131:13-45
 	android:launchMode
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:130:13-48
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:132:13-48
 	android:theme
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:131:13-75
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:133:13-75
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:128:13-50
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:130:13-50
 activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:134:9-139:20
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:136:9-141:20
 	android:label
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:136:13-54
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:138:13-54
 	android:launchMode
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:137:13-43
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:139:13-43
 	android:theme
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:138:13-60
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:140:13-60
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:135:13-71
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:137:13-71
 service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:141:9-144:19
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:143:9-146:19
 	android:exported
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:143:13-37
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:145:13-37
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:142:13-74
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:144:13-74
 meta-data#android.app.default_searchable
-ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:146:9-148:52
+ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:148:9-150:52
 	android:value
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:148:13-49
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:150:13-49
 	android:name
-		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:147:13-58
+		ADDED from E:\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:149:13-58

src/Notes-master2/app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
 -->
 
 <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" >
@@ -41,7 +42,7 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
+
             android:windowSoftInputMode="adjustPan" >
 
             <intent-filter>
@@ -56,7 +57,8 @@
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme" >
 
-            <intent-filter>
+            <intent-filter android:scheme="http"
+                tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.item/text_note" />

src/Notes-master2/app/src/main/java/net/micode/notes/data/Contact.java

@@ -26,7 +26,7 @@ import android.util.Log;
 import java.util.HashMap;
 
 public class Contact {
-    private static HashMap<String, String> sContactCache;
+    private static HashMap<String, String> sContactCache;           //联系人数据库
     private static final String TAG = "Contact";
 
     private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
@@ -36,9 +36,9 @@ public class Contact {
             + " FROM phone_lookup"
             + " WHERE min_match = '+')";
 
-    public static String getContact(Context context, String phoneNumber) {
+    public static String getContact(Context context, String phoneNumber) { //获取联系人
         if(sContactCache == null) {
-            sContactCache = new HashMap<String, String>();
+            sContactCache = new HashMap<String, String>();  //数据库
         }
 
         if(sContactCache.containsKey(phoneNumber)) {

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

@@ -16,9 +16,9 @@
 
 package net.micode.notes.data;
 
-import android.net.Uri;
+import android.net.Uri;//被操作数据（便签文本数据）
 public class Notes {
-    public static final String AUTHORITY = "micode_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;
@@ -97,10 +97,10 @@ public class Notes {
          * Folder's name or text content of note
          * <P> Type: TEXT </P>
          */
-        public static final String SNIPPET = "snippet";
+        public static final String SNIPPET = "snippet";                //截图
 
         /**
-         * Note's widget id
+         * Note's widget id     //应用小部件
          * <P> Type: INTEGER (long) </P>
          */
         public static final String WIDGET_ID = "widget_id";

src/Notes-master2/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java

@@ -27,7 +27,7 @@ import net.micode.notes.data.Notes.DataConstants;
 import net.micode.notes.data.Notes.NoteColumns;
 
 
-public class NotesDatabaseHelper extends SQLiteOpenHelper {
+public class NotesDatabaseHelper extends SQLiteOpenHelper {  //辅助数据数据更新（载入）
     private static final String DB_NAME = "note.db";
 
     private static final int DB_VERSION = 4;
@@ -246,7 +246,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.insert(TABLE.NOTE, null, values);
 
         /**
-         * root folder which is default folder
+         * root folder which is default folder             //默认文件夹的根文件夹
          */
         values.clear();
         values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
@@ -254,7 +254,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.insert(TABLE.NOTE, null, values);
 
         /**
-         * temporary folder which is used for moving note
+         * temporary folder which is used for moving note  //用于移动的临时文件夹
          */
         values.clear();
         values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
@@ -262,7 +262,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.insert(TABLE.NOTE, null, values);
 
         /**
-         * create trash folder
+         * create trash folder                             //用于回收站文件夹
          */
         values.clear();
         values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
@@ -301,7 +301,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     }
 
     @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {//更新
         boolean reCreateTriggers = false;
         boolean skipV2 = false;
 

src/Notes-master2/app/src/main/java/net/micode/notes/data/NotesProvider.java

@@ -35,7 +35,7 @@ import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.data.NotesDatabaseHelper.TABLE;
 
 
-public class NotesProvider extends ContentProvider {
+public class NotesProvider extends ContentProvider { //便签数据更新
     private static final UriMatcher mMatcher;
 
     private NotesDatabaseHelper mHelper;
@@ -86,6 +86,7 @@ public class NotesProvider extends ContentProvider {
     }
 
     @Override
+    //返回搜索结果？？
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
             String sortOrder) {
         Cursor c = null;
@@ -148,6 +149,7 @@ public class NotesProvider extends ContentProvider {
     }
 
     @Override
+    //插入数据
     public Uri insert(Uri uri, ContentValues values) {
         SQLiteDatabase db = mHelper.getWritableDatabase();
         long dataId = 0, noteId = 0, insertedId = 0;
@@ -182,6 +184,7 @@ public class NotesProvider extends ContentProvider {
     }
 
     @Override
+    //删除数据
     public int delete(Uri uri, String selection, String[] selectionArgs) {
         int count = 0;
         String id = null;

src/Notes-master2/app/src/main/java/net/micode/notes/tool/DataUtils.java

@@ -71,7 +71,7 @@ public class DataUtils {
         }
         return false;
     }
-
+    //移动便签
     public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) {
         ContentValues values = new ContentValues();
         values.put(NoteColumns.PARENT_ID, desFolderId);

src/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java

@@ -39,7 +39,7 @@ import net.micode.notes.tool.DataUtils;
 
 import java.io.IOException;
 
-
+//闹钟程序组件
 public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
     private long mNoteId;
     private String mSnippet;
@@ -48,17 +48,19 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        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);
+            //将window放置在整个屏幕之内,无视其他的装饰(比如状态栏)window要在考虑到屏幕的其他装饰来定位其中的内容这个flag通常使用Window类的setFlags(int, int)方法来设置
         }
 
         Intent intent = getIntent();
@@ -82,15 +84,16 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
             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);
 
@@ -120,7 +123,7 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
     }
 
     private void showActionDialog() {
-        AlertDialog.Builder dialog = new AlertDialog.Builder(this);
+        AlertDialog.Builder dialog = new AlertDialog.Builder(this);//对话框
         dialog.setTitle(R.string.app_name);
         dialog.setMessage(mSnippet);
         dialog.setPositiveButton(R.string.notealert_ok, this);
@@ -132,7 +135,7 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
 
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
-            case DialogInterface.BUTTON_NEGATIVE:
+            case DialogInterface.BUTTON_NEGATIVE: //取消
                 Intent intent = new Intent(this, NoteEditActivity.class);
                 intent.setAction(Intent.ACTION_VIEW);
                 intent.putExtra(Intent.EXTRA_UID, mNoteId);

src/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java

@@ -27,7 +27,8 @@ import android.database.Cursor;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 
-
+//广播接收器用于响应来自其他应用程序或者系统的广播消息。这些消息有时被称为事件或者意图。
+//闹铃提醒启动消息接收器
 public class AlarmInitReceiver extends BroadcastReceiver {
 
     private static final String [] PROJECTION = new String [] {

src/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java

@@ -19,7 +19,7 @@ package net.micode.notes.ui;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-
+//闹铃提醒接收器
 public class AlarmReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {

src/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java

@@ -28,6 +28,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.NumberPicker;
 
+//设置日期时间
 public class DateTimePicker extends FrameLayout {
 
     private static final boolean DEFAULT_ENABLE_STATE = true;
@@ -63,7 +64,7 @@ public class DateTimePicker extends FrameLayout {
     private boolean mInitialising;
 
     private OnDateTimeChangedListener mOnDateTimeChangedListener;
-
+    //数字选择器来显示日期时间
     private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() {
         @Override
         public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
@@ -215,6 +216,7 @@ public class DateTimePicker extends FrameLayout {
     }
 
     @Override
+    //提醒启用
     public void setEnabled(boolean enabled) {
         if (mIsEnabled == enabled) {
             return;
@@ -246,6 +248,7 @@ public class DateTimePicker extends FrameLayout {
      *
      * @param date The current date in millis
      */
+    //设置当前时间
     public void setCurrentDate(long date) {
         Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(date);

src/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java

@@ -28,7 +28,7 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
-
+//实现时间滚动选择对话框
 public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
 
     private Calendar mDate = Calendar.getInstance();

src/Notes-master2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java

@@ -26,10 +26,10 @@ import android.widget.PopupMenu;
 import android.widget.PopupMenu.OnMenuItemClickListener;
 
 import net.micode.notes.R;
-
+//创建菜单
 public class DropdownMenu {
     private Button mButton;
-    private PopupMenu mPopupMenu;
+    private PopupMenu mPopupMenu; //弹出式菜单
     private Menu mMenu;
 
     public DropdownMenu(Context context, Button button, int menuId) {

src/Notes-master2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java

@@ -28,7 +28,9 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 
-
+//viewlist以列表的形式 展示具体数据内容，并且能够根据数据的长度自适应屏幕显示。
+//CursorAdapter这个类是继承于BaseAdapter的它是一个虚类它为Cursor和ListView连接提供了桥梁
+//列表展示
 public class FoldersListAdapter extends CursorAdapter {
     public static final String [] PROJECTION = {
         NoteColumns.ID,

src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java

@@ -71,19 +71,19 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
+//便签编辑程序组件
 public class NoteEditActivity extends Activity implements OnClickListener,
         NoteSettingChangedListener, OnTextViewChangeListener {
     private class HeadViewHolder {
-        public TextView tvModified;
+        public TextView tvModified;     //文本框
 
-        public ImageView ivAlertIcon;
+        public ImageView ivAlertIcon;   //图像视图
 
         public TextView tvAlertDate;
 
         public ImageView ibSetBgColor;
     }
-
+    //背景颜色设置
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
     static {
         sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -101,7 +101,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select);
         sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
     }
-
+    //大小设置
     private static final Map<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();
     static {
         sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
@@ -267,7 +267,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         super.onResume();
         initNoteScreen();
     }
-
+    //屏幕内容初始化
     private void initNoteScreen() {
         mNoteEditor.setTextAppearance(this, TextAppearanceResources
                 .getTexAppearanceResource(mFontSizeId));
@@ -294,7 +294,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
          */
         showAlertHeader();
     }
-
+    //提醒界面
     private void showAlertHeader() {
         if (mWorkingNote.hasClockAlert()) {
             long time = System.currentTimeMillis();
@@ -429,8 +429,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         int id = v.getId();
         if (id == R.id.btn_set_bg_color) {
             mNoteBgColorSelector.setVisibility(View.VISIBLE);
-            findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
-                    -                    View.VISIBLE);
+            findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(View.VISIBLE);
         } else if (sBgSelectorBtnsMap.containsKey(id)) {
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
                     View.GONE);
@@ -506,6 +505,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     @Override
+    //操作菜单
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_new_note:
@@ -573,7 +573,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         intent.setType("text/plain");
         context.startActivity(intent);
     }
-
+    //建立新便签
     private void createNewNote() {
         // Firstly, save current editing notes
         saveNote();
@@ -585,7 +585,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
         startActivity(intent);
     }
-
+    //删除当前便签
     private void deleteCurrentNote() {
         if (mWorkingNote.existInDatabase()) {
             HashSet<Long> ids = new HashSet<Long>();
@@ -718,7 +718,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 spannable.setSpan(
                         new BackgroundColorSpan(this.getResources().getColor(
                                 R.color.user_query_highlight)), m.start(), m.end(),
-                        Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+                        Spannable.SPAN_INCLUSIVE_EXCLUSIVE);//前包括，后不包括
                 start = m.end();
             }
         }
@@ -733,7 +733,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (isChecked) {
-                    edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+                    edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);//删除线
                 } else {
                     edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
                 }

src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditText.java

@@ -36,7 +36,7 @@ import net.micode.notes.R;
 
 import java.util.HashMap;
 import java.util.Map;
-
+//输入框
 public class NoteEditText extends EditText {
     private static final String TAG = "NoteEditText";
     private int mIndex;
@@ -120,7 +120,7 @@ public class NoteEditText extends EditText {
 
         return super.onTouchEvent(event);
     }
-
+//输入（按键事件）
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         switch (keyCode) {

src/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java

@@ -77,7 +77,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.HashSet;
-
+//便签查看列表程序组件
 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
@@ -345,7 +345,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             return true;
         }
     }
-
+//触摸事件
     private class NewNoteOnTouchListener implements OnTouchListener {
 
         public boolean onTouch(View v, MotionEvent event) {

src/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java

@@ -77,7 +77,7 @@ public class NotesListAdapter extends CursorAdapter {
         mSelectedIndex.clear();
         mChoiceMode = mode;
     }
-
+//实现全选
     public void selectAll(boolean checked) {
         Cursor cursor = getCursor();
         for (int i = 0; i < getCount(); i++) {

src/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java

@@ -47,7 +47,7 @@ import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.gtask.remote.GTaskSyncService;
 
-
+//其中PreferenceActivity负责加载选项配置列表的布局文件，PreferenceFragment负责加载选项配置的布局文件。
 public class NotesPreferenceActivity extends PreferenceActivity {
     public static final String PREFERENCE_NAME = "notes_preferences";
 

src/Notes-master2/app/src/main/res/values/styles.xml

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