新加回收站功能

src/Notes/.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-12-25T15:14:16.711993600Z">
+        <DropdownSelection timestamp="2024-12-31T06:50:45.693104500Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\83998\.android\avd\Pixel_8_Pro_API_UpsideDownCakePrivacySandbox_1.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\83998\.android\avd\Pixel_3a_XL_API_35.avd" />
             </handle>
           </Target>
         </DropdownSelection>

src/Notes/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_list-layout.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_list" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_list.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_list_0" view="FrameLayout"><Expressions/><location startLine="8" startOffset="0" endLine="51" endOffset="13"/></Target><Target id="@+id/tv_title_bar" view="TextView"><Expressions/><location startLine="20" startOffset="8" endLine="29" endOffset="61"/></Target><Target id="@+id/notes_list" view="ListView"><Expressions/><location startLine="32" startOffset="8" endLine="40" endOffset="40"/></Target><Target id="@+id/btn_new_note" view="Button"><Expressions/><location startLine="44" startOffset="4" endLine="50" endOffset="41"/></Target></Targets></Layout>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_list" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_list.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_list_0" view="FrameLayout"><Expressions/><location startLine="8" startOffset="0" endLine="54" endOffset="13"/></Target><Target id="@+id/tv_title_bar" view="TextView"><Expressions/><location startLine="22" startOffset="8" endLine="31" endOffset="61"/></Target><Target id="@+id/notes_list" view="ListView"><Expressions/><location startLine="34" startOffset="8" endLine="42" endOffset="40"/></Target><Target id="@+id/btn_new_note" view="Button"><Expressions/><location startLine="46" startOffset="4" endLine="52" endOffset="41"/></Target></Targets></Layout>

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

@@ -1,4 +1,4 @@
-#Wed Dec 25 11:32:06 CST 2024
+#Fri Jan 03 00:06:33 CST 2025
 net.micode.notes.app-main-10\:/color/primary_text_dark.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
 net.micode.notes.app-main-10\:/color/secondary_text_dark.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/bg_btn_set_color.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
@@ -71,6 +71,7 @@ net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_green.png=D\:\\SoftWareEn
 net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_red.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_white.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_yellow.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-10\:/drawable/ic_revoke.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_revoke.xml.flat
 net.micode.notes.app-main-10\:/drawable/new_note.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
 net.micode.notes.app-main-10\:/menu/call_note_edit.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
 net.micode.notes.app-main-10\:/menu/call_record_folder.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat

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

@@ -337,6 +337,7 @@
     <string name="menu_sync">Sync</string>
     <string name="menu_sync_cancel">Cancel syncing</string>
     <string name="menu_title_select_folder">Select folder</string>
+    <string name="menu_trash">Trash Folder</string>
     <string name="night_time">night mode</string>
     <string name="note_alert_expired">Expired</string>
     <string name="note_length">Length</string>

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

@@ -1,4 +1,4 @@
-#Wed Dec 25 23:49:12 CST 2024
+#Fri Jan 03 00:10:34 CST 2025
 base.0=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
 base.1=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
 base.2=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex

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

@@ -40,7 +40,7 @@
 19-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:22-78
 20
 21    <application
-21-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:19:5-175:19
+21-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:19:5-177:19
 22        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
 22-->[com.android.support:support-compat:28.0.0] D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91
 23        android:debuggable="true"
@@ -50,298 +50,299 @@
 25-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:21:9-41
 26        android:testOnly="true" >
 27        <activity
-27-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:22:9-32:20
-28            android:name="net.micode.notes.ui.SplashActivity"
-28-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:23:13-46
-29            android:configChanges="orientation|keyboardHidden|screenSize"
-29-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:24:13-74
-30            android:label="@string/title_activity_splash"
-30-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:26:13-58
-31            android:theme="@style/Theme.Notes.Fullscreen" >
-31-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:27:13-58
-32            <intent-filter>
-32-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-31:29
-33                <action android:name="android.intent.action.MAIN" />
-33-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:17-69
-33-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:25-66
-34
-35                <category android:name="android.intent.category.LAUNCHER" />
-35-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:17-77
-35-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:27-74
-36            </intent-filter>
-37        </activity>
-38        <activity
-38-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:9-47:20
-39            android:name="net.micode.notes.ui.LoginActivity"
-39-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:34:13-45
-40            android:configChanges="keyboardHidden|orientation|screenSize"
-40-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:13-74
-41            android:label="@string/app_name"
-41-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:36:13-45
-42            android:launchMode="singleTop"
-42-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:37:13-43
-43            android:theme="@style/NoteTheme"
-43-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:38:13-45
-44            android:uiOptions="splitActionBarWhenNarrow"
-44-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:39:13-57
-45            android:windowSoftInputMode="adjustPan" >
-45-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:40:13-52
-46            <intent-filter>
-46-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-31:29
-47                <action android:name="android.intent.action.MAIN" />
-47-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:17-69
-47-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:25-66
-48
-49                <category android:name="android.intent.category.LAUNCHER" />
-49-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:17-77
-49-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:27-74
-50            </intent-filter>
-51        </activity>
-52        <activity
-52-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:48:9-55:20
-53            android:name="net.micode.notes.ui.ChangedLoginPassword"
-53-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:49:13-52
-54            android:configChanges="keyboardHidden|orientation|screenSize"
-54-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:50:13-74
-55            android:label="@string/app_name"
-55-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:51:13-45
-56            android:launchMode="singleTop"
-56-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:52:13-43
-57            android:theme="@style/NoteTheme"
-57-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:53:13-45
-58            android:windowSoftInputMode="adjustPan" >
-58-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:54:13-52
-59        </activity>
-60        <activity
-60-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:56:9-63:20
-61            android:name="net.micode.notes.ui.RegisterLoginPassword"
-61-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:57:13-53
-62            android:configChanges="keyboardHidden|orientation|screenSize"
-62-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:58:13-74
-63            android:label="@string/app_name"
-63-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:59:13-45
-64            android:launchMode="singleTop"
-64-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:60:13-43
-65            android:theme="@style/NoteTheme"
-65-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:61:13-45
-66            android:windowSoftInputMode="adjustPan" >
-66-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:62:13-52
-67        </activity>
-68        <activity
-68-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:64:9-71:20
-69            android:name="net.micode.notes.ui.DeleteLoginPassword"
-69-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:65:13-51
-70            android:configChanges="keyboardHidden|orientation|screenSize"
-70-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:66:13-74
-71            android:label="@string/app_name"
-71-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:67:13-45
-72            android:launchMode="singleTop"
-72-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:68:13-43
-73            android:theme="@style/NoteTheme"
-73-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:69:13-45
-74            android:windowSoftInputMode="adjustPan" >
-74-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:70:13-52
-75        </activity> <!-- 主Activity，启动器 -->
-76        <activity
-76-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:72:9-83:20
-77            android:name="net.micode.notes.ui.NotesListActivity"
-77-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:73:13-49
-78            android:configChanges="keyboardHidden|orientation|screenSize"
-78-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:74:13-74
-79            android:label="@string/app_name"
-79-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:75:13-45
-80            android:launchMode="singleTop"
-80-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:76:13-43
-81            android:theme="@style/NoteTheme"
-81-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:77:13-45
-82            android:windowSoftInputMode="adjustPan" >
-82-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:78:13-52
-83            <intent-filter>
-83-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-31:29
-84                <action android:name="android.intent.action.MAIN" />
-84-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:17-69
-84-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:25-66
-85
-86                <category android:name="android.intent.category.LAUNCHER" />
-86-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:17-77
-86-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:27-74
-87            </intent-filter>
-88        </activity> <!-- 编辑笔记的Activity -->
-89        <activity
-89-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:84:9-120:20
-90            android:name="net.micode.notes.ui.NoteEditActivity"
-90-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:85:13-48
-91            android:configChanges="keyboardHidden|orientation|screenSize"
-91-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:86:13-74
-92            android:launchMode="singleTop"
-92-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:87:13-43
-93            android:theme="@style/NoteTheme" >
-93-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:88:13-45
-94
-95            <!-- 处理外部HTTP链接和编辑意图 -->
-96            <intent-filter android:scheme="http" >
-96-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:91:13-100:29
-96-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:92:17-38
-97                <action android:name="android.intent.action.VIEW" />
-97-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:17-69
-97-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:25-66
-98
-99                <category android:name="android.intent.category.DEFAULT" />
-99-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-76
-99-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:27-73
-100
-101                <data android:mimeType="vnd.android.cursor.item/text_note" />
-101-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-78
-101-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:23-75
-102                <data android:mimeType="vnd.android.cursor.item/call_note" />
-102-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-78
-102-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:23-75
-103            </intent-filter>
-104            <!-- 处理插入或编辑意图 -->
-105            <intent-filter>
-105-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:102:13-109:29
-106                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-106-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:103:17-79
-106-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:103:25-76
-107
-108                <category android:name="android.intent.category.DEFAULT" />
-108-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-76
-108-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:27-73
-109
-110                <data android:mimeType="vnd.android.cursor.item/text_note" />
-110-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-78
-110-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:23-75
-111                <data android:mimeType="vnd.android.cursor.item/call_note" />
-111-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-78
-111-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:23-75
-112            </intent-filter>
-113            <!-- 处理搜索意图 -->
-114            <intent-filter>
-114-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:111:13-115:29
-115                <action android:name="android.intent.action.SEARCH" />
-115-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:112:17-71
-115-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:112:25-68
-116
-117                <category android:name="android.intent.category.DEFAULT" />
-117-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-76
-117-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:27-73
-118            </intent-filter>
-119            <!-- 搜索配置 -->
-120            <meta-data
-120-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:117:13-119:54
-121                android:name="android.app.searchable"
-121-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:118:17-54
-122                android:resource="@xml/searchable" />
-122-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:119:17-51
-123        </activity> <!-- 提供者：用于管理笔记数据 -->
-124        <provider
-124-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:121:9-124:43
-125            android:name="net.micode.notes.data.NotesProvider"
-125-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:122:13-47
-126            android:authorities="micode_notes"
-126-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:123:13-47
-127            android:multiprocess="true" /> <!-- 小部件提供者：2x2尺寸 -->
-127-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:124:13-40
-128        <receiver
-128-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:125:9-137:20
-129            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-129-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:126:13-57
-130            android:label="@string/app_widget2x2" >
-130-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:127:13-50
-131            <intent-filter>
-131-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128:13-132:29
-132                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-132-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:17-84
-132-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:25-81
-133                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-133-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:17-85
-133-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:25-82
-134                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-134-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-85
-134-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-82
-135            </intent-filter>
-136
-137            <meta-data
-137-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:134:13-136:58
-138                android:name="android.appwidget.provider"
-138-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:135:17-58
-139                android:resource="@xml/widget_2x_info" />
-139-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:17-55
-140        </receiver> <!-- 小部件提供者：4x4尺寸 -->
-141        <receiver
-141-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:9-150:20
-142            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-142-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:139:13-57
-143            android:label="@string/app_widget4x4" >
-143-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:140:13-50
-144            <intent-filter>
-144-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128:13-132:29
-145                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-145-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:17-84
-145-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:25-81
-146                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-146-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:17-85
-146-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:25-82
-147                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-147-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-85
-147-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-82
-148            </intent-filter>
-149
-150            <meta-data
-150-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:134:13-136:58
-151                android:name="android.appwidget.provider"
-151-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:135:17-58
-152                android:resource="@xml/widget_4x_info" />
-152-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:17-55
-153        </receiver> <!-- 启动完成时初始化闹钟 -->
-154        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-154-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:151:9-155:20
-154-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:151:19-55
-155            <intent-filter>
-155-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:152:13-154:29
-156                <action android:name="android.intent.action.BOOT_COMPLETED" />
-156-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:17-79
-156-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:25-76
-157            </intent-filter>
-158        </receiver> <!-- 闹钟接收器：运行在远程进程中 -->
-159        <receiver
-159-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:156:9-158:41
-160            android:name="net.micode.notes.ui.AlarmReceiver"
-160-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:157:13-45
-161            android:process=":remote" /> <!-- 闹钟提醒Activity -->
-161-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:158:13-38
-162        <activity
-162-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:159:9-163:78
-163            android:name="net.micode.notes.ui.AlarmAlertActivity"
-163-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:160:13-50
-164            android:label="@string/app_name"
-164-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:161:13-45
-165            android:launchMode="singleInstance"
-165-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:162:13-48
-166            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> <!-- 设置Activity -->
-166-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:163:13-75
-167        <activity
-167-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:164:9-168:63
-168            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-168-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:165:13-55
-169            android:label="@string/preferences_title"
-169-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:166:13-54
-170            android:launchMode="singleTop"
-170-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:167:13-43
-171            android:theme="@android:style/Theme.Holo.Light" /> <!-- 任务同步服务 -->
-171-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:168:13-60
-172        <service
-172-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:169:9-171:40
-173            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-173-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:170:13-58
-174            android:exported="false" /> <!-- 默认搜索设置 -->
-174-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:171:13-37
-175        <meta-data
-175-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:172:9-174:52
-176            android:name="android.app.default_searchable"
-176-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:173:13-58
-177            android:value=".ui.NoteEditActivity" />
-177-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:174:13-49
-178    </application>
-179
-180</manifest>
+27-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:23:9-37:20
+28            android:name="net.micode.notes.ui.LoginActivity"
+28-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:24:13-45
+29            android:configChanges="keyboardHidden|orientation|screenSize"
+29-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:25:13-74
+30            android:label="@string/app_name"
+30-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:26:13-45
+31            android:launchMode="singleTop"
+31-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:27:13-43
+32            android:theme="@style/NoteTheme"
+32-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-45
+33            android:uiOptions="splitActionBarWhenNarrow"
+33-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:13-57
+34            android:windowSoftInputMode="adjustPan" >
+34-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:13-52
+35            <intent-filter>
+35-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29
+36                <action android:name="android.intent.action.MAIN" />
+36-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69
+36-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66
+37
+38                <category android:name="android.intent.category.LAUNCHER" />
+38-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77
+38-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74
+39            </intent-filter>
+40        </activity>
+41        <activity
+41-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:38:9-45:20
+42            android:name="net.micode.notes.ui.ChangedLoginPassword"
+42-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:39:13-52
+43            android:configChanges="keyboardHidden|orientation|screenSize"
+43-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:40:13-74
+44            android:label="@string/app_name"
+44-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:41:13-45
+45            android:launchMode="singleTop"
+45-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:42:13-43
+46            android:theme="@style/NoteTheme"
+46-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:43:13-45
+47            android:windowSoftInputMode="adjustPan" >
+47-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:44:13-52
+48        </activity>
+49        <activity
+49-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:46:9-53:20
+50            android:name="net.micode.notes.ui.RegisterLoginPassword"
+50-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:47:13-53
+51            android:configChanges="keyboardHidden|orientation|screenSize"
+51-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:48:13-74
+52            android:label="@string/app_name"
+52-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:49:13-45
+53            android:launchMode="singleTop"
+53-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:50:13-43
+54            android:theme="@style/NoteTheme"
+54-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:51:13-45
+55            android:windowSoftInputMode="adjustPan" >
+55-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:52:13-52
+56        </activity>
+57        <activity
+57-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:54:9-61:20
+58            android:name="net.micode.notes.ui.DeleteLoginPassword"
+58-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:55:13-51
+59            android:configChanges="keyboardHidden|orientation|screenSize"
+59-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:56:13-74
+60            android:label="@string/app_name"
+60-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:57:13-45
+61            android:launchMode="singleTop"
+61-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:58:13-43
+62            android:theme="@style/NoteTheme"
+62-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:59:13-45
+63            android:windowSoftInputMode="adjustPan" >
+63-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:60:13-52
+64        </activity>
+65        <activity
+65-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:62:9-72:20
+66            android:name="net.micode.notes.ui.SplashActivity"
+66-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:63:13-46
+67            android:configChanges="orientation|keyboardHidden|screenSize"
+67-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:64:13-74
+68            android:label="@string/title_activity_splash"
+68-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:66:13-58
+69            android:theme="@style/Theme.Notes.Fullscreen" >
+69-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:67:13-58
+70            <intent-filter>
+70-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29
+71                <action android:name="android.intent.action.MAIN" />
+71-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69
+71-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66
+72
+73                <category android:name="android.intent.category.LAUNCHER" />
+73-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77
+73-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74
+74            </intent-filter>
+75        </activity>
+76        <!-- 主Activity，启动器 -->
+77        <activity
+77-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:74:9-85:20
+78            android:name="net.micode.notes.ui.NotesListActivity"
+78-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:75:13-49
+79            android:configChanges="keyboardHidden|orientation|screenSize"
+79-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:76:13-74
+80            android:label="@string/app_name"
+80-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:77:13-45
+81            android:launchMode="singleTop"
+81-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:78:13-43
+82            android:theme="@style/NoteTheme"
+82-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:79:13-45
+83            android:windowSoftInputMode="adjustPan" >
+83-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:80:13-52
+84            <intent-filter>
+84-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29
+85                <action android:name="android.intent.action.MAIN" />
+85-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69
+85-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66
+86
+87                <category android:name="android.intent.category.LAUNCHER" />
+87-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77
+87-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74
+88            </intent-filter>
+89        </activity> <!-- 编辑笔记的Activity -->
+90        <activity
+90-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:86:9-122:20
+91            android:name="net.micode.notes.ui.NoteEditActivity"
+91-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:87:13-48
+92            android:configChanges="keyboardHidden|orientation|screenSize"
+92-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:88:13-74
+93            android:launchMode="singleTop"
+93-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:89:13-43
+94            android:theme="@style/NoteTheme" >
+94-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:90:13-45
+95
+96            <!-- 处理外部HTTP链接和编辑意图 -->
+97            <intent-filter android:scheme="http" >
+97-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:93:13-102:29
+97-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:17-38
+98                <action android:name="android.intent.action.VIEW" />
+98-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-69
+98-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:25-66
+99
+100                <category android:name="android.intent.category.DEFAULT" />
+100-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76
+100-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73
+101
+102                <data android:mimeType="vnd.android.cursor.item/text_note" />
+102-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78
+102-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75
+103                <data android:mimeType="vnd.android.cursor.item/call_note" />
+103-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78
+103-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75
+104            </intent-filter>
+105            <!-- 处理插入或编辑意图 -->
+106            <intent-filter>
+106-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:104:13-111:29
+107                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+107-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:17-79
+107-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:25-76
+108
+109                <category android:name="android.intent.category.DEFAULT" />
+109-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76
+109-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73
+110
+111                <data android:mimeType="vnd.android.cursor.item/text_note" />
+111-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78
+111-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75
+112                <data android:mimeType="vnd.android.cursor.item/call_note" />
+112-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78
+112-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75
+113            </intent-filter>
+114            <!-- 处理搜索意图 -->
+115            <intent-filter>
+115-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:113:13-117:29
+116                <action android:name="android.intent.action.SEARCH" />
+116-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:17-71
+116-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:25-68
+117
+118                <category android:name="android.intent.category.DEFAULT" />
+118-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76
+118-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73
+119            </intent-filter>
+120            <!-- 搜索配置 -->
+121            <meta-data
+121-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:119:13-121:54
+122                android:name="android.app.searchable"
+122-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:120:17-54
+123                android:resource="@xml/searchable" />
+123-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:121:17-51
+124        </activity> <!-- 提供者：用于管理笔记数据 -->
+125        <provider
+125-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:123:9-126:43
+126            android:name="net.micode.notes.data.NotesProvider"
+126-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:124:13-47
+127            android:authorities="micode_notes"
+127-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:125:13-47
+128            android:multiprocess="true" /> <!-- 小部件提供者：2x2尺寸 -->
+128-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:126:13-40
+129        <receiver
+129-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:127:9-139:20
+130            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+130-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128:13-57
+131            android:label="@string/app_widget2x2" >
+131-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:13-50
+132            <intent-filter>
+132-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:13-134:29
+133                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+133-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-84
+133-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-81
+134                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+134-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:17-85
+134-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:25-82
+135                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+135-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:17-85
+135-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:25-82
+136            </intent-filter>
+137
+138            <meta-data
+138-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:13-138:58
+139                android:name="android.appwidget.provider"
+139-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:137:17-58
+140                android:resource="@xml/widget_2x_info" />
+140-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:17-55
+141        </receiver> <!-- 小部件提供者：4x4尺寸 -->
+142        <receiver
+142-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:140:9-152:20
+143            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+143-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:141:13-57
+144            android:label="@string/app_widget4x4" >
+144-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:142:13-50
+145            <intent-filter>
+145-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:13-134:29
+146                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+146-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-84
+146-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-81
+147                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+147-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:17-85
+147-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:25-82
+148                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+148-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:17-85
+148-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:25-82
+149            </intent-filter>
+150
+151            <meta-data
+151-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:13-138:58
+152                android:name="android.appwidget.provider"
+152-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:137:17-58
+153                android:resource="@xml/widget_4x_info" />
+153-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:17-55
+154        </receiver> <!-- 启动完成时初始化闹钟 -->
+155        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+155-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:9-157:20
+155-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:19-55
+156            <intent-filter>
+156-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:154:13-156:29
+157                <action android:name="android.intent.action.BOOT_COMPLETED" />
+157-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:17-79
+157-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:25-76
+158            </intent-filter>
+159        </receiver> <!-- 闹钟接收器：运行在远程进程中 -->
+160        <receiver
+160-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:158:9-160:41
+161            android:name="net.micode.notes.ui.AlarmReceiver"
+161-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:159:13-45
+162            android:process=":remote" /> <!-- 闹钟提醒Activity -->
+162-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:160:13-38
+163        <activity
+163-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:161:9-165:78
+164            android:name="net.micode.notes.ui.AlarmAlertActivity"
+164-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:162:13-50
+165            android:label="@string/app_name"
+165-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:163:13-45
+166            android:launchMode="singleInstance"
+166-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:164:13-48
+167            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> <!-- 设置Activity -->
+167-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:165:13-75
+168        <activity
+168-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:166:9-170:63
+169            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+169-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:167:13-55
+170            android:label="@string/preferences_title"
+170-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:168:13-54
+171            android:launchMode="singleTop"
+171-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:169:13-43
+172            android:theme="@android:style/Theme.Holo.Light" /> <!-- 任务同步服务 -->
+172-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:170:13-60
+173        <service
+173-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:171:9-173:40
+174            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+174-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:172:13-58
+175            android:exported="false" /> <!-- 默认搜索设置 -->
+175-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:173:13-37
+176        <meta-data
+176-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:174:9-176:52
+177            android:name="android.app.default_searchable"
+177-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:175:13-58
+178            android:value=".ui.NoteEditActivity" />
+178-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:176:13-49
+179    </application>
+180
+181</manifest>

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

