111

# Conflicts:
#	doc/小米便签开源代码的泛读报告.docx

.scannerwork/report-task.txt

@@ -0,0 +1,6 @@
+projectKey=sonar1
+serverUrl=http://localhost:9000
+serverVersion=9.5.0.56709
+dashboardUrl=http://localhost:9000/dashboard?id=sonar1
+ceTaskId=AYMWVRBL2KghvlLOOm2Y
+ceTaskUrl=http://localhost:9000/api/ce/task?id=AYMWVRBL2KghvlLOOm2Y

sonar-project.properties

@@ -0,0 +1,17 @@
+# 配置代码扫描的项目信息，每个项目有唯一的key，可以自己定
+# must be unique in a given SonarQube instance
+sonar.projectKey=sonar1
+ 
+# this is the name displayed in the SonarQube UI
+# 名称自己定
+sonar.projectName=sonar1
+sonar.projectVersion=1.0
+ 
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+# If not set, SonarQube starts looking for source code from the directory containing 
+# 配置扫描的代码目录，目录一般就是项目根目录下的src文件夹
+sonar.sources=src
+ 
+# classes文件目录，不加会报错。在代码根目录添加target文件夹(我的根目录为: E:\git\kang_wei\src)
+# 如果还是报错在target中添加classes文件夹，之后下列等号右边改为target/classes
+sonar.java.binaries=target

src/.idea/misc.xml

@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/xiaomibianqian/xiaomibianqian/src/app/src/main/res/menu/note_list.xml" value="0.25364583333333335" />
+      </map>
+    </option>
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />

src/app/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "net.micode.notes"
-        useLibrary'org.apache.http.legacy'
+        useLibrary 'org.apache.http.legacy'
         minSdkVersion 14
         targetSdkVersion 14
     }
@@ -17,4 +17,22 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
-}
+
+    sonarqube {
+        properties {
+            //Sonar服务器地址
+            property "sonar.host.url", "http://localhost:9000"
+            //Token模式                                                        //可选择该该模式
+            //property "sonar.login","07704f4ca9c20492de2b5b7814a1c0a4ebc6731c"//你的Token
+            //账号密码模式
+            property "sonar.login", "SonarQube admin"
+            property "sonar.password", "SonarQube dwc020529"   //XXX为你的密码
+            property "sonar.sourceEncoding", "UTF-8"
+            property "sonar.projectKey", "xiaomi"//你的项目名字
+            property "sonar.projectName", project.name
+            //需要扫描的上传检测代码的模块，可以选择也可以配置哪一些需要或者不需要上传的模块(这里指APP模块下面的java包里面的全部)
+            property "sonar.sources", "src/main/java"
+            property "sonar.projectVersion", project.version
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-#Fri Aug 19 08:20:50 CST 2022
+#Tue Sep 13 20:53:06 CST 2022
 net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\xiaomibianqian\\xiaomibianqian\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\xiaomibianqian\\xiaomibianqian\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\xiaomibianqian\\xiaomibianqian\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat

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

@@ -132,8 +132,8 @@
         <item name="android:textColor">@color/secondary_text_dark</item>
     </style>
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+
+        <item name="android:visibility">visible</item>
     </style>
     <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>

src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml

@@ -41,8 +41,8 @@
     </style><style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
     </style><style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+
+        <item name="android:visibility">visible</item>
     </style></file><file path="D:\xiaomibianqian\xiaomibianqian\src\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
         <item>短信</item>
         <item>邮件</item>

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

@@ -1,4 +1,4 @@
-#Fri Aug 19 08:24:02 CST 2022
+#Tue Sep 13 20:53:08 CST 2022
 base.0=D\:\\xiaomibianqian\\xiaomibianqian\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex

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

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

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

@@ -42,8 +42,9 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
+            android:theme="@style/NoteTheme" >
+
+            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -42,8 +42,9 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
+            android:theme="@style/NoteTheme" >
+
+            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -8,10 +8,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
@@ -27,10 +27,10 @@
                     "from": {
                         "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,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,64,43,48,47,46,62,42,61,40,41,65,28,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",
-                        "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
+                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,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,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,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": "123,71,70,69,68,19,20,21,112,113,120,119,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,64,43,48,47,46,62,42,61,40,41,65,28,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,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,42,46,55,54,54,43,41,40,49,58,50,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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,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,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,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"
                     },
                     "to": {
                         "startLines": "6,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,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",
@@ -51,9 +51,9 @@
                     "from": {
                         "startLines": "19,20,21,22,18",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
+                        "startOffsets": "783,836,890,944,730",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "endOffsets": "830,884,938,991,777"
                     },
                     "to": {
                         "startLines": "13,14,15,16,17",
@@ -68,10 +68,10 @@
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
-                        "startOffsets": "739,1047",
+                        "startOffsets": "758,1073",
                         "endLines": "24,29",
                         "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "endOffsets": "1065,1191"
                     },
                     "to": {
                         "startLines": "2,8",
@@ -87,10 +87,10 @@
                     "from": {
                         "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+                        "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
                         "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
                         "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+                        "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
                     },
                     "to": {
                         "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
@@ -106,18 +106,18 @@
                     "from": {
                         "startLines": "50,55,64,60,22,26,30,35,40,18,45",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
                         "endLines": "53,58,67,62,25,29,33,38,43,21,48",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                        "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
                         "startLines": "125,129,133,137,140,144,148,152,156,160,164",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+                        "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009",
                         "endLines": "128,132,136,139,143,147,151,155,159,163,167",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                        "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205"
                     }
                 },
                 {
@@ -125,9 +125,9 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endColumns": "56",
-                        "endOffsets": "764"
+                        "endOffsets": "782"
                     },
                     "to": {
                         "startLines": "12",
@@ -147,10 +147,10 @@
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,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,65,44,49,48,47,63,43,62,41,42,66,28,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",
-                        "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,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,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,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": "124,72,71,70,69,19,20,21,112,113,121,120,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,65,44,49,48,47,63,43,62,41,42,66,28,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,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,42,46,55,54,54,43,41,40,49,58,50,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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+                        "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,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,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,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"
                     },
                     "to": {
                         "startLines": "6,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,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",
@@ -166,10 +166,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",

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

@@ -8,10 +8,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
@@ -27,10 +27,10 @@
                     "from": {
                         "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,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,64,43,48,47,46,62,42,61,40,41,65,28,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",
-                        "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
+                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,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,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,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": "123,71,70,69,68,19,20,21,112,113,120,119,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,64,43,48,47,46,62,42,61,40,41,65,28,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,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,42,46,55,54,54,43,41,40,49,58,50,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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,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,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,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"
                     },
                     "to": {
                         "startLines": "6,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,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",

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

@@ -8,10 +8,10 @@
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,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,65,44,49,48,47,63,43,62,41,42,66,28,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",
-                        "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,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,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,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": "124,72,71,70,69,19,20,21,112,113,121,120,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,65,44,49,48,47,63,43,62,41,42,66,28,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,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,42,46,55,54,54,43,41,40,49,58,50,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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+                        "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,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,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,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"
                     },
                     "to": {
                         "startLines": "6,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,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",
@@ -27,10 +27,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",

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

@@ -8,9 +8,9 @@
                     "from": {
                         "startLines": "19,20,21,22,18",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
+                        "startOffsets": "783,836,890,944,730",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "endOffsets": "830,884,938,991,777"
                     },
                     "to": {
                         "startLines": "13,14,15,16,17",
@@ -25,10 +25,10 @@
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
-                        "startOffsets": "739,1047",
+                        "startOffsets": "758,1073",
                         "endLines": "24,29",
                         "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "endOffsets": "1065,1191"
                     },
                     "to": {
                         "startLines": "2,8",
@@ -44,10 +44,10 @@
                     "from": {
                         "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+                        "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
                         "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
                         "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+                        "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
                     },
                     "to": {
                         "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
@@ -63,18 +63,18 @@
                     "from": {
                         "startLines": "50,55,64,60,22,26,30,35,40,18,45",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
                         "endLines": "53,58,67,62,25,29,33,38,43,21,48",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                        "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
                         "startLines": "125,129,133,137,140,144,148,152,156,160,164",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+                        "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009",
                         "endLines": "128,132,136,139,143,147,151,155,159,163,167",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                        "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205"
                     }
                 },
                 {
@@ -82,9 +82,9 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endColumns": "56",
-                        "endOffsets": "764"
+                        "endOffsets": "782"
                     },
                     "to": {
                         "startLines": "12",

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

@@ -42,8 +42,9 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
+            android:theme="@style/NoteTheme" >
+
+            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -83,10 +83,6 @@ ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml
 		ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:41:13-45
 	android:launchMode
 		ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:42:13-43
-	android:windowSoftInputMode
-		ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:45:13-52
-	android:uiOptions
-		ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:44:13-57
 	android:configChanges
 		ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:40:13-74
 	android:theme

src/app/src/main/AndroidManifest.xml

@@ -40,8 +40,8 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
+            android:theme="@style/NoteTheme">
+<!--            android:uiOptions="splitActionBarWhenNarrow"-->
             android:windowSoftInputMode="adjustPan" >
 
             <intent-filter>

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

@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/menu_new_folder"
-        android:title="@string/menu_create_folder"/>
+        android:title="@string/menu_create_folder" />
 
     <item
         android:id="@+id/menu_export_text"
@@ -30,8 +30,8 @@
         android:title="@string/menu_sync"/>
 
     <item
-        android:id="@+id/menu_setting"
-        android:title="@string/menu_setting" />
+        android:id="@+id/menu_setting"/>
+
 
     <item
         android:id="@+id/menu_search"

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

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

src/build.gradle

@@ -1,4 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply plugin: 'org.sonarqube'
 buildscript {
     repositories {
         jcenter()
@@ -6,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3'
     }
 }
 

src/local.properties

@@ -5,3 +5,5 @@
 #
 #Fri Aug 19 08:20:02 CST 2022
 sdk.dir=D\:\\SDK
+gradlew sonarqube -Dsonar.projectKey=xiaomi -Dsonar.host.url=http://127.0.0.1:9000 
+-Dsonar.login=vitanini