@@ -24,17 +24,6 @@
         android:icon="@drawable/icon_app"
         android:label="@string/app_name"
         android:testOnly="true" >
-        <activity
-            android:name="net.micode.notes.ui.SplashActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/title_activity_splash"
-            android:theme="@style/Theme.Notes.Fullscreen" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
         <activity
             android:name="net.micode.notes.ui.LoginActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -72,7 +61,19 @@
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
             android:windowSoftInputMode="adjustPan" >
-        </activity> <!-- 主Activity，启动器 -->
+        </activity>
+        <activity
+            android:name="net.micode.notes.ui.SplashActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/title_activity_splash"
+            android:theme="@style/Theme.Notes.Fullscreen" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <!-- 主Activity，启动器 -->
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

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

@@ -24,17 +24,6 @@
         android:icon="@drawable/icon_app"
         android:label="@string/app_name"
         android:testOnly="true" >
-        <activity
-            android:name="net.micode.notes.ui.SplashActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/title_activity_splash"
-            android:theme="@style/Theme.Notes.Fullscreen" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
         <activity
             android:name="net.micode.notes.ui.LoginActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -72,7 +61,19 @@
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
             android:windowSoftInputMode="adjustPan" >
-        </activity> <!-- 主Activity，启动器 -->
+        </activity>
+        <activity
+            android:name="net.micode.notes.ui.SplashActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/title_activity_splash"
+            android:theme="@style/Theme.Notes.Fullscreen" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <!-- 主Activity，启动器 -->
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

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

@@ -178,12 +178,12 @@
                         "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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,371,387,388,389,390,391,392,400,401,405,409,413,418,424,431,435,439,444,448,452,456,460,464,468,474,478,484,488,494,498,503,507,510,514,520,524,530,534,540,543,547,551,555,559,563,564,565,566,569,572,575,578,582,583,584,585,586,589,591,593,595,600,601,605,611,615,616,618,629,630,634,640,644,645,646,650,677,681,682,686,714,881,907,1075,1101,1132,1140,1146,1160,1182,1187,1192,1202,1211,1220,1224,1231,1239,1246,1247,1256,1259,1262,1266,1270,1274,1277,1278,1282,1286,1296,1301,1308,1314,1315,1318,1322,1327,1329,1331,1334,1337,1339,1343,1346,1353,1356,1359,1363,1365,1369,1371,1373,1375,1379,1387,1395,1407,1413,1422,1425,1436,1439,1444,1445,1465,1523,1582,1583,1593,1602,1603,1605,1609,1612,1615,1618,1621,1624,1627,1630,1634,1637,1640,1643,1647,1650,1654,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1680,1682,1683,1684,1685,1686,1687,1688,1689,1691,1692,1694,1695,1697,1699,1700,1702,1703,1704,1705,1706,1707,1709,1710,1711,1712,1713,1725,1727,1729,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1773,1774,1775,1776,1777,1778,1780,1784,1794,1795,1796,1797,1798,1799,1800,1805,1807,1809,1811,1813,1815,1816,1817,1818,1820,1822,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1838,1839,1840,1841,1843,1845,1846,1848,1849,1851,1853,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1868,1869,1870,1871,1873,1874,1875,1876,1877,1879,1881,1883,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898",
+                        "startLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,372,388,389,390,391,392,393,401,402,406,410,414,419,425,432,436,440,445,449,453,457,461,465,469,475,479,485,489,495,499,504,508,511,515,521,525,531,535,541,544,548,552,556,560,564,565,566,567,570,573,576,579,583,584,585,586,587,590,592,594,596,601,602,606,612,616,617,619,630,631,635,641,645,646,647,651,678,682,683,687,715,882,908,1076,1102,1133,1141,1147,1161,1183,1188,1193,1203,1212,1221,1225,1232,1240,1247,1248,1257,1260,1263,1267,1271,1275,1278,1279,1283,1287,1297,1302,1309,1315,1316,1319,1323,1328,1330,1332,1335,1338,1340,1344,1347,1354,1357,1360,1364,1366,1370,1372,1374,1376,1380,1388,1396,1408,1414,1423,1426,1437,1440,1445,1446,1466,1524,1583,1584,1594,1603,1604,1606,1610,1613,1616,1619,1622,1625,1628,1631,1635,1638,1641,1644,1648,1651,1655,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1681,1683,1684,1685,1686,1687,1688,1689,1690,1692,1693,1695,1696,1698,1700,1701,1703,1704,1705,1706,1707,1708,1710,1711,1712,1713,1714,1726,1728,1730,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1774,1775,1776,1777,1778,1779,1781,1785,1795,1796,1797,1798,1799,1800,1801,1806,1808,1810,1812,1814,1816,1817,1818,1819,1821,1823,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1839,1840,1841,1842,1844,1846,1847,1849,1850,1852,1854,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1869,1870,1871,1872,1874,1875,1876,1877,1878,1880,1882,1884,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899",
                         "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24301,25462,25540,25630,25718,25814,25904,26486,26575,26822,27103,27355,27640,28033,28510,28732,28954,29230,29457,29687,29917,30147,30377,30604,31023,31249,31674,31904,32332,32551,32834,33042,33173,33400,33826,34051,34478,34699,35124,35244,35520,35821,36145,36436,36750,36887,37018,37123,37365,37532,37736,37944,38215,38327,38439,38544,38661,38875,39021,39161,39247,39595,39683,39929,40347,40596,40678,40776,41368,41468,41720,42144,42399,42493,42582,42819,44843,45085,45187,45440,47596,57725,59241,69469,70997,72754,73380,73800,74861,76126,76382,76618,77165,77659,78264,78462,79042,79606,79981,80099,80637,80794,80990,81263,81519,81689,81830,81894,82176,82462,83138,83402,83740,84093,84187,84373,84679,84941,85066,85193,85432,85643,85762,85955,86132,86587,86768,86890,87149,87262,87449,87551,87658,87787,88062,88570,89066,89943,90237,90807,90956,91688,91860,92196,92288,93355,97637,102062,102124,102702,103286,103377,103490,103719,103879,104031,104202,104368,104537,104704,104867,105110,105280,105453,105624,105898,106097,106302,106632,106716,106812,106908,107006,107106,107208,107310,107412,107514,107616,107716,107812,107924,108053,108176,108307,108438,108536,108650,108744,108884,109018,109114,109226,109326,109442,109538,109650,109750,109890,110026,110190,110320,110478,110628,110769,110913,111048,111160,111310,111438,111566,111702,111834,111964,112094,112206,113104,113250,113394,114878,114944,115034,115110,115214,115304,115406,115514,115622,115722,115802,115894,115992,116102,116180,116286,116378,116482,116592,116714,116877,117394,117474,117574,117664,117774,117868,117974,118294,118394,118506,118620,118736,118852,118946,119060,119172,119274,119394,119516,119598,119702,119822,119948,120046,120140,120228,120340,120456,120578,120690,120865,120981,121067,121159,121271,121395,121462,121588,121656,121784,121928,122056,122125,122220,122335,122448,122547,122656,122767,122878,122979,123084,123184,123314,123405,123528,123622,123734,123820,123924,124020,124108,124226,124330,124434,124560,124648,124756,124856,124946,125056,125140,125242,125326,125380,125444,125550,125660,125744",
-                        "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,371,387,388,389,390,391,399,400,404,408,412,417,423,430,434,438,443,447,451,455,459,463,467,473,477,483,487,493,497,502,506,509,513,519,523,529,533,539,542,546,550,554,558,562,563,564,565,568,571,574,577,581,582,583,584,585,588,590,592,594,599,600,604,610,614,615,617,628,629,633,639,643,644,645,649,676,680,681,685,713,880,906,1074,1100,1131,1139,1145,1159,1181,1186,1191,1201,1210,1219,1223,1230,1238,1245,1246,1255,1258,1261,1265,1269,1273,1276,1277,1281,1285,1295,1300,1307,1313,1314,1317,1321,1326,1328,1330,1333,1336,1338,1342,1345,1352,1355,1358,1362,1364,1368,1370,1372,1374,1378,1386,1394,1406,1412,1421,1424,1435,1438,1443,1444,1449,1522,1581,1582,1592,1601,1602,1604,1608,1611,1614,1617,1620,1623,1626,1629,1633,1636,1639,1642,1646,1649,1653,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1679,1681,1682,1683,1684,1685,1686,1687,1688,1690,1691,1693,1694,1696,1698,1699,1701,1702,1703,1704,1705,1706,1708,1709,1710,1711,1712,1713,1726,1728,1730,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1772,1773,1774,1775,1776,1777,1779,1783,1787,1794,1795,1796,1797,1798,1799,1800,1806,1808,1810,1812,1814,1815,1816,1817,1819,1821,1823,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1837,1838,1839,1840,1842,1844,1845,1847,1848,1850,1852,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1867,1868,1869,1870,1872,1873,1874,1875,1876,1878,1880,1882,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898",
+                        "startOffsets": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24353,25514,25592,25682,25770,25866,25956,26538,26627,26874,27155,27407,27692,28085,28562,28784,29006,29282,29509,29739,29969,30199,30429,30656,31075,31301,31726,31956,32384,32603,32886,33094,33225,33452,33878,34103,34530,34751,35176,35296,35572,35873,36197,36488,36802,36939,37070,37175,37417,37584,37788,37996,38267,38379,38491,38596,38713,38927,39073,39213,39299,39647,39735,39981,40399,40648,40730,40828,41420,41520,41772,42196,42451,42545,42634,42871,44895,45137,45239,45492,47648,57777,59293,69521,71049,72806,73432,73852,74913,76178,76434,76670,77217,77711,78316,78514,79094,79658,80033,80151,80689,80846,81042,81315,81571,81741,81882,81946,82228,82514,83190,83454,83792,84145,84239,84425,84731,84993,85118,85245,85484,85695,85814,86007,86184,86639,86820,86942,87201,87314,87501,87603,87710,87839,88114,88622,89118,89995,90289,90859,91008,91740,91912,92248,92340,93407,97689,102114,102176,102754,103338,103429,103542,103771,103931,104083,104254,104420,104589,104756,104919,105162,105332,105505,105676,105950,106149,106354,106684,106768,106864,106960,107058,107158,107260,107362,107464,107566,107668,107768,107864,107976,108105,108228,108359,108490,108588,108702,108796,108936,109070,109166,109278,109378,109494,109590,109702,109802,109942,110078,110242,110372,110530,110680,110821,110965,111100,111212,111362,111490,111618,111754,111886,112016,112146,112258,113156,113302,113446,114930,114996,115086,115162,115266,115356,115458,115566,115674,115774,115854,115946,116044,116154,116232,116338,116430,116534,116644,116766,116929,117446,117526,117626,117716,117826,117920,118026,118346,118446,118558,118672,118788,118904,118998,119112,119224,119326,119446,119568,119650,119754,119874,120000,120098,120192,120280,120392,120508,120630,120742,120917,121033,121119,121211,121323,121447,121514,121640,121708,121836,121980,122108,122177,122272,122387,122500,122599,122708,122819,122930,123031,123136,123236,123366,123457,123580,123674,123786,123872,123976,124072,124160,124278,124382,124486,124612,124700,124808,124908,124998,125108,125192,125294,125378,125432,125496,125602,125712,125796",
+                        "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,372,388,389,390,391,392,400,401,405,409,413,418,424,431,435,439,444,448,452,456,460,464,468,474,478,484,488,494,498,503,507,510,514,520,524,530,534,540,543,547,551,555,559,563,564,565,566,569,572,575,578,582,583,584,585,586,589,591,593,595,600,601,605,611,615,616,618,629,630,634,640,644,645,646,650,677,681,682,686,714,881,907,1075,1101,1132,1140,1146,1160,1182,1187,1192,1202,1211,1220,1224,1231,1239,1246,1247,1256,1259,1262,1266,1270,1274,1277,1278,1282,1286,1296,1301,1308,1314,1315,1318,1322,1327,1329,1331,1334,1337,1339,1343,1346,1353,1356,1359,1363,1365,1369,1371,1373,1375,1379,1387,1395,1407,1413,1422,1425,1436,1439,1444,1445,1450,1523,1582,1583,1593,1602,1603,1605,1609,1612,1615,1618,1621,1624,1627,1630,1634,1637,1640,1643,1647,1650,1654,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1680,1682,1683,1684,1685,1686,1687,1688,1689,1691,1692,1694,1695,1697,1699,1700,1702,1703,1704,1705,1706,1707,1709,1710,1711,1712,1713,1714,1727,1729,1731,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1773,1774,1775,1776,1777,1778,1780,1784,1788,1795,1796,1797,1798,1799,1800,1801,1807,1809,1811,1813,1815,1816,1817,1818,1820,1822,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1838,1839,1840,1841,1843,1845,1846,1848,1849,1851,1853,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1868,1869,1870,1871,1873,1874,1875,1876,1877,1879,1881,1883,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899",
                         "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119",
-                        "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24349,25535,25625,25713,25809,25899,26481,26570,26817,27098,27350,27635,28028,28505,28727,28949,29225,29452,29682,29912,30142,30372,30599,31018,31244,31669,31899,32327,32546,32829,33037,33168,33395,33821,34046,34473,34694,35119,35239,35515,35816,36140,36431,36745,36882,37013,37118,37360,37527,37731,37939,38210,38322,38434,38539,38656,38870,39016,39156,39242,39590,39678,39924,40342,40591,40673,40771,41363,41463,41715,42139,42394,42488,42577,42814,44838,45080,45182,45435,47591,57720,59236,69464,70992,72749,73375,73795,74856,76121,76377,76613,77160,77654,78259,78457,79037,79601,79976,80094,80632,80789,80985,81258,81514,81684,81825,81889,82171,82457,83133,83397,83735,84088,84182,84368,84674,84936,85061,85188,85427,85638,85757,85950,86127,86582,86763,86885,87144,87257,87444,87546,87653,87782,88057,88565,89061,89938,90232,90802,90951,91683,91855,92191,92283,92561,97632,102057,102119,102697,103281,103372,103485,103714,103874,104026,104197,104363,104532,104699,104862,105105,105275,105448,105619,105893,106092,106297,106627,106711,106807,106903,107001,107101,107203,107305,107407,107509,107611,107711,107807,107919,108048,108171,108302,108433,108531,108645,108739,108879,109013,109109,109221,109321,109437,109533,109645,109745,109885,110021,110185,110315,110473,110623,110764,110908,111043,111155,111305,111433,111561,111697,111829,111959,112089,112201,112341,113245,113389,113527,114939,115029,115105,115209,115299,115401,115509,115617,115717,115797,115889,115987,116097,116175,116281,116373,116477,116587,116709,116872,117029,117469,117569,117659,117769,117863,117969,118061,118389,118501,118615,118731,118847,118941,119055,119167,119269,119389,119511,119593,119697,119817,119943,120041,120135,120223,120335,120451,120573,120685,120860,120976,121062,121154,121266,121390,121457,121583,121651,121779,121923,122051,122120,122215,122330,122443,122542,122651,122762,122873,122974,123079,123179,123309,123400,123523,123617,123729,123815,123919,124015,124103,124221,124325,124429,124555,124643,124751,124851,124941,125051,125135,125237,125321,125375,125439,125545,125655,125739,125859"
+                        "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24401,25587,25677,25765,25861,25951,26533,26622,26869,27150,27402,27687,28080,28557,28779,29001,29277,29504,29734,29964,30194,30424,30651,31070,31296,31721,31951,32379,32598,32881,33089,33220,33447,33873,34098,34525,34746,35171,35291,35567,35868,36192,36483,36797,36934,37065,37170,37412,37579,37783,37991,38262,38374,38486,38591,38708,38922,39068,39208,39294,39642,39730,39976,40394,40643,40725,40823,41415,41515,41767,42191,42446,42540,42629,42866,44890,45132,45234,45487,47643,57772,59288,69516,71044,72801,73427,73847,74908,76173,76429,76665,77212,77706,78311,78509,79089,79653,80028,80146,80684,80841,81037,81310,81566,81736,81877,81941,82223,82509,83185,83449,83787,84140,84234,84420,84726,84988,85113,85240,85479,85690,85809,86002,86179,86634,86815,86937,87196,87309,87496,87598,87705,87834,88109,88617,89113,89990,90284,90854,91003,91735,91907,92243,92335,92613,97684,102109,102171,102749,103333,103424,103537,103766,103926,104078,104249,104415,104584,104751,104914,105157,105327,105500,105671,105945,106144,106349,106679,106763,106859,106955,107053,107153,107255,107357,107459,107561,107663,107763,107859,107971,108100,108223,108354,108485,108583,108697,108791,108931,109065,109161,109273,109373,109489,109585,109697,109797,109937,110073,110237,110367,110525,110675,110816,110960,111095,111207,111357,111485,111613,111749,111881,112011,112141,112253,112393,113297,113441,113579,114991,115081,115157,115261,115351,115453,115561,115669,115769,115849,115941,116039,116149,116227,116333,116425,116529,116639,116761,116924,117081,117521,117621,117711,117821,117915,118021,118113,118441,118553,118667,118783,118899,118993,119107,119219,119321,119441,119563,119645,119749,119869,119995,120093,120187,120275,120387,120503,120625,120737,120912,121028,121114,121206,121318,121442,121509,121635,121703,121831,121975,122103,122172,122267,122382,122495,122594,122703,122814,122925,123026,123131,123231,123361,123452,123575,123669,123781,123867,123971,124067,124155,124273,124377,124481,124607,124695,124803,124903,124993,125103,125187,125289,125373,125427,125491,125597,125707,125791,125911"
                     }
                 },
                 {
@@ -209,12 +209,12 @@
                         "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "1450,1454,1458,1462,1731,1735,1739,1743,1747,1751,1755,1904,1907",
+                        "startLines": "1451,1455,1459,1463,1732,1736,1740,1744,1748,1752,1756,1905,1908",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "92566,92774,92985,93195,113532,113715,113900,114085,114288,114494,114677,126148,126324",
-                        "endLines": "1453,1457,1461,1464,1734,1738,1742,1746,1750,1754,1758,1906,1910",
+                        "startOffsets": "92618,92826,93037,93247,113584,113767,113952,114137,114340,114546,114729,126200,126376",
+                        "endLines": "1454,1458,1462,1465,1735,1739,1743,1747,1751,1755,1759,1907,1911",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "92769,92980,93190,93350,113710,113895,114080,114283,114489,114672,114873,126319,126549"
+                        "endOffsets": "92821,93032,93242,93402,113762,113947,114132,114335,114541,114724,114925,126371,126601"
                     }
                 },
                 {
@@ -225,12 +225,12 @@
                         "startOffsets": "-1,-1"
                     },
                     "to": {
-                        "startLines": "12,1901",
+                        "startLines": "12,1902",
                         "startColumns": "4,4",
-                        "startOffsets": "420,126003",
-                        "endLines": "12,1903",
+                        "startOffsets": "420,126055",
+                        "endLines": "12,1904",
                         "endColumns": "60,12",
-                        "endOffsets": "476,126143"
+                        "endOffsets": "476,126195"
                     }
                 },
                 {
@@ -241,12 +241,12 @@
                         "startOffsets": "-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "1788,1789,1801",
+                        "startLines": "1789,1790,1802",
                         "startColumns": "4,4,4",
-                        "startOffsets": "117034,117097,118066",
-                        "endLines": "1788,1793,1804",
+                        "startOffsets": "117086,117149,118118",
+                        "endLines": "1789,1794,1805",
                         "endColumns": "62,12,12",
-                        "endOffsets": "117092,117389,118289"
+                        "endOffsets": "117144,117441,118341"
                     }
                 },
                 {
@@ -273,31 +273,31 @@
                         "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"
                     },
                     "to": {
-                        "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,374,1714,1715,1719,1720,1724,1899,1900",
+                        "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,375,1715,1716,1720,1721,1725,1900,1901",
                         "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",
-                        "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24493,112346,112463,112664,112774,112975,125864,125936",
-                        "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,374,1714,1718,1719,1723,1724,1899,1900",
+                        "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24545,112398,112515,112716,112826,113027,125916,125988",
+                        "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,375,1715,1719,1720,1724,1725,1900,1901",
                         "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66",
-                        "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24559,112458,112659,112769,112970,113099,125931,125998"
+                        "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24611,112510,112711,112821,113022,113151,125983,126050"
                     }
                 },
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,144,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8226,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8801,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,144,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,57,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "8630,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8854,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8279,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8225,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8683,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8272,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "231,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,372,373,375,376,377,378,379,380,381,382,383,384,385,386",
-                        "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,4,4,4,4,4,4,4,4",
-                        "startOffsets": "14757,17868,17964,18047,18143,18212,18255,18307,18359,18408,18471,18529,18580,18628,18712,18766,18824,18918,19026,19097,19181,19264,19330,19413,19515,19576,19638,19689,19767,19820,19880,19985,20044,20146,20201,20272,20321,20379,20426,20485,20542,20613,20674,20731,20781,20833,20886,20936,20986,21046,21099,21165,21227,21290,21353,21400,21453,21508,21596,21654,21716,21766,21811,21854,21914,21981,22031,22086,22133,22188,22241,22288,22341,22397,22445,22500,22553,22637,22704,22768,22864,22938,23019,23108,23271,23415,23494,23569,23651,23710,23790,23870,23925,24047,24150,24191,24244,24354,24428,24564,24632,24718,24798,24867,24961,25020,25075,25137,25197,25262,25372",
-                        "endLines": "235,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,372,373,375,376,377,378,379,380,381,382,383,384,385,386",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,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,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,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,64,109,89",
-                        "endOffsets": "15105,17959,18042,18138,18207,18250,18302,18354,18403,18466,18524,18575,18623,18707,18761,18819,18913,19021,19092,19176,19259,19325,19408,19510,19571,19633,19684,19762,19815,19875,19980,20039,20141,20196,20267,20316,20374,20421,20480,20537,20608,20669,20726,20776,20828,20881,20931,20981,21041,21094,21160,21222,21285,21348,21395,21448,21503,21591,21649,21711,21761,21806,21849,21909,21976,22026,22081,22128,22183,22236,22283,22336,22392,22440,22495,22548,22632,22699,22763,22859,22933,23014,23103,23266,23410,23489,23564,23646,23705,23785,23865,23920,24042,24145,24186,24239,24296,24423,24488,24627,24713,24793,24862,24956,25015,25070,25132,25192,25257,25367,25457"
+                        "startLines": "231,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,373,374,376,377,378,379,380,381,382,383,384,385,386,387",
+                        "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,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "14757,17868,17964,18047,18143,18212,18255,18307,18359,18408,18471,18529,18580,18628,18712,18766,18824,18918,19026,19097,19181,19264,19330,19413,19515,19576,19638,19689,19767,19820,19880,19985,20044,20146,20201,20272,20321,20379,20426,20485,20542,20613,20674,20731,20781,20833,20886,20936,20986,21046,21099,21165,21227,21290,21353,21400,21453,21508,21596,21654,21716,21766,21811,21854,21914,21981,22033,22083,22138,22185,22240,22293,22340,22393,22449,22497,22552,22605,22689,22756,22820,22916,22990,23071,23160,23323,23467,23546,23621,23703,23762,23842,23922,23977,24099,24202,24243,24296,24406,24480,24616,24684,24770,24850,24919,25013,25072,25127,25189,25249,25314,25424",
+                        "endLines": "235,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,373,374,376,377,378,379,380,381,382,383,384,385,386,387",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,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,62,46,52,54,87,57,61,49,44,42,59,66,51,49,54,46,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,64,109,89",
+                        "endOffsets": "15105,17959,18042,18138,18207,18250,18302,18354,18403,18466,18524,18575,18623,18707,18761,18819,18913,19021,19092,19176,19259,19325,19408,19510,19571,19633,19684,19762,19815,19875,19980,20039,20141,20196,20267,20316,20374,20421,20480,20537,20608,20669,20726,20776,20828,20881,20931,20981,21041,21094,21160,21222,21285,21348,21395,21448,21503,21591,21649,21711,21761,21806,21849,21909,21976,22028,22078,22133,22180,22235,22288,22335,22388,22444,22492,22547,22600,22684,22751,22815,22911,22985,23066,23155,23318,23462,23541,23616,23698,23757,23837,23917,23972,24094,24197,24238,24291,24348,24475,24540,24679,24765,24845,24914,25008,25067,25122,25184,25244,25309,25419,25509"
                     }
                 }
             ]
@@ -680,6 +680,75 @@
                 }
             ]
         },
+        {
+            "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rCN_values-zh-rCN.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "130",
+                        "startColumns": "4",
+                        "startOffsets": "8273",
+                        "endColumns": "100",
+                        "endOffsets": "8369"
+                    }
+                },
+                {
+                    "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "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,127,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6842,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6880,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "6,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,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141",
+                        "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,4,4",
+                        "startOffsets": "215,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3590,3652,3720,3797,3856,3921,3984,4039,4099,4162,4216,4276,4329,4391,4476,4557,4607,4666,4709,4762,4805,4856,4906,4966,5019,5070,5116,5164,5212,5258,5305,5355,5400,5459,5511,5563,5615,5658,5703,5750,5806,5861,5916,5960,6002,6043,6093,6152,6195,6238,6289,6333,6382,6431,6478,6525,6572,6617,6668,6721,6796,6855,6912,6986,7050,7119,7197,7307,7411,7484,7550,7605,7670,7735,7784,7867,7945,7983,8028,8154,8216,8374,8429,8488,8555,8613,8675,8723,8768,8816,8867,8933",
+                        "endLines": "8,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,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,42,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3585,3647,3715,3792,3851,3916,3979,4034,4094,4157,4211,4271,4324,4386,4471,4552,4602,4661,4704,4757,4800,4851,4901,4961,5014,5065,5111,5159,5207,5253,5300,5350,5395,5454,5506,5558,5610,5653,5698,5745,5801,5856,5911,5955,5997,6038,6088,6147,6190,6233,6284,6328,6377,6426,6473,6520,6567,6612,6663,6716,6791,6850,6907,6981,7045,7114,7192,7302,7406,7479,7545,7600,7665,7730,7779,7862,7940,7978,8023,8071,8211,8268,8424,8483,8550,8608,8670,8718,8763,8811,8862,8928,8994"
+                    }
+                },
+                {
+                    "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+                    "from": {
+                        "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",
+                        "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",
+                        "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"
+                    },
+                    "to": {
+                        "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,127",
+                        "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",
+                        "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,8076",
+                        "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
+                        "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,8149"
+                    }
+                }
+            ]
+        },
         {
             "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-zu_values-zu.arsc.flat",
             "map": [
@@ -2793,6 +2862,75 @@
                 }
             ]
         },
+        {
+            "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rTW_values-zh-rTW.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "from": {
+                        "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,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6818,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6856,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "6,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,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141",
+                        "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,4,4",
+                        "startOffsets": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3598,3660,3728,3805,3864,3930,3993,4048,4108,4171,4225,4285,4338,4400,4484,4564,4614,4673,4716,4769,4812,4863,4913,4973,5026,5077,5123,5171,5219,5265,5312,5362,5407,5466,5518,5570,5622,5665,5710,5757,5813,5868,5923,5967,6009,6050,6100,6159,6202,6245,6296,6340,6389,6438,6485,6532,6579,6624,6675,6728,6803,6862,6919,6993,7057,7126,7204,7314,7418,7491,7557,7612,7677,7742,7791,7874,7952,7990,8035,8161,8223,8381,8436,8495,8562,8620,8682,8730,8775,8823,8874,8940",
+                        "endLines": "8,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,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,42,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3593,3655,3723,3800,3859,3925,3988,4043,4103,4166,4220,4280,4333,4395,4479,4559,4609,4668,4711,4764,4807,4858,4908,4968,5021,5072,5118,5166,5214,5260,5307,5357,5402,5461,5513,5565,5617,5660,5705,5752,5808,5863,5918,5962,6004,6045,6095,6154,6197,6240,6291,6335,6384,6433,6480,6527,6574,6619,6670,6723,6798,6857,6914,6988,7052,7121,7199,7309,7413,7486,7552,7607,7672,7737,7786,7869,7947,7985,8030,8078,8218,8275,8431,8490,8557,8615,8677,8725,8770,8818,8869,8935,9001"
+                    }
+                },
+                {
+                    "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+                    "from": {
+                        "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",
+                        "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",
+                        "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"
+                    },
+                    "to": {
+                        "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,127",
+                        "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",
+                        "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8083",
+                        "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
+                        "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8156"
+                    }
+                },
+                {
+                    "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "130",
+                        "startColumns": "4",
+                        "startOffsets": "8280",
+                        "endColumns": "100",
+                        "endOffsets": "8376"
+                    }
+                }
+            ]
+        },
         {
             "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\values-fr_values-fr.arsc.flat",
             "map": [

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

@@ -1,16 +1,14 @@
 {
     "logs": [
         {
-            "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zh-rCN/values-zh-rCN.xml",
+            "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-6:\\values-zh-rCN\\values-zh-rCN.xml",
             "map": [
                 {
                     "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
                     "from": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "55",
-                        "endColumns": "100",
-                        "endOffsets": "151"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "129",
@@ -23,12 +21,9 @@
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
-                        "startLines": "16",
-                        "startColumns": "4",
-                        "startOffsets": "352",
-                        "endLines": "19",
-                        "endColumns": "19",
-                        "endOffsets": "460"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "2",
@@ -42,12 +37,9 @@
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
-                        "startLines": "128,71,70,69,68,19,20,21,112,113,120,119,125,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,123,64,43,122,48,47,46,62,42,61,40,41,65,126,28,131,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,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,4",
-                        "startOffsets": "6844,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,6756,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,6701,3141,2079,6655,2326,2269,2213,3041,2034,2998,1941,1983,3194,6798,1346,7024,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
-                        "endLines": "130,71,70,69,68,19,20,21,112,113,120,119,125,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,123,64,43,122,48,47,46,62,42,61,40,41,65,126,28,131,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "7018,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,6792,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,6748,3188,2117,6695,2368,2320,2263,3091,2073,3035,1977,2028,3248,6836,1392,7063,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
+                        "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,-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,-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,-1"
                     },
                     "to": {
                         "startLines": "6,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,125,127,128,130,131,132,133,134,135,136,137,138,139,140",
@@ -61,11 +53,9 @@
                 {
                     "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
                     "from": {
-                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
-                        "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",
-                        "startOffsets": "105,201,296,396,478,575,681,757,833,924,1017,1115,1211,1306,1399,1494,1586,1677,1768,1846,1942,2038,2133,2230,2325,2423,2572,2666",
-                        "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
-                        "endOffsets": "196,291,391,473,570,676,752,828,919,1012,1110,1206,1301,1394,1489,1581,1672,1763,1841,1937,2033,2128,2225,2320,2418,2567,2661,2739"
+                        "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",
+                        "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",
+                        "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"
                     },
                     "to": {
                         "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,126",
@@ -76,6 +66,75 @@
                     }
                 }
             ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zh-rCN/values-zh-rCN.xml",
+            "map": [
+                {
+                    "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "130",
+                        "startColumns": "4",
+                        "startOffsets": "8273",
+                        "endColumns": "100",
+                        "endOffsets": "8369"
+                    }
+                },
+                {
+                    "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "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,127,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6842,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6880,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "6,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,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141",
+                        "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,4,4",
+                        "startOffsets": "215,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3590,3652,3720,3797,3856,3921,3984,4039,4099,4162,4216,4276,4329,4391,4476,4557,4607,4666,4709,4762,4805,4856,4906,4966,5019,5070,5116,5164,5212,5258,5305,5355,5400,5459,5511,5563,5615,5658,5703,5750,5806,5861,5916,5960,6002,6043,6093,6152,6195,6238,6289,6333,6382,6431,6478,6525,6572,6617,6668,6721,6796,6855,6912,6986,7050,7119,7197,7307,7411,7484,7550,7605,7670,7735,7784,7867,7945,7983,8028,8154,8216,8374,8429,8488,8555,8613,8675,8723,8768,8816,8867,8933",
+                        "endLines": "8,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,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,42,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3585,3647,3715,3792,3851,3916,3979,4034,4094,4157,4211,4271,4324,4386,4471,4552,4602,4661,4704,4757,4800,4851,4901,4961,5014,5065,5111,5159,5207,5253,5300,5350,5395,5454,5506,5558,5610,5653,5698,5745,5801,5856,5911,5955,5997,6038,6088,6147,6190,6233,6284,6328,6377,6426,6473,6520,6567,6612,6663,6716,6791,6850,6907,6981,7045,7114,7192,7302,7406,7479,7545,7600,7665,7730,7779,7862,7940,7978,8023,8071,8211,8268,8424,8483,8550,8608,8670,8718,8763,8811,8862,8928,8994"
+                    }
+                },
+                {
+                    "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+                    "from": {
+                        "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",
+                        "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",
+                        "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"
+                    },
+                    "to": {
+                        "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,127",
+                        "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",
+                        "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,8076",
+                        "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
+                        "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,8149"
+                    }
+                }
+            ]
         }
     ]
 }

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

@@ -1,17 +1,14 @@
 {
     "logs": [
         {
-            "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zh-rTW/values-zh-rTW.xml",
+            "outputFile": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-6:\\values-zh-rTW\\values-zh-rTW.xml",
             "map": [
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "from": {
-                        "startLines": "129,72,71,70,69,19,20,21,112,113,121,120,126,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,124,65,44,123,49,48,47,63,43,62,41,42,66,127,28,132,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,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,4",
-                        "startOffsets": "6820,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,6732,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,6677,3222,2160,6631,2407,2350,2294,3122,2115,3079,2022,2064,3275,6774,1346,7000,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
-                        "endLines": "131,72,71,70,69,19,20,21,112,113,121,120,126,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,124,65,44,123,49,48,47,63,43,62,41,42,66,127,28,132,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6994,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,6768,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,6724,3269,2198,6671,2449,2401,2344,3172,2154,3116,2058,2109,3329,6812,1392,7039,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
+                        "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,-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,-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,-1"
                     },
                     "to": {
                         "startLines": "6,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,125,127,128,130,131,132,133,134,135,136,137,138,139,140",
@@ -25,12 +22,9 @@
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                     "from": {
-                        "startLines": "16",
-                        "startColumns": "4",
-                        "startOffsets": "349",
-                        "endLines": "19",
-                        "endColumns": "19",
-                        "endOffsets": "457"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "2",
@@ -44,11 +38,9 @@
                 {
                     "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
                     "from": {
-                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
-                        "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",
-                        "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1116,1212,1308,1402,1498,1590,1682,1774,1852,1948,2044,2139,2236,2331,2431,2581,2675",
-                        "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
-                        "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748"
+                        "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",
+                        "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",
+                        "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"
                     },
                     "to": {
                         "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,126",
@@ -61,11 +53,9 @@
                 {
                     "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
                     "from": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "55",
-                        "endColumns": "100",
-                        "endOffsets": "151"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "129",
@@ -76,6 +66,75 @@
                     }
                 }
             ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zh-rTW/values-zh-rTW.xml",
+            "map": [
+                {
+                    "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "from": {
+                        "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,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6818,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6856,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "6,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,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141",
+                        "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,4,4",
+                        "startOffsets": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3598,3660,3728,3805,3864,3930,3993,4048,4108,4171,4225,4285,4338,4400,4484,4564,4614,4673,4716,4769,4812,4863,4913,4973,5026,5077,5123,5171,5219,5265,5312,5362,5407,5466,5518,5570,5622,5665,5710,5757,5813,5868,5923,5967,6009,6050,6100,6159,6202,6245,6296,6340,6389,6438,6485,6532,6579,6624,6675,6728,6803,6862,6919,6993,7057,7126,7204,7314,7418,7491,7557,7612,7677,7742,7791,7874,7952,7990,8035,8161,8223,8381,8436,8495,8562,8620,8682,8730,8775,8823,8874,8940",
+                        "endLines": "8,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,125,126,128,129,131,132,133,134,135,136,137,138,139,140,141",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,40,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,42,42,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3593,3655,3723,3800,3859,3925,3988,4043,4103,4166,4220,4280,4333,4395,4479,4559,4609,4668,4711,4764,4807,4858,4908,4968,5021,5072,5118,5166,5214,5260,5307,5357,5402,5461,5513,5565,5617,5660,5705,5752,5808,5863,5918,5962,6004,6045,6095,6154,6197,6240,6291,6335,6384,6433,6480,6527,6574,6619,6670,6723,6798,6857,6914,6988,7052,7121,7199,7309,7413,7486,7552,7607,7672,7737,7786,7869,7947,7985,8030,8078,8218,8275,8431,8490,8557,8615,8677,8725,8770,8818,8869,8935,9001"
+                    }
+                },
+                {
+                    "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+                    "from": {
+                        "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",
+                        "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",
+                        "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"
+                    },
+                    "to": {
+                        "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,127",
+                        "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",
+                        "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8083",
+                        "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
+                        "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8156"
+                    }
+                },
+                {
+                    "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "130",
+                        "startColumns": "4",
+                        "startOffsets": "8280",
+                        "endColumns": "100",
+                        "endOffsets": "8376"
+                    }
+                }
+            ]
         }
     ]
 }

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

@@ -6,11 +6,9 @@
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
-                        "startLines": "15,17,19,21,13",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "350,426,503,579,275",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "397,474,551,626,322"
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "194,195,196,197,198",
@@ -23,30 +21,25 @@
                 {
                     "source": "D:\\ASSDK\\caches\\transforms-3\\52946320d6d0b4428c2de41aa0bbe2c7\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml",
                     "from": {
-                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,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,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294",
-                        "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437",
-                        "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,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,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302",
-                        "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
-                        "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906"
+                        "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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,371,387,388,389,390,391,392,400,401,405,409,413,418,424,431,435,439,444,448,452,456,460,464,468,474,478,484,488,494,498,503,507,510,514,520,524,530,534,540,543,547,551,555,559,563,564,565,566,569,572,575,578,582,583,584,585,586,589,591,593,595,600,601,605,611,615,616,618,629,630,634,640,644,645,646,650,677,681,682,686,714,881,907,1075,1101,1132,1140,1146,1160,1182,1187,1192,1202,1211,1220,1224,1231,1239,1246,1247,1256,1259,1262,1266,1270,1274,1277,1278,1282,1286,1296,1301,1308,1314,1315,1318,1322,1327,1329,1331,1334,1337,1339,1343,1346,1353,1356,1359,1363,1365,1369,1371,1373,1375,1379,1387,1395,1407,1413,1422,1425,1436,1439,1444,1445,1465,1523,1582,1583,1593,1602,1603,1605,1609,1612,1615,1618,1621,1624,1627,1630,1634,1637,1640,1643,1647,1650,1654,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1680,1682,1683,1684,1685,1686,1687,1688,1689,1691,1692,1694,1695,1697,1699,1700,1702,1703,1704,1705,1706,1707,1709,1710,1711,1712,1713,1725,1727,1729,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1773,1774,1775,1776,1777,1778,1780,1784,1794,1795,1796,1797,1798,1799,1800,1805,1807,1809,1811,1813,1815,1816,1817,1818,1820,1822,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1838,1839,1840,1841,1843,1845,1846,1848,1849,1851,1853,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1868,1869,1870,1871,1873,1874,1875,1876,1877,1879,1881,1883,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1911,1986,1989,1992,1995,2009,2015,2025,2041,2047,2057,2086,2113,2122,2151,2494,2505,2621,2734,2758,2764,2770,2791,2915,2935,2941,2945,2951,2986,2998,3014,3018,3084,3099,3150,3162,3188",
-                        "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24300,25461,25539,25629,25717,25813,25903,26485,26574,26821,27102,27354,27639,28032,28509,28731,28953,29229,29456,29686,29916,30146,30376,30603,31022,31248,31673,31903,32331,32550,32833,33041,33172,33399,33825,34050,34477,34698,35123,35243,35519,35820,36144,36435,36749,36886,37017,37122,37364,37531,37735,37943,38214,38326,38438,38543,38660,38874,39020,39160,39246,39594,39682,39928,40346,40595,40677,40775,41367,41467,41719,42143,42398,42492,42581,42818,44842,45084,45186,45439,47595,57724,59240,69468,70996,72753,73379,73799,74860,76125,76381,76617,77164,77658,78263,78461,79041,79605,79980,80098,80636,80793,80989,81262,81518,81688,81829,81893,82175,82461,83137,83401,83739,84092,84186,84372,84678,84940,85065,85192,85431,85642,85761,85954,86131,86586,86767,86889,87148,87261,87448,87550,87657,87786,88061,88569,89065,89942,90236,90806,90955,91687,91859,92195,92287,93354,97636,102061,102123,102701,103285,103376,103489,103718,103878,104030,104201,104367,104536,104703,104866,105109,105279,105452,105623,105897,106096,106301,106631,106715,106811,106907,107005,107105,107207,107309,107411,107513,107615,107715,107811,107923,108052,108175,108306,108437,108535,108649,108743,108883,109017,109113,109225,109325,109441,109537,109649,109749,109889,110025,110189,110319,110477,110627,110768,110912,111047,111159,111309,111437,111565,111701,111833,111963,112093,112205,113103,113249,113393,114877,114943,115033,115109,115213,115303,115405,115513,115621,115721,115801,115893,115991,116101,116179,116285,116377,116481,116591,116713,116876,117393,117473,117573,117663,117773,117867,117973,118293,118393,118505,118619,118735,118851,118945,119059,119171,119273,119393,119515,119597,119701,119821,119947,120045,120139,120227,120339,120455,120577,120689,120864,120980,121066,121158,121270,121394,121461,121587,121655,121783,121927,122055,122124,122219,122334,122447,122546,122655,122766,122877,122978,123083,123183,123313,123404,123527,123621,123733,123819,123923,124019,124107,124225,124329,124433,124559,124647,124755,124855,124945,125055,125139,125241,125325,125379,125443,125549,125659,125743,126553,129169,129287,129402,129482,129843,130076,130593,131018,131196,131480,132824,134185,134573,135651,145169,145515,151535,155485,156236,156498,156698,157077,161355,161961,162190,162341,162556,163639,163951,164362,164489,167515,168116,170037,170377,171688",
-                        "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,371,387,388,389,390,391,399,400,404,408,412,417,423,430,434,438,443,447,451,455,459,463,467,473,477,483,487,493,497,502,506,509,513,519,523,529,533,539,542,546,550,554,558,562,563,564,565,568,571,574,577,581,582,583,584,585,588,590,592,594,599,600,604,610,614,615,617,628,629,633,639,643,644,645,649,676,680,681,685,713,880,906,1074,1100,1131,1139,1145,1159,1181,1186,1191,1201,1210,1219,1223,1230,1238,1245,1246,1255,1258,1261,1265,1269,1273,1276,1277,1281,1285,1295,1300,1307,1313,1314,1317,1321,1326,1328,1330,1333,1336,1338,1342,1345,1352,1355,1358,1362,1364,1368,1370,1372,1374,1378,1386,1394,1406,1412,1421,1424,1435,1438,1443,1444,1449,1522,1581,1582,1592,1601,1602,1604,1608,1611,1614,1617,1620,1623,1626,1629,1633,1636,1639,1642,1646,1649,1653,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1679,1681,1682,1683,1684,1685,1686,1687,1688,1690,1691,1693,1694,1696,1698,1699,1701,1702,1703,1704,1705,1706,1708,1709,1710,1711,1712,1713,1726,1728,1730,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1772,1773,1774,1775,1776,1777,1779,1783,1787,1794,1795,1796,1797,1798,1799,1800,1806,1808,1810,1812,1814,1815,1816,1817,1819,1821,1823,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1837,1838,1839,1840,1842,1844,1845,1847,1848,1850,1852,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1867,1868,1869,1870,1872,1873,1874,1875,1876,1878,1880,1882,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1985,1988,1991,1994,2008,2014,2024,2040,2046,2056,2085,2112,2121,2150,2493,2497,2530,2638,2757,2763,2769,2790,2914,2934,2940,2944,2950,2985,2997,3013,3017,3083,3098,3149,3161,3187,3194",
-                        "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
-                        "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24348,25534,25624,25712,25808,25898,26480,26569,26816,27097,27349,27634,28027,28504,28726,28948,29224,29451,29681,29911,30141,30371,30598,31017,31243,31668,31898,32326,32545,32828,33036,33167,33394,33820,34045,34472,34693,35118,35238,35514,35815,36139,36430,36744,36881,37012,37117,37359,37526,37730,37938,38209,38321,38433,38538,38655,38869,39015,39155,39241,39589,39677,39923,40341,40590,40672,40770,41362,41462,41714,42138,42393,42487,42576,42813,44837,45079,45181,45434,47590,57719,59235,69463,70991,72748,73374,73794,74855,76120,76376,76612,77159,77653,78258,78456,79036,79600,79975,80093,80631,80788,80984,81257,81513,81683,81824,81888,82170,82456,83132,83396,83734,84087,84181,84367,84673,84935,85060,85187,85426,85637,85756,85949,86126,86581,86762,86884,87143,87256,87443,87545,87652,87781,88056,88564,89060,89937,90231,90801,90950,91682,91854,92190,92282,92560,97631,102056,102118,102696,103280,103371,103484,103713,103873,104025,104196,104362,104531,104698,104861,105104,105274,105447,105618,105892,106091,106296,106626,106710,106806,106902,107000,107100,107202,107304,107406,107508,107610,107710,107806,107918,108047,108170,108301,108432,108530,108644,108738,108878,109012,109108,109220,109320,109436,109532,109644,109744,109884,110020,110184,110314,110472,110622,110763,110907,111042,111154,111304,111432,111560,111696,111828,111958,112088,112200,112340,113244,113388,113526,114938,115028,115104,115208,115298,115400,115508,115616,115716,115796,115888,115986,116096,116174,116280,116372,116476,116586,116708,116871,117028,117468,117568,117658,117768,117862,117968,118060,118388,118500,118614,118730,118846,118940,119054,119166,119268,119388,119510,119592,119696,119816,119942,120040,120134,120222,120334,120450,120572,120684,120859,120975,121061,121153,121265,121389,121456,121582,121650,121778,121922,122050,122119,122214,122329,122442,122541,122650,122761,122872,122973,123078,123178,123308,123399,123522,123616,123728,123814,123918,124014,124102,124220,124324,124428,124554,124642,124750,124850,124940,125050,125134,125236,125320,125374,125438,125544,125654,125738,125858,129164,129282,129397,129477,129838,130071,130588,131013,131191,131475,132819,134180,134568,135646,145164,145299,146803,152102,156231,156493,156693,157072,161350,161956,162185,162336,162551,163634,163946,164357,164484,167510,168111,170032,170372,171683,171886"
+                        "startLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,371,387,388,389,390,391,392,400,401,405,409,413,418,424,431,435,439,444,448,452,456,460,464,468,474,478,484,488,494,498,503,507,510,514,520,524,530,534,540,543,547,551,555,559,563,564,565,566,569,572,575,578,582,583,584,585,586,589,591,593,595,600,601,605,611,615,616,618,629,630,634,640,644,645,646,650,677,681,682,686,714,881,907,1075,1101,1132,1140,1146,1160,1182,1187,1192,1202,1211,1220,1224,1231,1239,1246,1247,1256,1259,1262,1266,1270,1274,1277,1278,1282,1286,1296,1301,1308,1314,1315,1318,1322,1327,1329,1331,1334,1337,1339,1343,1346,1353,1356,1359,1363,1365,1369,1371,1373,1375,1379,1387,1395,1407,1413,1422,1425,1436,1439,1444,1445,1465,1523,1582,1583,1593,1602,1603,1605,1609,1612,1615,1618,1621,1624,1627,1630,1634,1637,1640,1643,1647,1650,1654,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1680,1682,1683,1684,1685,1686,1687,1688,1689,1691,1692,1694,1695,1697,1699,1700,1702,1703,1704,1705,1706,1707,1709,1710,1711,1712,1713,1725,1727,1729,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1773,1774,1775,1776,1777,1778,1780,1784,1794,1795,1796,1797,1798,1799,1800,1805,1807,1809,1811,1813,1815,1816,1817,1818,1820,1822,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1838,1839,1840,1841,1843,1845,1846,1848,1849,1851,1853,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1868,1869,1870,1871,1873,1874,1875,1876,1877,1879,1881,1883,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898",
+                        "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24301,25462,25540,25630,25718,25814,25904,26486,26575,26822,27103,27355,27640,28033,28510,28732,28954,29230,29457,29687,29917,30147,30377,30604,31023,31249,31674,31904,32332,32551,32834,33042,33173,33400,33826,34051,34478,34699,35124,35244,35520,35821,36145,36436,36750,36887,37018,37123,37365,37532,37736,37944,38215,38327,38439,38544,38661,38875,39021,39161,39247,39595,39683,39929,40347,40596,40678,40776,41368,41468,41720,42144,42399,42493,42582,42819,44843,45085,45187,45440,47596,57725,59241,69469,70997,72754,73380,73800,74861,76126,76382,76618,77165,77659,78264,78462,79042,79606,79981,80099,80637,80794,80990,81263,81519,81689,81830,81894,82176,82462,83138,83402,83740,84093,84187,84373,84679,84941,85066,85193,85432,85643,85762,85955,86132,86587,86768,86890,87149,87262,87449,87551,87658,87787,88062,88570,89066,89943,90237,90807,90956,91688,91860,92196,92288,93355,97637,102062,102124,102702,103286,103377,103490,103719,103879,104031,104202,104368,104537,104704,104867,105110,105280,105453,105624,105898,106097,106302,106632,106716,106812,106908,107006,107106,107208,107310,107412,107514,107616,107716,107812,107924,108053,108176,108307,108438,108536,108650,108744,108884,109018,109114,109226,109326,109442,109538,109650,109750,109890,110026,110190,110320,110478,110628,110769,110913,111048,111160,111310,111438,111566,111702,111834,111964,112094,112206,113104,113250,113394,114878,114944,115034,115110,115214,115304,115406,115514,115622,115722,115802,115894,115992,116102,116180,116286,116378,116482,116592,116714,116877,117394,117474,117574,117664,117774,117868,117974,118294,118394,118506,118620,118736,118852,118946,119060,119172,119274,119394,119516,119598,119702,119822,119948,120046,120140,120228,120340,120456,120578,120690,120865,120981,121067,121159,121271,121395,121462,121588,121656,121784,121928,122056,122125,122220,122335,122448,122547,122656,122767,122878,122979,123084,123184,123314,123405,123528,123622,123734,123820,123924,124020,124108,124226,124330,124434,124560,124648,124756,124856,124946,125056,125140,125242,125326,125380,125444,125550,125660,125744",
+                        "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,371,387,388,389,390,391,399,400,404,408,412,417,423,430,434,438,443,447,451,455,459,463,467,473,477,483,487,493,497,502,506,509,513,519,523,529,533,539,542,546,550,554,558,562,563,564,565,568,571,574,577,581,582,583,584,585,588,590,592,594,599,600,604,610,614,615,617,628,629,633,639,643,644,645,649,676,680,681,685,713,880,906,1074,1100,1131,1139,1145,1159,1181,1186,1191,1201,1210,1219,1223,1230,1238,1245,1246,1255,1258,1261,1265,1269,1273,1276,1277,1281,1285,1295,1300,1307,1313,1314,1317,1321,1326,1328,1330,1333,1336,1338,1342,1345,1352,1355,1358,1362,1364,1368,1370,1372,1374,1378,1386,1394,1406,1412,1421,1424,1435,1438,1443,1444,1449,1522,1581,1582,1592,1601,1602,1604,1608,1611,1614,1617,1620,1623,1626,1629,1633,1636,1639,1642,1646,1649,1653,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1679,1681,1682,1683,1684,1685,1686,1687,1688,1690,1691,1693,1694,1696,1698,1699,1701,1702,1703,1704,1705,1706,1708,1709,1710,1711,1712,1713,1726,1728,1730,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1772,1773,1774,1775,1776,1777,1779,1783,1787,1794,1795,1796,1797,1798,1799,1800,1806,1808,1810,1812,1814,1815,1816,1817,1819,1821,1823,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1837,1838,1839,1840,1842,1844,1845,1847,1848,1850,1852,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1867,1868,1869,1870,1872,1873,1874,1875,1876,1878,1880,1882,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898",
+                        "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119",
+                        "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24349,25535,25625,25713,25809,25899,26481,26570,26817,27098,27350,27635,28028,28505,28727,28949,29225,29452,29682,29912,30142,30372,30599,31018,31244,31669,31899,32327,32546,32829,33037,33168,33395,33821,34046,34473,34694,35119,35239,35515,35816,36140,36431,36745,36882,37013,37118,37360,37527,37731,37939,38210,38322,38434,38539,38656,38870,39016,39156,39242,39590,39678,39924,40342,40591,40673,40771,41363,41463,41715,42139,42394,42488,42577,42814,44838,45080,45182,45435,47591,57720,59236,69464,70992,72749,73375,73795,74856,76121,76377,76613,77160,77654,78259,78457,79037,79601,79976,80094,80632,80789,80985,81258,81514,81684,81825,81889,82171,82457,83133,83397,83735,84088,84182,84368,84674,84936,85061,85188,85427,85638,85757,85950,86127,86582,86763,86885,87144,87257,87444,87546,87653,87782,88057,88565,89061,89938,90232,90802,90951,91683,91855,92191,92283,92561,97632,102057,102119,102697,103281,103372,103485,103714,103874,104026,104197,104363,104532,104699,104862,105105,105275,105448,105619,105893,106092,106297,106627,106711,106807,106903,107001,107101,107203,107305,107407,107509,107611,107711,107807,107919,108048,108171,108302,108433,108531,108645,108739,108879,109013,109109,109221,109321,109437,109533,109645,109745,109885,110021,110185,110315,110473,110623,110764,110908,111043,111155,111305,111433,111561,111697,111829,111959,112089,112201,112341,113245,113389,113527,114939,115029,115105,115209,115299,115401,115509,115617,115717,115797,115889,115987,116097,116175,116281,116373,116477,116587,116709,116872,117029,117469,117569,117659,117769,117863,117969,118061,118389,118501,118615,118731,118847,118941,119055,119167,119269,119389,119511,119593,119697,119817,119943,120041,120135,120223,120335,120451,120573,120685,120860,120976,121062,121154,121266,121390,121457,121583,121651,121779,121923,122051,122120,122215,122330,122443,122542,122651,122762,122873,122974,123079,123179,123309,123400,123523,123617,123729,123815,123919,124015,124103,124221,124325,124429,124555,124643,124751,124851,124941,125051,125135,125237,125321,125375,125439,125545,125655,125739,125859"
                     }
                 },
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
-                        "startLines": "21,17,18,19,20,16",
-                        "startColumns": "4,4,4,4,4,4",
-                        "startOffsets": "594,388,439,490,542,331",
-                        "endColumns": "49,50,50,51,51,56",
-                        "endOffsets": "639,434,485,537,589,383"
+                        "startLines": "-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "30,49,50,51,52,87",
@@ -59,69 +52,57 @@
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "49,55,66,61,15,20,25,31,37,10,43,70,74",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "1798,2043,2507,2299,421,628,837,1066,1314,215,1560,2718,2895",
-                        "endLines": "52,58,69,63,18,23,28,34,40,13,46,72,77",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2001,2249,2713,2454,599,808,1017,1264,1515,393,1756,2889,3120"
+                        "startLines": "-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",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
                         "startLines": "1450,1454,1458,1462,1731,1735,1739,1743,1747,1751,1755,1904,1907",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "92565,92773,92984,93194,113531,113714,113899,114084,114287,114493,114676,126147,126323",
+                        "startOffsets": "92566,92774,92985,93195,113532,113715,113900,114085,114288,114494,114677,126148,126324",
                         "endLines": "1453,1457,1461,1464,1734,1738,1742,1746,1750,1754,1758,1906,1910",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "92768,92979,93189,93349,113709,113894,114079,114282,114488,114671,114872,126318,126548"
+                        "endOffsets": "92769,92980,93190,93350,113710,113895,114080,114283,114489,114672,114873,126319,126549"
                     }
                 },
                 {
                     "source": "D:\\ASSDK\\caches\\transforms-3\\0a4a4ce1bdecc4eec4e4905ca8187ea2\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml",
                     "from": {
-                        "startLines": "2,102,3,13",
-                        "startColumns": "4,4,4,4",
-                        "startOffsets": "55,5935,116,724",
-                        "endLines": "2,104,12,101",
-                        "endColumns": "60,12,24,24",
-                        "endOffsets": "111,6075,719,5930"
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
                     },
                     "to": {
-                        "startLines": "12,1901,2531,2537",
-                        "startColumns": "4,4,4,4",
-                        "startOffsets": "420,126002,146808,147019",
-                        "endLines": "12,1903,2536,2620",
-                        "endColumns": "60,12,24,24",
-                        "endOffsets": "476,126142,147014,151530"
+                        "startLines": "12,1901",
+                        "startColumns": "4,4",
+                        "startOffsets": "420,126003",
+                        "endLines": "12,1903",
+                        "endColumns": "60,12",
+                        "endOffsets": "476,126143"
                     }
                 },
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\themes.xml",
                     "from": {
-                        "startLines": "1,2,8",
-                        "startColumns": "2,4,4",
-                        "startOffsets": "14,77,375",
-                        "endLines": "1,6,11",
-                        "endColumns": "60,12,12",
-                        "endOffsets": "72,369,598"
+                        "startLines": "-1,-1,-1",
+                        "startColumns": "-1,-1,-1",
+                        "startOffsets": "-1,-1,-1"
                     },
                     "to": {
                         "startLines": "1788,1789,1801",
                         "startColumns": "4,4,4",
-                        "startOffsets": "117033,117096,118065",
+                        "startOffsets": "117034,117097,118066",
                         "endLines": "1788,1793,1804",
                         "endColumns": "62,12,12",
-                        "endOffsets": "117091,117388,118288"
+                        "endOffsets": "117092,117389,118289"
                     }
                 },
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
-                        "startLines": "10,18",
-                        "startColumns": "4,4",
-                        "startOffsets": "247,542",
-                        "endLines": "15,21",
-                        "endColumns": "19,19",
-                        "endOffsets": "507,660"
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
                     },
                     "to": {
                         "startLines": "2,8",
@@ -132,61 +113,39 @@
                         "endOffsets": "295,415"
                     }
                 },
-                {
-                    "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\attrs.xml",
-                    "from": {
-                        "startLines": "1",
-                        "startColumns": "4",
-                        "startOffsets": "16",
-                        "endLines": "4",
-                        "endColumns": "24",
-                        "endOffsets": "207"
-                    },
-                    "to": {
-                        "startLines": "2691",
-                        "startColumns": "4",
-                        "startOffsets": "154442",
-                        "endLines": "2694",
-                        "endColumns": "24",
-                        "endOffsets": "154631"
-                    }
-                },
                 {
                     "source": "D:\\ASSDK\\caches\\transforms-3\\d9f0b9f6301870925ec9be62a3ecf027\\transformed\\support-compat-28.0.0\\res\\values\\values.xml",
                     "from": {
-                        "startLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,171,172,176,177,178,6,13,56,88,125",
-                        "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",
-                        "startOffsets": "55,124,7725,7795,7863,7935,8005,8066,8140,8213,8274,8335,8397,8461,8523,8584,8652,8752,8812,8878,8951,9020,9077,9129,9191,9263,9339,9374,9409,9459,9520,9577,9611,9646,9681,9751,9822,9939,10140,10250,10451,10580,10652,319,617,3523,5588,7348",
-                        "endLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,170,171,175,176,177,178,12,55,87,124,131",
-                        "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
-                        "endOffsets": "119,182,7790,7858,7930,8000,8061,8135,8208,8269,8330,8392,8456,8518,8579,8647,8747,8807,8873,8946,9015,9072,9124,9186,9258,9334,9369,9404,9454,9515,9572,9606,9641,9676,9746,9817,9934,10135,10245,10446,10575,10647,10714,612,3518,5583,7343,7720"
+                        "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",
+                        "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",
+                        "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"
                     },
                     "to": {
-                        "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,374,1714,1715,1719,1720,1724,1899,1900,2498,2639,2670,2695,2728",
-                        "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",
-                        "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24492,112345,112462,112663,112773,112974,125863,125935,145304,152107,153761,154636,155318",
-                        "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,374,1714,1718,1719,1723,1724,1899,1900,2504,2669,2690,2727,2733",
-                        "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
-                        "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24558,112457,112658,112768,112969,113098,125930,125997,145510,153756,154437,155313,155480"
+                        "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,374,1714,1715,1719,1720,1724,1899,1900",
+                        "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",
+                        "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24493,112346,112463,112664,112774,112975,125864,125936",
+                        "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,374,1714,1718,1719,1723,1724,1899,1900",
+                        "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66",
+                        "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24559,112458,112659,112769,112970,113099,125931,125998"
                     }
                 },
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "136,72,75,74,73,19,20,21,118,119,127,126,132,26,143,144,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,130,68,47,129,52,51,50,66,46,65,44,45,69,133,28,141,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,142,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,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8226,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,8126,1282,8747,8801,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,8062,3631,2424,8009,2717,2629,2571,3520,2374,3475,2271,2314,3694,8174,1431,8635,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,8682,974,1084",
-                        "endLines": "140,72,75,74,73,19,20,21,118,119,127,126,132,26,143,144,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,130,68,47,129,52,51,50,66,46,65,44,45,69,133,28,141,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,142,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,56,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,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,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,64,109,89",
-                        "endOffsets": "8630,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,8169,1361,8796,8853,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,8120,3689,2466,8057,2767,2712,2624,3577,2419,3515,2309,2369,3756,8219,1481,8677,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,8742,1079,1169"
+                        "startLines": "136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8226,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8630,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "231,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,372,373,375,376,377,378,379,380,381,382,383,384,385,386",
                         "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,4,4,4,4,4,4,4,4",
-                        "startOffsets": "14757,17868,17964,18047,18143,18212,18255,18307,18359,18408,18471,18529,18580,18628,18712,18766,18823,18917,19025,19096,19180,19263,19329,19412,19514,19575,19637,19688,19766,19819,19879,19984,20043,20145,20200,20271,20320,20378,20425,20484,20541,20612,20673,20730,20780,20832,20885,20935,20985,21045,21098,21164,21226,21289,21352,21399,21452,21507,21595,21653,21715,21765,21810,21853,21913,21980,22030,22085,22132,22187,22240,22287,22340,22396,22444,22499,22552,22636,22703,22767,22863,22937,23018,23107,23270,23414,23493,23568,23650,23709,23789,23869,23924,24046,24149,24190,24243,24353,24427,24563,24631,24717,24797,24866,24960,25019,25074,25136,25196,25261,25371",
+                        "startOffsets": "14757,17868,17964,18047,18143,18212,18255,18307,18359,18408,18471,18529,18580,18628,18712,18766,18824,18918,19026,19097,19181,19264,19330,19413,19515,19576,19638,19689,19767,19820,19880,19985,20044,20146,20201,20272,20321,20379,20426,20485,20542,20613,20674,20731,20781,20833,20886,20936,20986,21046,21099,21165,21227,21290,21353,21400,21453,21508,21596,21654,21716,21766,21811,21854,21914,21981,22031,22086,22133,22188,22241,22288,22341,22397,22445,22500,22553,22637,22704,22768,22864,22938,23019,23108,23271,23415,23494,23569,23651,23710,23790,23870,23925,24047,24150,24191,24244,24354,24428,24564,24632,24718,24798,24867,24961,25020,25075,25137,25197,25262,25372",
                         "endLines": "235,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,372,373,375,376,377,378,379,380,381,382,383,384,385,386",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,56,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,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,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,64,109,89",
-                        "endOffsets": "15105,17959,18042,18138,18207,18250,18302,18354,18403,18466,18524,18575,18623,18707,18761,18818,18912,19020,19091,19175,19258,19324,19407,19509,19570,19632,19683,19761,19814,19874,19979,20038,20140,20195,20266,20315,20373,20420,20479,20536,20607,20668,20725,20775,20827,20880,20930,20980,21040,21093,21159,21221,21284,21347,21394,21447,21502,21590,21648,21710,21760,21805,21848,21908,21975,22025,22080,22127,22182,22235,22282,22335,22391,22439,22494,22547,22631,22698,22762,22858,22932,23013,23102,23265,23409,23488,23563,23645,23704,23784,23864,23919,24041,24144,24185,24238,24295,24422,24487,24626,24712,24792,24861,24955,25014,25069,25131,25191,25256,25366,25456"
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,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,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,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,64,109,89",
+                        "endOffsets": "15105,17959,18042,18138,18207,18250,18302,18354,18403,18466,18524,18575,18623,18707,18761,18819,18913,19021,19092,19176,19259,19325,19408,19510,19571,19633,19684,19762,19815,19875,19980,20039,20141,20196,20267,20316,20374,20421,20480,20537,20608,20669,20726,20776,20828,20881,20931,20981,21041,21094,21160,21222,21285,21348,21395,21448,21503,21591,21649,21711,21761,21806,21849,21909,21976,22026,22081,22128,22183,22236,22283,22336,22392,22440,22495,22548,22632,22699,22763,22859,22933,23014,23103,23266,23410,23489,23564,23646,23705,23785,23865,23920,24042,24145,24186,24239,24296,24423,24488,24627,24713,24793,24862,24956,25015,25070,25132,25192,25257,25367,25457"
                     }
                 }
             ]
@@ -217,12 +176,12 @@
                         "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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,371,387,388,389,390,391,392,400,401,405,409,413,418,424,431,435,439,444,448,452,456,460,464,468,474,478,484,488,494,498,503,507,510,514,520,524,530,534,540,543,547,551,555,559,563,564,565,566,569,572,575,578,582,583,584,585,586,589,591,593,595,600,601,605,611,615,616,618,629,630,634,640,644,645,646,650,677,681,682,686,714,881,907,1075,1101,1132,1140,1146,1160,1182,1187,1192,1202,1211,1220,1224,1231,1239,1246,1247,1256,1259,1262,1266,1270,1274,1277,1278,1282,1286,1296,1301,1308,1314,1315,1318,1322,1327,1329,1331,1334,1337,1339,1343,1346,1353,1356,1359,1363,1365,1369,1371,1373,1375,1379,1387,1395,1407,1413,1422,1425,1436,1439,1444,1445,1465,1523,1582,1583,1593,1602,1603,1605,1609,1612,1615,1618,1621,1624,1627,1630,1634,1637,1640,1643,1647,1650,1654,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1680,1682,1683,1684,1685,1686,1687,1688,1689,1691,1692,1694,1695,1697,1699,1700,1702,1703,1704,1705,1706,1707,1709,1710,1711,1712,1713,1725,1727,1729,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1773,1774,1775,1776,1777,1778,1780,1784,1794,1795,1796,1797,1798,1799,1800,1805,1807,1809,1811,1813,1815,1816,1817,1818,1820,1822,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1838,1839,1840,1841,1843,1845,1846,1848,1849,1851,1853,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1868,1869,1870,1871,1873,1874,1875,1876,1877,1879,1881,1883,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898",
+                        "startLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,372,388,389,390,391,392,393,401,402,406,410,414,419,425,432,436,440,445,449,453,457,461,465,469,475,479,485,489,495,499,504,508,511,515,521,525,531,535,541,544,548,552,556,560,564,565,566,567,570,573,576,579,583,584,585,586,587,590,592,594,596,601,602,606,612,616,617,619,630,631,635,641,645,646,647,651,678,682,683,687,715,882,908,1076,1102,1133,1141,1147,1161,1183,1188,1193,1203,1212,1221,1225,1232,1240,1247,1248,1257,1260,1263,1267,1271,1275,1278,1279,1283,1287,1297,1302,1309,1315,1316,1319,1323,1328,1330,1332,1335,1338,1340,1344,1347,1354,1357,1360,1364,1366,1370,1372,1374,1376,1380,1388,1396,1408,1414,1423,1426,1437,1440,1445,1446,1466,1524,1583,1584,1594,1603,1604,1606,1610,1613,1616,1619,1622,1625,1628,1631,1635,1638,1641,1644,1648,1651,1655,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1681,1683,1684,1685,1686,1687,1688,1689,1690,1692,1693,1695,1696,1698,1700,1701,1703,1704,1705,1706,1707,1708,1710,1711,1712,1713,1714,1726,1728,1730,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1774,1775,1776,1777,1778,1779,1781,1785,1795,1796,1797,1798,1799,1800,1801,1806,1808,1810,1812,1814,1816,1817,1818,1819,1821,1823,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1839,1840,1841,1842,1844,1846,1847,1849,1850,1852,1854,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1869,1870,1871,1872,1874,1875,1876,1877,1878,1880,1882,1884,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899",
                         "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24301,25462,25540,25630,25718,25814,25904,26486,26575,26822,27103,27355,27640,28033,28510,28732,28954,29230,29457,29687,29917,30147,30377,30604,31023,31249,31674,31904,32332,32551,32834,33042,33173,33400,33826,34051,34478,34699,35124,35244,35520,35821,36145,36436,36750,36887,37018,37123,37365,37532,37736,37944,38215,38327,38439,38544,38661,38875,39021,39161,39247,39595,39683,39929,40347,40596,40678,40776,41368,41468,41720,42144,42399,42493,42582,42819,44843,45085,45187,45440,47596,57725,59241,69469,70997,72754,73380,73800,74861,76126,76382,76618,77165,77659,78264,78462,79042,79606,79981,80099,80637,80794,80990,81263,81519,81689,81830,81894,82176,82462,83138,83402,83740,84093,84187,84373,84679,84941,85066,85193,85432,85643,85762,85955,86132,86587,86768,86890,87149,87262,87449,87551,87658,87787,88062,88570,89066,89943,90237,90807,90956,91688,91860,92196,92288,93355,97637,102062,102124,102702,103286,103377,103490,103719,103879,104031,104202,104368,104537,104704,104867,105110,105280,105453,105624,105898,106097,106302,106632,106716,106812,106908,107006,107106,107208,107310,107412,107514,107616,107716,107812,107924,108053,108176,108307,108438,108536,108650,108744,108884,109018,109114,109226,109326,109442,109538,109650,109750,109890,110026,110190,110320,110478,110628,110769,110913,111048,111160,111310,111438,111566,111702,111834,111964,112094,112206,113104,113250,113394,114878,114944,115034,115110,115214,115304,115406,115514,115622,115722,115802,115894,115992,116102,116180,116286,116378,116482,116592,116714,116877,117394,117474,117574,117664,117774,117868,117974,118294,118394,118506,118620,118736,118852,118946,119060,119172,119274,119394,119516,119598,119702,119822,119948,120046,120140,120228,120340,120456,120578,120690,120865,120981,121067,121159,121271,121395,121462,121588,121656,121784,121928,122056,122125,122220,122335,122448,122547,122656,122767,122878,122979,123084,123184,123314,123405,123528,123622,123734,123820,123924,124020,124108,124226,124330,124434,124560,124648,124756,124856,124946,125056,125140,125242,125326,125380,125444,125550,125660,125744",
-                        "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,371,387,388,389,390,391,399,400,404,408,412,417,423,430,434,438,443,447,451,455,459,463,467,473,477,483,487,493,497,502,506,509,513,519,523,529,533,539,542,546,550,554,558,562,563,564,565,568,571,574,577,581,582,583,584,585,588,590,592,594,599,600,604,610,614,615,617,628,629,633,639,643,644,645,649,676,680,681,685,713,880,906,1074,1100,1131,1139,1145,1159,1181,1186,1191,1201,1210,1219,1223,1230,1238,1245,1246,1255,1258,1261,1265,1269,1273,1276,1277,1281,1285,1295,1300,1307,1313,1314,1317,1321,1326,1328,1330,1333,1336,1338,1342,1345,1352,1355,1358,1362,1364,1368,1370,1372,1374,1378,1386,1394,1406,1412,1421,1424,1435,1438,1443,1444,1449,1522,1581,1582,1592,1601,1602,1604,1608,1611,1614,1617,1620,1623,1626,1629,1633,1636,1639,1642,1646,1649,1653,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1679,1681,1682,1683,1684,1685,1686,1687,1688,1690,1691,1693,1694,1696,1698,1699,1701,1702,1703,1704,1705,1706,1708,1709,1710,1711,1712,1713,1726,1728,1730,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1772,1773,1774,1775,1776,1777,1779,1783,1787,1794,1795,1796,1797,1798,1799,1800,1806,1808,1810,1812,1814,1815,1816,1817,1819,1821,1823,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1837,1838,1839,1840,1842,1844,1845,1847,1848,1850,1852,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1867,1868,1869,1870,1872,1873,1874,1875,1876,1878,1880,1882,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898",
+                        "startOffsets": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1664,1741,1819,1925,2031,2110,2190,2247,2305,2379,2454,2519,2585,2645,2706,2778,2851,2918,3192,3251,3310,3369,3428,3487,3541,3595,3648,3702,3756,3810,3996,4070,4149,4222,4296,4367,4439,4511,4584,4641,4699,4772,4846,4920,4995,5067,5140,5210,5281,5341,5459,5528,5597,5667,5741,5817,5881,5958,6034,6111,6176,6245,6322,6397,6466,6534,6611,6677,6738,6835,6900,6969,7068,7139,7198,7256,7313,7372,7436,7507,7579,7651,7723,7795,7862,7930,7998,8057,8120,8184,8274,8365,8425,8491,8558,8624,8694,8758,8811,8924,8982,9045,9110,9175,9250,9323,9395,9444,9505,9566,9627,9689,9753,9817,9881,9946,10009,10069,10130,10196,10255,10315,10377,10448,10508,11064,11150,11237,11327,11414,11502,11584,11667,11757,13088,13140,13198,13243,13309,13373,13430,13487,13689,13746,13794,13843,13894,13998,14045,14094,14412,14444,14508,14570,14630,15110,15184,15254,15332,15386,15456,15541,15589,15635,15706,15784,15862,15934,16008,16082,16156,16236,16309,16378,16450,16527,16588,16651,16717,16781,16852,16915,16980,17044,17105,17166,17218,17291,17365,17434,17509,17583,17657,17798,24353,25514,25592,25682,25770,25866,25956,26538,26627,26874,27155,27407,27692,28085,28562,28784,29006,29282,29509,29739,29969,30199,30429,30656,31075,31301,31726,31956,32384,32603,32886,33094,33225,33452,33878,34103,34530,34751,35176,35296,35572,35873,36197,36488,36802,36939,37070,37175,37417,37584,37788,37996,38267,38379,38491,38596,38713,38927,39073,39213,39299,39647,39735,39981,40399,40648,40730,40828,41420,41520,41772,42196,42451,42545,42634,42871,44895,45137,45239,45492,47648,57777,59293,69521,71049,72806,73432,73852,74913,76178,76434,76670,77217,77711,78316,78514,79094,79658,80033,80151,80689,80846,81042,81315,81571,81741,81882,81946,82228,82514,83190,83454,83792,84145,84239,84425,84731,84993,85118,85245,85484,85695,85814,86007,86184,86639,86820,86942,87201,87314,87501,87603,87710,87839,88114,88622,89118,89995,90289,90859,91008,91740,91912,92248,92340,93407,97689,102114,102176,102754,103338,103429,103542,103771,103931,104083,104254,104420,104589,104756,104919,105162,105332,105505,105676,105950,106149,106354,106684,106768,106864,106960,107058,107158,107260,107362,107464,107566,107668,107768,107864,107976,108105,108228,108359,108490,108588,108702,108796,108936,109070,109166,109278,109378,109494,109590,109702,109802,109942,110078,110242,110372,110530,110680,110821,110965,111100,111212,111362,111490,111618,111754,111886,112016,112146,112258,113156,113302,113446,114930,114996,115086,115162,115266,115356,115458,115566,115674,115774,115854,115946,116044,116154,116232,116338,116430,116534,116644,116766,116929,117446,117526,117626,117716,117826,117920,118026,118346,118446,118558,118672,118788,118904,118998,119112,119224,119326,119446,119568,119650,119754,119874,120000,120098,120192,120280,120392,120508,120630,120742,120917,121033,121119,121211,121323,121447,121514,121640,121708,121836,121980,122108,122177,122272,122387,122500,122599,122708,122819,122930,123031,123136,123236,123366,123457,123580,123674,123786,123872,123976,124072,124160,124278,124382,124486,124612,124700,124808,124908,124998,125108,125192,125294,125378,125432,125496,125602,125712,125796",
+                        "endLines": "13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,53,54,55,56,57,58,59,60,61,62,63,64,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,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,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,170,171,172,173,174,175,176,177,178,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,372,388,389,390,391,392,400,401,405,409,413,418,424,431,435,439,444,448,452,456,460,464,468,474,478,484,488,494,498,503,507,510,514,520,524,530,534,540,543,547,551,555,559,563,564,565,566,569,572,575,578,582,583,584,585,586,589,591,593,595,600,601,605,611,615,616,618,629,630,634,640,644,645,646,650,677,681,682,686,714,881,907,1075,1101,1132,1140,1146,1160,1182,1187,1192,1202,1211,1220,1224,1231,1239,1246,1247,1256,1259,1262,1266,1270,1274,1277,1278,1282,1286,1296,1301,1308,1314,1315,1318,1322,1327,1329,1331,1334,1337,1339,1343,1346,1353,1356,1359,1363,1365,1369,1371,1373,1375,1379,1387,1395,1407,1413,1422,1425,1436,1439,1444,1445,1450,1523,1582,1583,1593,1602,1603,1605,1609,1612,1615,1618,1621,1624,1627,1630,1634,1637,1640,1643,1647,1650,1654,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1680,1682,1683,1684,1685,1686,1687,1688,1689,1691,1692,1694,1695,1697,1699,1700,1702,1703,1704,1705,1706,1707,1709,1710,1711,1712,1713,1714,1727,1729,1731,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1773,1774,1775,1776,1777,1778,1780,1784,1788,1795,1796,1797,1798,1799,1800,1801,1807,1809,1811,1813,1815,1816,1817,1818,1820,1822,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1838,1839,1840,1841,1843,1845,1846,1848,1849,1851,1853,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1868,1869,1870,1871,1873,1874,1875,1876,1877,1879,1881,1883,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899",
                         "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119",
-                        "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24349,25535,25625,25713,25809,25899,26481,26570,26817,27098,27350,27635,28028,28505,28727,28949,29225,29452,29682,29912,30142,30372,30599,31018,31244,31669,31899,32327,32546,32829,33037,33168,33395,33821,34046,34473,34694,35119,35239,35515,35816,36140,36431,36745,36882,37013,37118,37360,37527,37731,37939,38210,38322,38434,38539,38656,38870,39016,39156,39242,39590,39678,39924,40342,40591,40673,40771,41363,41463,41715,42139,42394,42488,42577,42814,44838,45080,45182,45435,47591,57720,59236,69464,70992,72749,73375,73795,74856,76121,76377,76613,77160,77654,78259,78457,79037,79601,79976,80094,80632,80789,80985,81258,81514,81684,81825,81889,82171,82457,83133,83397,83735,84088,84182,84368,84674,84936,85061,85188,85427,85638,85757,85950,86127,86582,86763,86885,87144,87257,87444,87546,87653,87782,88057,88565,89061,89938,90232,90802,90951,91683,91855,92191,92283,92561,97632,102057,102119,102697,103281,103372,103485,103714,103874,104026,104197,104363,104532,104699,104862,105105,105275,105448,105619,105893,106092,106297,106627,106711,106807,106903,107001,107101,107203,107305,107407,107509,107611,107711,107807,107919,108048,108171,108302,108433,108531,108645,108739,108879,109013,109109,109221,109321,109437,109533,109645,109745,109885,110021,110185,110315,110473,110623,110764,110908,111043,111155,111305,111433,111561,111697,111829,111959,112089,112201,112341,113245,113389,113527,114939,115029,115105,115209,115299,115401,115509,115617,115717,115797,115889,115987,116097,116175,116281,116373,116477,116587,116709,116872,117029,117469,117569,117659,117769,117863,117969,118061,118389,118501,118615,118731,118847,118941,119055,119167,119269,119389,119511,119593,119697,119817,119943,120041,120135,120223,120335,120451,120573,120685,120860,120976,121062,121154,121266,121390,121457,121583,121651,121779,121923,122051,122120,122215,122330,122443,122542,122651,122762,122873,122974,123079,123179,123309,123400,123523,123617,123729,123815,123919,124015,124103,124221,124325,124429,124555,124643,124751,124851,124941,125051,125135,125237,125321,125375,125439,125545,125655,125739,125859"
+                        "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1736,1814,1920,2026,2105,2185,2242,2300,2374,2449,2514,2580,2640,2701,2773,2846,2913,2981,3246,3305,3364,3423,3482,3536,3590,3643,3697,3751,3805,3859,4065,4144,4217,4291,4362,4434,4506,4579,4636,4694,4767,4841,4915,4990,5062,5135,5205,5276,5336,5397,5523,5592,5662,5736,5812,5876,5953,6029,6106,6171,6240,6317,6392,6461,6529,6606,6672,6733,6830,6895,6964,7063,7134,7193,7251,7308,7367,7431,7502,7574,7646,7718,7790,7857,7925,7993,8052,8115,8179,8269,8360,8420,8486,8553,8619,8689,8753,8806,8919,8977,9040,9105,9170,9245,9318,9390,9439,9500,9561,9622,9684,9748,9812,9876,9941,10004,10064,10125,10191,10250,10310,10372,10443,10503,10571,11145,11232,11322,11409,11497,11579,11662,11752,11843,13135,13193,13238,13304,13368,13425,13482,13536,13741,13789,13838,13889,13923,14040,14089,14135,14439,14503,14565,14625,14682,15179,15249,15327,15381,15451,15536,15584,15630,15701,15779,15857,15929,16003,16077,16151,16231,16304,16373,16445,16522,16583,16646,16712,16776,16847,16910,16975,17039,17100,17161,17213,17286,17360,17429,17504,17578,17652,17793,17863,24401,25587,25677,25765,25861,25951,26533,26622,26869,27150,27402,27687,28080,28557,28779,29001,29277,29504,29734,29964,30194,30424,30651,31070,31296,31721,31951,32379,32598,32881,33089,33220,33447,33873,34098,34525,34746,35171,35291,35567,35868,36192,36483,36797,36934,37065,37170,37412,37579,37783,37991,38262,38374,38486,38591,38708,38922,39068,39208,39294,39642,39730,39976,40394,40643,40725,40823,41415,41515,41767,42191,42446,42540,42629,42866,44890,45132,45234,45487,47643,57772,59288,69516,71044,72801,73427,73847,74908,76173,76429,76665,77212,77706,78311,78509,79089,79653,80028,80146,80684,80841,81037,81310,81566,81736,81877,81941,82223,82509,83185,83449,83787,84140,84234,84420,84726,84988,85113,85240,85479,85690,85809,86002,86179,86634,86815,86937,87196,87309,87496,87598,87705,87834,88109,88617,89113,89990,90284,90854,91003,91735,91907,92243,92335,92613,97684,102109,102171,102749,103333,103424,103537,103766,103926,104078,104249,104415,104584,104751,104914,105157,105327,105500,105671,105945,106144,106349,106679,106763,106859,106955,107053,107153,107255,107357,107459,107561,107663,107763,107859,107971,108100,108223,108354,108485,108583,108697,108791,108931,109065,109161,109273,109373,109489,109585,109697,109797,109937,110073,110237,110367,110525,110675,110816,110960,111095,111207,111357,111485,111613,111749,111881,112011,112141,112253,112393,113297,113441,113579,114991,115081,115157,115261,115351,115453,115561,115669,115769,115849,115941,116039,116149,116227,116333,116425,116529,116639,116761,116924,117081,117521,117621,117711,117821,117915,118021,118113,118441,118553,118667,118783,118899,118993,119107,119219,119321,119441,119563,119645,119749,119869,119995,120093,120187,120275,120387,120503,120625,120737,120912,121028,121114,121206,121318,121442,121509,121635,121703,121831,121975,122103,122172,122267,122382,122495,122594,122703,122814,122925,123026,123131,123231,123361,123452,123575,123669,123781,123867,123971,124067,124155,124273,124377,124481,124607,124695,124803,124903,124993,125103,125187,125289,125373,125427,125491,125597,125707,125791,125911"
                     }
                 },
                 {
@@ -248,12 +207,12 @@
                         "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "1450,1454,1458,1462,1731,1735,1739,1743,1747,1751,1755,1904,1907",
+                        "startLines": "1451,1455,1459,1463,1732,1736,1740,1744,1748,1752,1756,1905,1908",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "92566,92774,92985,93195,113532,113715,113900,114085,114288,114494,114677,126148,126324",
-                        "endLines": "1453,1457,1461,1464,1734,1738,1742,1746,1750,1754,1758,1906,1910",
+                        "startOffsets": "92618,92826,93037,93247,113584,113767,113952,114137,114340,114546,114729,126200,126376",
+                        "endLines": "1454,1458,1462,1465,1735,1739,1743,1747,1751,1755,1759,1907,1911",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "92769,92980,93190,93350,113710,113895,114080,114283,114489,114672,114873,126319,126549"
+                        "endOffsets": "92821,93032,93242,93402,113762,113947,114132,114335,114541,114724,114925,126371,126601"
                     }
                 },
                 {
@@ -264,12 +223,12 @@
                         "startOffsets": "-1,-1"
                     },
                     "to": {
-                        "startLines": "12,1901",
+                        "startLines": "12,1902",
                         "startColumns": "4,4",
-                        "startOffsets": "420,126003",
-                        "endLines": "12,1903",
+                        "startOffsets": "420,126055",
+                        "endLines": "12,1904",
                         "endColumns": "60,12",
-                        "endOffsets": "476,126143"
+                        "endOffsets": "476,126195"
                     }
                 },
                 {
@@ -280,12 +239,12 @@
                         "startOffsets": "-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "1788,1789,1801",
+                        "startLines": "1789,1790,1802",
                         "startColumns": "4,4,4",
-                        "startOffsets": "117034,117097,118066",
-                        "endLines": "1788,1793,1804",
+                        "startOffsets": "117086,117149,118118",
+                        "endLines": "1789,1794,1805",
                         "endColumns": "62,12,12",
-                        "endOffsets": "117092,117389,118289"
+                        "endOffsets": "117144,117441,118341"
                     }
                 },
                 {
@@ -312,31 +271,31 @@
                         "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"
                     },
                     "to": {
-                        "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,374,1714,1715,1719,1720,1724,1899,1900",
+                        "startLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,375,1715,1716,1720,1721,1725,1900,1901",
                         "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",
-                        "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24493,112346,112463,112664,112774,112975,125864,125936",
-                        "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,374,1714,1718,1719,1723,1724,1899,1900",
+                        "startOffsets": "3864,3933,10576,10646,10714,10786,10856,10917,10991,11848,11909,11970,12032,12096,12158,12219,12287,12387,12447,12513,12586,12655,12712,12764,13541,13613,13928,13963,14140,14190,14251,14308,14342,14377,14687,24545,112398,112515,112716,112826,113027,125916,125988",
+                        "endLines": "65,66,163,164,165,166,167,168,169,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,207,208,214,215,219,220,221,222,223,224,230,375,1715,1719,1720,1724,1725,1900,1901",
                         "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66",
-                        "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24559,112458,112659,112769,112970,113099,125931,125998"
+                        "endOffsets": "3928,3991,10641,10709,10781,10851,10912,10986,11059,11904,11965,12027,12091,12153,12214,12282,12382,12442,12508,12581,12650,12707,12759,12821,13608,13684,13958,13993,14185,14246,14303,14337,14372,14407,14752,24611,112510,112711,112821,113022,113151,125983,126050"
                     }
                 },
                 {
                     "source": "D:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,144,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8226,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8801,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,144,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,57,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "8630,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8854,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8279,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8225,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8683,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8272,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "231,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,372,373,375,376,377,378,379,380,381,382,383,384,385,386",
-                        "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,4,4,4,4,4,4,4,4",
-                        "startOffsets": "14757,17868,17964,18047,18143,18212,18255,18307,18359,18408,18471,18529,18580,18628,18712,18766,18824,18918,19026,19097,19181,19264,19330,19413,19515,19576,19638,19689,19767,19820,19880,19985,20044,20146,20201,20272,20321,20379,20426,20485,20542,20613,20674,20731,20781,20833,20886,20936,20986,21046,21099,21165,21227,21290,21353,21400,21453,21508,21596,21654,21716,21766,21811,21854,21914,21981,22031,22086,22133,22188,22241,22288,22341,22397,22445,22500,22553,22637,22704,22768,22864,22938,23019,23108,23271,23415,23494,23569,23651,23710,23790,23870,23925,24047,24150,24191,24244,24354,24428,24564,24632,24718,24798,24867,24961,25020,25075,25137,25197,25262,25372",
-                        "endLines": "235,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,372,373,375,376,377,378,379,380,381,382,383,384,385,386",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,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,62,46,52,54,87,57,61,49,44,42,59,66,49,54,46,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,64,109,89",
-                        "endOffsets": "15105,17959,18042,18138,18207,18250,18302,18354,18403,18466,18524,18575,18623,18707,18761,18819,18913,19021,19092,19176,19259,19325,19408,19510,19571,19633,19684,19762,19815,19875,19980,20039,20141,20196,20267,20316,20374,20421,20480,20537,20608,20669,20726,20776,20828,20881,20931,20981,21041,21094,21160,21222,21285,21348,21395,21448,21503,21591,21649,21711,21761,21806,21849,21909,21976,22026,22081,22128,22183,22236,22283,22336,22392,22440,22495,22548,22632,22699,22763,22859,22933,23014,23103,23266,23410,23489,23564,23646,23705,23785,23865,23920,24042,24145,24186,24239,24296,24423,24488,24627,24713,24793,24862,24956,25015,25070,25132,25192,25257,25367,25457"
+                        "startLines": "231,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,373,374,376,377,378,379,380,381,382,383,384,385,386,387",
+                        "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,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "14757,17868,17964,18047,18143,18212,18255,18307,18359,18408,18471,18529,18580,18628,18712,18766,18824,18918,19026,19097,19181,19264,19330,19413,19515,19576,19638,19689,19767,19820,19880,19985,20044,20146,20201,20272,20321,20379,20426,20485,20542,20613,20674,20731,20781,20833,20886,20936,20986,21046,21099,21165,21227,21290,21353,21400,21453,21508,21596,21654,21716,21766,21811,21854,21914,21981,22033,22083,22138,22185,22240,22293,22340,22393,22449,22497,22552,22605,22689,22756,22820,22916,22990,23071,23160,23323,23467,23546,23621,23703,23762,23842,23922,23977,24099,24202,24243,24296,24406,24480,24616,24684,24770,24850,24919,25013,25072,25127,25189,25249,25314,25424",
+                        "endLines": "235,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,373,374,376,377,378,379,380,381,382,383,384,385,386,387",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,57,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,62,46,52,54,87,57,61,49,44,42,59,66,51,49,54,46,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,64,109,89",
+                        "endOffsets": "15105,17959,18042,18138,18207,18250,18302,18354,18403,18466,18524,18575,18623,18707,18761,18819,18913,19021,19092,19176,19259,19325,19408,19510,19571,19633,19684,19762,19815,19875,19980,20039,20141,20196,20267,20316,20374,20421,20480,20537,20608,20669,20726,20776,20828,20881,20931,20981,21041,21094,21160,21222,21285,21348,21395,21448,21503,21591,21649,21711,21761,21806,21849,21909,21976,22028,22078,22133,22180,22235,22288,22335,22388,22444,22492,22547,22600,22684,22751,22815,22911,22985,23066,23155,23318,23462,23541,23616,23698,23757,23837,23917,23972,24094,24197,24238,24291,24348,24475,24540,24679,24765,24845,24914,25008,25067,25122,25184,25244,25309,25419,25509"
                     }
                 }
             ]

src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json

@@ -1,426 +1,438 @@
 [
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_splash.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/splash.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_new_note_normal.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\new_note_normal.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_new_note_normal.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/new_note_normal.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_up.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_up.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_white_up.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_white_up.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_login.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_login.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_note_item.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/note_item.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_new_note_pressed.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\new_note_pressed.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_new_note_pressed.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/new_note_pressed.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\raw_introduction.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\raw\\introduction"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/xml_searchable.xml.flat",
-        "source": "net.micode.notes.app-main-10:/xml/searchable.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_down.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_down.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_icon_app.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/icon_app.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_list_footer.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_list_footer.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_yellow_down.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_yellow_down.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable_new_note.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable\\new_note.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_activity_splash.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/activity_splash.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_green.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_green.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_title_blue.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_title_blue.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_delete_loginpassword.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_delete_loginpassword.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_title_bar_bg.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/title_bar_bg.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\note_edit_color_selector_panel.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_green_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_green_middle.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_yellow.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_yellow.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/xml_widget_2x_info.xml.flat",
-        "source": "net.micode.notes.app-main-10:/xml/widget_2x_info.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_datetime_picker.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\datetime_picker.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/color_secondary_text_dark.xml.flat",
-        "source": "net.micode.notes.app-main-10:/color/secondary_text_dark.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_blue.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_blue.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_call_record.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/call_record.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_sub_folder.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\sub_folder.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/xml_preferences.xml.flat",
-        "source": "net.micode.notes.app-main-10:/xml/preferences.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_search_result.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\search_result.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_font_normal.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/font_normal.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_down.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_down.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/menu_note_list_options.xml.flat",
-        "source": "net.micode.notes.app-main-10:/menu/note_list_options.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_blue.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_blue.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_yellow_up.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_yellow_up.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_white.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_white.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_title_green.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_title_green.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\color_primary_text_dark.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\color\\primary_text_dark.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_green.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_green.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_folder.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_folder.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_activity_login.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/activity_login.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\xml_searchable.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\xml\\searchable.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_menu_delete.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/menu_delete.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_key.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\key.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_font_large.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/font_large.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_account_dialog_title.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\account_dialog_title.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_widget_4x.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/widget_4x.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_super.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_super.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_menu_move.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/menu_move.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_splash.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\splash.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_bg_btn_set_color.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/bg_btn_set_color.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_single.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_single.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_red.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_red.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\xml_preferences.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\xml\\preferences.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_add_account_text.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/add_account_text.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_edit_list_item.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_edit_list_item.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable_new_note.xml.flat",
-        "source": "net.micode.notes.app-main-10:/drawable/new_note.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_menu_move.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\menu_move.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_font_size_selector_bg.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/font_size_selector_bg.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_yellow.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_yellow.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/note_edit_color_selector_panel.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_list.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_list.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_note_list_footer.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/note_list_footer.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_middle.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_middle.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_blue_up.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_blue_up.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_change_loginpassword.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_change_loginpassword.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_red_single.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_red_single.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_dialog_edit_text.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\dialog_edit_text.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_activity_delete_loginpassword.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/activity_delete_loginpassword.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_blue.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_blue.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_clock.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/clock.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_widget_4x.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\widget_4x.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_activity_change_loginpassword.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/activity_change_loginpassword.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_menu_delete.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\menu_delete.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_account_dialog_title.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/account_dialog_title.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_clock.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\clock.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_2x_yellow.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_2x_yellow.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_note_list_options.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\note_list_options.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_red_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_red_middle.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_bg_btn_set_color.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\bg_btn_set_color.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_green_down.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_green_down.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_set_loginpassword.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_set_loginpassword.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_font_small.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/font_small.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_dialog_pwd.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\dialog_pwd.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_background1.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_background1.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\color_secondary_text_dark.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\color\\secondary_text_dark.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_search_result.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/search_result.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_delete.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\delete.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_note_list_dropdown_menu.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/note_list_dropdown_menu.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_menu_top.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\menu_top.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/raw-zh-rCN_introduction.flat",
-        "source": "net.micode.notes.app-main-10:/raw-zh-rCN/introduction"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_edit.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_edit.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_dropdown_icon.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/dropdown_icon.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_red.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_red.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/menu_note_list.xml.flat",
-        "source": "net.micode.notes.app-main-10:/menu/note_list.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_middle.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_middle.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_title_yellow.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_title_yellow.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_title_bar_bg.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\title_bar_bg.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_2x_white.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_2x_white.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_call_note_edit.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\call_note_edit.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/menu_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-10:/menu/note_edit.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_selected.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\selected.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_title_alert.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/title_alert.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_single.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_single.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_green_up.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_green_up.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_up.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_up.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_bg_color_btn_mask.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/bg_color_btn_mask.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_note_list_dropdown.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\note_list_dropdown.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_widget_2x.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/widget_2x.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_footer_bg.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_footer_bg.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_dialog_pwd.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/dialog_pwd.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_yellow.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_yellow.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_footer_bg.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_footer_bg.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_bg_color_btn_mask.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\bg_color_btn_mask.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_yellow.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_yellow.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_folder_list_item.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\folder_list_item.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_4x_green.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_4x_green.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_single.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_single.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_dialog_edit_text.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/dialog_edit_text.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\xml_widget_2x_info.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\xml\\widget_2x_info.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_background2.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_background2.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_up.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_up.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_datetime_picker.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/datetime_picker.xml"
+        "merged": "net.micode.notes.app-merged_res-8:/menu_note_list.xml.flat",
+        "source": "net.micode.notes.app-main-10:/menu/note_list.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_4x_yellow.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_4x_yellow.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_white.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_white.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/color_primary_text_dark.xml.flat",
-        "source": "net.micode.notes.app-main-10:/color/primary_text_dark.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_dropdown_icon.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\dropdown_icon.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_folder_list_item.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/folder_list_item.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_small.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_small.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_note_edit_list_item.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/note_edit_list_item.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_list_dropdown_menu.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_list_dropdown_menu.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/menu_note_list_dropdown.xml.flat",
-        "source": "net.micode.notes.app-main-10:/menu/note_list_dropdown.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_call_record_folder.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\call_record_folder.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_key.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/key.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_background1.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_background1.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_title_white.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_title_white.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_green.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_green.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_menu_top.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/menu_top.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_middle.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_middle.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_background.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_background.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_single.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_single.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_2x_green.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_2x_green.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_splash.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_splash.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_2x_blue.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_2x_blue.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_middle.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_middle.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_4x_white.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_4x_white.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_notification.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\notification.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_green_single.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_green_single.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_down.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_down.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/raw_introduction.flat",
-        "source": "net.micode.notes.app-main-10:/raw/introduction"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_note_list.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\note_list.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_red_down.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_red_down.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_white.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_white.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_red_up.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_red_up.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\raw-zh-rCN_introduction.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\raw-zh-rCN\\introduction"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/menu_sub_folder.xml.flat",
-        "source": "net.micode.notes.app-main-10:/menu/sub_folder.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_yellow.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_yellow.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_folder.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_folder.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_settings_header.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\settings_header.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_white_single.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_white_single.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_title_alert.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\title_alert.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_white_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_white_middle.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_widget_2x.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\widget_2x.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_blue_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_blue_middle.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_red.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_red.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_notification.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/notification.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\menu_note_edit.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\menu\\note_edit.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_settings_header.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/settings_header.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_background2.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_background2.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_4x_blue.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_4x_blue.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_background.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_background.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_selected.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/selected.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_normal.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_normal.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_white.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_white.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_green.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_green.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_blue.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_blue.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_add_account_text.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\add_account_text.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_4x_red.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_4x_red.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_middle.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_middle.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/menu_call_record_folder.xml.flat",
-        "source": "net.micode.notes.app-main-10:/menu/call_record_folder.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_call_record.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\call_record.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/note_edit.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_green.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_green.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/xml_widget_4x_info.xml.flat",
-        "source": "net.micode.notes.app-main-10:/xml/widget_4x_info.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\xml_widget_4x_info.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\xml\\widget_4x_info.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_note_list.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/note_list.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_red.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_red.9.png"
+    },
+    {
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_red.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_red.9.png"
+    },
+    {
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_icon_app.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\icon_app.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/menu_call_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-10:/menu/call_note_edit.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_down.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_down.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_font_super.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/font_super.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_single.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_single.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-8:/layout_note_list.xml.flat",
+        "source": "net.micode.notes.app-main-10:/layout/note_list.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_edit_title_red.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/edit_title_red.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_down.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_down.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_white_down.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_white_down.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_large.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_large.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_yellow_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_yellow_middle.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_up.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_up.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_yellow_single.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_yellow_single.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_white.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_white.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_blue_down.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_blue_down.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_blue.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_blue.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_delete.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/delete.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_size_selector_bg.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_size_selector_bg.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_widget_2x_red.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/widget_2x_red.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable_ic_revoke.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable\\ic_revoke.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_blue_single.9.png.flat",
-        "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_blue_single.9.png"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_note_item.xml.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_item.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-8:/layout_activity_set_loginpassword.xml.flat",
-        "source": "net.micode.notes.app-main-10:/layout/activity_set_loginpassword.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_up.9.png.flat",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_up.9.png"
     }
 ]

src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json

@@ -1,82 +1,86 @@
 [
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/datetime_picker.xml",
-        "source": "net.micode.notes.app-main-10:/layout/datetime_picker.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\folder_list_item.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\folder_list_item.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/activity_splash.xml",
-        "source": "net.micode.notes.app-main-10:/layout/activity_splash.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\note_item.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_item.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/widget_4x.xml",
-        "source": "net.micode.notes.app-main-10:/layout/widget_4x.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\account_dialog_title.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\account_dialog_title.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/activity_delete_loginpassword.xml",
-        "source": "net.micode.notes.app-main-10:/layout/activity_delete_loginpassword.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\widget_2x.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\widget_2x.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/account_dialog_title.xml",
-        "source": "net.micode.notes.app-main-10:/layout/account_dialog_title.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\widget_4x.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\widget_4x.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/activity_login.xml",
-        "source": "net.micode.notes.app-main-10:/layout/activity_login.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\activity_delete_loginpassword.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_delete_loginpassword.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/dialog_edit_text.xml",
-        "source": "net.micode.notes.app-main-10:/layout/dialog_edit_text.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\activity_splash.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_splash.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/dialog_pwd.xml",
-        "source": "net.micode.notes.app-main-10:/layout/dialog_pwd.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\note_edit.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_edit.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/add_account_text.xml",
-        "source": "net.micode.notes.app-main-10:/layout/add_account_text.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\activity_login.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_login.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/settings_header.xml",
-        "source": "net.micode.notes.app-main-10:/layout/settings_header.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\activity_change_loginpassword.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_change_loginpassword.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/note_list_footer.xml",
-        "source": "net.micode.notes.app-main-10:/layout/note_list_footer.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\note_list.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_list.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/activity_change_loginpassword.xml",
-        "source": "net.micode.notes.app-main-10:/layout/activity_change_loginpassword.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\note_list_dropdown_menu.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_list_dropdown_menu.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/note_edit_list_item.xml",
-        "source": "net.micode.notes.app-main-10:/layout/note_edit_list_item.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\note_edit_list_item.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_edit_list_item.xml"
+    },
+    {
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\note_list_footer.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\note_list_footer.xml"
     },
     {
         "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/note_list.xml",
         "source": "net.micode.notes.app-main-10:/layout/note_list.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/note_item.xml",
-        "source": "net.micode.notes.app-main-10:/layout/note_item.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\activity_set_loginpassword.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_set_loginpassword.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/note_edit.xml",
-        "source": "net.micode.notes.app-main-10:/layout/note_edit.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\dialog_pwd.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\dialog_pwd.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/widget_2x.xml",
-        "source": "net.micode.notes.app-main-10:/layout/widget_2x.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\settings_header.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\settings_header.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/note_list_dropdown_menu.xml",
-        "source": "net.micode.notes.app-main-10:/layout/note_list_dropdown_menu.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\dialog_edit_text.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\dialog_edit_text.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/activity_set_loginpassword.xml",
-        "source": "net.micode.notes.app-main-10:/layout/activity_set_loginpassword.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\datetime_picker.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\datetime_picker.xml"
     },
     {
-        "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/folder_list_item.xml",
-        "source": "net.micode.notes.app-main-10:/layout/folder_list_item.xml"
+        "merged": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\add_account_text.xml",
+        "source": "D:\\ASSDK\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\add_account_text.xml"
     }
 ]

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

@@ -24,17 +24,6 @@
         android:icon="@drawable/icon_app"
         android:label="@string/app_name"
         android:testOnly="true" >
-        <activity
-            android:name="net.micode.notes.ui.SplashActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/title_activity_splash"
-            android:theme="@style/Theme.Notes.Fullscreen" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
         <activity
             android:name="net.micode.notes.ui.LoginActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -72,7 +61,19 @@
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
             android:windowSoftInputMode="adjustPan" >
-        </activity> <!-- 主Activity，启动器 -->
+        </activity>
+        <activity
+            android:name="net.micode.notes.ui.SplashActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/title_activity_splash"
+            android:theme="@style/Theme.Notes.Fullscreen" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <!-- 主Activity，启动器 -->
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

src/Notes/app/build/intermediates/runtime_symbol_list/debug/R.txt

@@ -804,6 +804,7 @@ int id menu_setting 0x7f080083
 int id menu_share 0x7f080084
 int id menu_sync 0x7f080085
 int id menu_top 0x7f080086
+int id menu_trash 0x7f0800e3
 int id message 0x7f080087
 int id middle 0x7f080088
 int id minute 0x7f080089
@@ -1071,6 +1072,7 @@ int string menu_share 0x7f0e0063
 int string menu_sync 0x7f0e0064
 int string menu_sync_cancel 0x7f0e0065
 int string menu_title_select_folder 0x7f0e0066
+int string menu_trash 0x7f0e0097
 int string night_time 0x7f0e0067
 int string note_alert_expired 0x7f0e0068
 int string note_length 0x7f0e0069

src/Notes/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt

@@ -805,6 +805,7 @@ id menu_setting
 id menu_share
 id menu_sync
 id menu_top
+id menu_trash
 id message
 id middle
 id minute
@@ -1072,6 +1073,7 @@ string menu_share
 string menu_sync
 string menu_sync_cancel
 string menu_title_select_folder
+string menu_trash
 string night_time
 string note_alert_expired
 string note_length

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

@@ -1,9 +1,9 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-177:12
-INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-177:12
-INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-177:12
-INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-177:12
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12
+INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12
+INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12
+INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12
 MERGED from [com.android.databinding:viewbinding:7.2.2] D:\ASSDK\caches\transforms-3\7c3c35a22a19e4cf64a3746f1513f947\transformed\viewbinding-7.2.2\AndroidManifest.xml:17:1-24:12
 MERGED from [com.android.support:appcompat-v7:28.0.0] D:\ASSDK\caches\transforms-3\52946320d6d0b4428c2de41aa0bbe2c7\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:17:1-22:12
 MERGED from [com.android.support:support-fragment:28.0.0] D:\ASSDK\caches\transforms-3\9b324531538c1987ac8d6dab364c979a\transformed\support-fragment-28.0.0\AndroidManifest.xml:17:1-22:12
@@ -31,12 +31,12 @@ MERGED from [android.arch.lifecycle:livedata:1.1.1] D:\ASSDK\caches\transforms-3
 MERGED from [android.arch.lifecycle:livedata-core:1.1.1] D:\ASSDK\caches\transforms-3\9e0dab91aa213f02bf6442f477693ad0\transformed\livedata-core-1.1.1\AndroidManifest.xml:17:1-22:12
 MERGED from [android.arch.core:runtime:1.1.1] D:\ASSDK\caches\transforms-3\e5f608aa90757d0971f669fd7153b99d\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12
 MERGED from [com.android.support:interpolator:28.0.0] D:\ASSDK\caches\transforms-3\82606dc5ed8a140f83703823d4adaaf7\transformed\interpolator-28.0.0\AndroidManifest.xml:17:1-22:12
-INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-177:12
-INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-177:12
-INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-177:12
+INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12
+INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12
+INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12
 	package
 		INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-177:12
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:2:1-179:12
 		INJECTED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml
 	android:versionName
 		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:5:5-30
@@ -155,7 +155,7 @@ ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\Android
 	android:name
 		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:22-78
 application
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:19:5-175:19
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:19:5-177:19
 MERGED from [com.android.support:support-compat:28.0.0] D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94
 MERGED from [com.android.support:support-compat:28.0.0] D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94
 MERGED from [com.android.support:versionedparcelable:28.0.0] D:\ASSDK\caches\transforms-3\fa2caf22bdfeff77b33c6e9e469107de\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19
@@ -166,229 +166,229 @@ MERGED from [com.android.support:versionedparcelable:28.0.0] D:\ASSDK\caches\tra
 		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:21:9-41
 	android:icon
 		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:20:9-42
-activity#net.micode.notes.ui.SplashActivity
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:22:9-32:20
+activity#net.micode.notes.ui.LoginActivity
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:23:9-37:20
 	android:label
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:26:13-58
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:26:13-45
+	android:launchMode
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:27:13-43
+	android:windowSoftInputMode
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:13-52
+	android:uiOptions
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:13-57
 	android:configChanges
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:24:13-74
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:25:13-74
 	android:theme
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:27:13-58
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-45
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:23:13-46
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:24:13-45
 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-31:29
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29
 action#android.intent.action.MAIN
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:17-69
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:25-66
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66
 category#android.intent.category.LAUNCHER
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:17-77
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:27-74
-activity#net.micode.notes.ui.LoginActivity
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:9-47:20
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74
+activity#net.micode.notes.ui.ChangedLoginPassword
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:38:9-45:20
 	android:label
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:36:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:41:13-45
 	android:launchMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:37:13-43
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:42:13-43
 	android:windowSoftInputMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:40:13-52
-	android:uiOptions
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:39:13-57
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:44:13-52
 	android:configChanges
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:13-74
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:40:13-74
 	android:theme
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:38:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:43:13-45
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:34:13-45
-activity#net.micode.notes.ui.ChangedLoginPassword
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:48:9-55:20
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:39:13-52
+activity#net.micode.notes.ui.RegisterLoginPassword
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:46:9-53:20
 	android:label
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:51:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:49:13-45
 	android:launchMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:52:13-43
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:50:13-43
 	android:windowSoftInputMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:54:13-52
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:52:13-52
 	android:configChanges
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:50:13-74
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:48:13-74
 	android:theme
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:53:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:51:13-45
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:49:13-52
-activity#net.micode.notes.ui.RegisterLoginPassword
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:56:9-63:20
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:47:13-53
+activity#net.micode.notes.ui.DeleteLoginPassword
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:54:9-61:20
 	android:label
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:59:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:57:13-45
 	android:launchMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:60:13-43
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:58:13-43
 	android:windowSoftInputMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:62:13-52
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:60:13-52
 	android:configChanges
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:58:13-74
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:56:13-74
 	android:theme
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:61:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:59:13-45
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:57:13-53
-activity#net.micode.notes.ui.DeleteLoginPassword
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:64:9-71:20
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:55:13-51
+activity#net.micode.notes.ui.SplashActivity
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:62:9-72:20
 	android:label
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:67:13-45
-	android:launchMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:68:13-43
-	android:windowSoftInputMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:70:13-52
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:66:13-58
 	android:configChanges
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:66:13-74
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:64:13-74
 	android:theme
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:69:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:67:13-58
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:65:13-51
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:63:13-46
 activity#net.micode.notes.ui.NotesListActivity
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:72:9-83:20
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:74:9-85:20
 	android:label
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:75:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:77:13-45
 	android:launchMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:76:13-43
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:78:13-43
 	android:windowSoftInputMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:78:13-52
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:80:13-52
 	android:configChanges
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:74:13-74
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:76:13-74
 	android:theme
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:77:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:79:13-45
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:73:13-49
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:75:13-49
 activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:84:9-120:20
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:86:9-122:20
 	android:launchMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:87:13-43
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:89:13-43
 	android:configChanges
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:86:13-74
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:88:13-74
 	android:theme
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:88:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:90:13-45
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:85:13-48
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:87: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 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:91:13-100:29
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:93:13-102:29
 	android:scheme
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:92:17-38
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:17-38
 	tools:ignore
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:93:17-47
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:95:17-47
 action#android.intent.action.VIEW
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:17-69
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-69
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:25-66
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:25-66
 category#android.intent.category.DEFAULT
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-76
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:27-73
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73
 data
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-78
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78
 	android:mimeType
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:23-75
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100: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 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:102:13-109:29
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:104:13-111:29
 action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:103:17-79
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:17-79
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:103:25-76
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:25-76
 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:111:13-115:29
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:113:13-117:29
 action#android.intent.action.SEARCH
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:112:17-71
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:17-71
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:112:25-68
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:25-68
 meta-data#android.app.searchable
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:117:13-119:54
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:119:13-121:54
 	android:resource
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:119:17-51
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:121:17-51
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:118:17-54
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:120:17-54
 provider#net.micode.notes.data.NotesProvider
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:121:9-124:43
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:123:9-126:43
 	android:authorities
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:123:13-47
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:125:13-47
 	android:multiprocess
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:124:13-40
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:126:13-40
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:122:13-47
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:124:13-47
 receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:125:9-137:20
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:127:9-139:20
 	android:label
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:127:13-50
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:13-50
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:126:13-57
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128: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 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128:13-132:29
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:13-134:29
 action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:17-84
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-84
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:25-81
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-81
 action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:17-85
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:17-85
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:25-82
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:25-82
 action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-85
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:17-85
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-82
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:25-82
 meta-data#android.appwidget.provider
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:134:13-136:58
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:13-138:58
 	android:resource
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:17-55
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:17-55
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:135:17-58
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:137:17-58
 receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:9-150:20
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:140:9-152:20
 	android:label
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:140:13-50
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:142:13-50
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:139:13-57
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:141:13-57
 receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:151:9-155:20
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:9-157:20
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:151:19-55
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:19-55
 intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:152:13-154:29
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:154:13-156:29
 action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:17-79
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:17-79
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:25-76
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:25-76
 receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:156:9-158:41
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:158:9-160:41
 	android:process
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:158:13-38
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:160:13-38
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:157:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:159:13-45
 activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:159:9-163:78
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:161:9-165:78
 	android:label
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:161:13-45
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:163:13-45
 	android:launchMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:162:13-48
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:164:13-48
 	android:theme
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:163:13-75
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:165:13-75
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:160:13-50
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:162:13-50
 activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:164:9-168:63
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:166:9-170:63
 	android:label
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:166:13-54
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:168:13-54
 	android:launchMode
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:167:13-43
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:169:13-43
 	android:theme
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:168:13-60
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:170:13-60
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:165:13-55
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:167:13-55
 service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:169:9-171:40
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:171:9-173:40
 	android:exported
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:171:13-37
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:173:13-37
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:170:13-58
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:172:13-58
 meta-data#android.app.default_searchable
-ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:172:9-174:52
+ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:174:9-176:52
 	android:value
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:174:13-49
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:176:13-49
 	android:name
-		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:173:13-58
+		ADDED from D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:175:13-58

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

@@ -19,17 +19,7 @@
     <application
         android:icon="@drawable/icon_app"
         android:label="@string/app_name" >
-        <activity
-            android:name=".ui.SplashActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
 
-            android:label="@string/title_activity_splash"
-            android:theme="@style/Theme.Notes.Fullscreen" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
         <activity
             android:name=".ui.LoginActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -68,7 +58,19 @@
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
             android:windowSoftInputMode="adjustPan" >
-        </activity> <!-- 主Activity，启动器 -->
+        </activity>
+        <activity
+            android:name=".ui.SplashActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+
+            android:label="@string/title_activity_splash"
+            android:theme="@style/Theme.Notes.Fullscreen" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <!-- 主Activity，启动器 -->
         <activity
             android:name=".ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

src/Notes/app/src/main/java/net/micode/notes/ui/LoginActivity.java

@@ -25,7 +25,7 @@ public class LoginActivity extends Activity {
         boolean User_boolean = pref.getBoolean("user",false);//获取用户是否设置了密码
         if(!User_boolean) //User_boolean = false时，（没有设置密码），直接跳转到便签主界面
         {
-            Intent intent=new Intent(LoginActivity.this,NotesListActivity.class);
+            Intent intent=new Intent(LoginActivity.this,SplashActivity.class);
             startActivity(intent);
             finish();
         }
@@ -42,7 +42,7 @@ public class LoginActivity extends Activity {
                 SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
                 String password=pref.getString("password","");
                 if(password.equals("")==false&&password.equals(lg_password.getText().toString())==true){
-                    Intent intent=new Intent(LoginActivity.this,NotesListActivity.class);
+                    Intent intent=new Intent(LoginActivity.this,SplashActivity.class);
                     startActivity(intent);
                     finish();
                 }

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

@@ -1518,8 +1518,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
             public void onTextChanged(CharSequence s, int start, int before, int count) {
 
-                /*currentLength = editText.getText().length() + 100;*/
-                currentLength = 100;
+                currentLength = editText.getText().length() - countSpacesAndNewlines(s)[0] - countSpacesAndNewlines(s)[1] - countSpacesAndNewlines(s)[2];
             }
 
             public void afterTextChanged(Editable s) {

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

@@ -692,24 +692,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
      */
     private void batchDelete() {
         new AsyncTask<Void, Void, HashSet<AppWidgetAttribute>>() {
-            // 在后台执行任务，获取选中的widgets并执行删除操作
             protected HashSet<AppWidgetAttribute> doInBackground(Void... unused) {
-                // 获取当前选中的widgets
                 HashSet<AppWidgetAttribute> widgets = mNotesListAdapter.getSelectedWidget();
-                if (!isSyncMode()) {
-                    // 如果当前不处于同步模式，直接删除笔记
+                if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ // 只需要修改这里
+                    // if in trash, really delete notes
                     if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
                             .getSelectedItemIds())) {
-                        // 删除成功无需额外操作
                     } else {
-                        // 删除失败，记录错误
                         Log.e(TAG, "Delete notes error, should not happens");
                     }
                 } else {
-                    // 如果处于同步模式，将笔记移动到回收站文件夹
+                    // move notes to trash
                     if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
                             .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
-                        // 移动失败，记录错误
                         Log.e(TAG, "Move notes to trash folder error, should not happens");
                     }
                 }
@@ -1256,6 +1251,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                     public void onClick(DialogInterface dialog, int which){}
                 })
                  */
+                
                 dialog.show();
                 startAsyncNotesListQuery();
                 Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
@@ -1298,14 +1294,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             default:
                 break;
         }
+
+
+        if (item.getItemId() == R.id.menu_trash) {
+            openTrashFolder();
+        }
         return true;
     }
 
-    /**
-     * 处理搜索请求。
-     *
-     * @return 总是返回true。
-     */
+
     @Override
     public boolean onSearchRequested() {
         startSearch(null, false, null /* appData */, false);
@@ -1504,4 +1501,17 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         builder.setPositiveButton(android.R.string.ok, null);
         builder.show();
     }
+
+    private void openTrashFolder() {
+        mCurrentFolderId = Notes.ID_TRASH_FOLER;
+        startAsyncNotesListQuery();
+        // 正常打开文件夹
+        mState = ListEditState.SUB_FOLDER;
+        // 将顶部栏设置为 data.getSnippet 文件夹名称
+        mTitleBar.setText(NotesListActivity.this
+                .getString(R.string.menu_trash));
+        // 不显示底部的“写便签”
+        mAddNewNote.setVisibility(View.GONE);
+        mTitleBar.setVisibility(View.VISIBLE);
+    }
 }

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

@@ -17,6 +17,8 @@
         android:layout_height="fill_parent"
         android:orientation="vertical">
 
+
+
         <!-- 标题栏，可以隐藏，具有渐变背景色，文字居中 -->
         <TextView
             android:id="@+id/tv_title_bar"
@@ -49,4 +51,5 @@
         android:layout_height="wrap_content"
         android:focusable="false"
         android:layout_gravity="bottom" />
+
 </FrameLayout>

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

@@ -22,6 +22,11 @@
         android:id="@+id/menu_new_folder"
         android:title="@string/menu_create_folder"/>
 
+    <item
+        android:id="@+id/menu_trash"
+        android:title="@string/menu_trash"/>
+
+
     <!-- 导出文本菜单项 -->
     <item
         android:id="@+id/menu_export_text"

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

@@ -125,6 +125,7 @@
 
     <string name="day_time">亮背景</string>
     <string name="night_time">暗背景</string>
+    <string name="menu_trash">回收站</string>
 
     <plurals name="search_results_title">
         <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 条符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果</item>

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

@@ -126,6 +126,7 @@
 
     <string name="day_time">亮背景</string>
     <string name="night_time">暗背景</string>
+    <string name="menu_trash">回收站</string>
 
     <plurals name="search_results_title">
         <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 條符合”<xliff:g id="SEARCH">%2$s</xliff:g>“的搜尋結果</item>