diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.bin b/src/.gradle/5.4.1/executionHistory/executionHistory.bin index 52eb57b..d0d0909 100644 Binary files a/src/.gradle/5.4.1/executionHistory/executionHistory.bin and b/src/.gradle/5.4.1/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.lock b/src/.gradle/5.4.1/executionHistory/executionHistory.lock index ec2b28d..f33fcc4 100644 Binary files a/src/.gradle/5.4.1/executionHistory/executionHistory.lock and b/src/.gradle/5.4.1/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/5.4.1/fileHashes/fileHashes.bin b/src/.gradle/5.4.1/fileHashes/fileHashes.bin index e263e15..ad42c61 100644 Binary files a/src/.gradle/5.4.1/fileHashes/fileHashes.bin and b/src/.gradle/5.4.1/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/5.4.1/fileHashes/fileHashes.lock b/src/.gradle/5.4.1/fileHashes/fileHashes.lock index 2793557..93cf68d 100644 Binary files a/src/.gradle/5.4.1/fileHashes/fileHashes.lock and b/src/.gradle/5.4.1/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index c9b926d..ebe5adb 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml index d9bce2f..a966206 100644 --- a/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml +++ b/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml @@ -44,7 +44,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@android:style/Theme.Holo.Light" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index c956f7f..c379b48 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Thu Oct 17 08:22:49 CST 2019 +#Thu Oct 17 08:59:43 CST 2019 base.0=C\:\\Project\\minote\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\out\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= index 863e419..8e8cb09 100644 Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= differ diff --git a/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml index 6cffd24..ddde164 100644 --- a/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml @@ -45,7 +45,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@android:style/Theme.Holo.Light" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 8a73a08..d557da1 100644 --- a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -54,7 +54,7 @@ 34-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:31:22-78 35 36 C:\Project\minote\src\app\src\main\AndroidManifest.xml:33:5-147:19 +36-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:33:5-146:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" 38-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:34:9-42 @@ -62,7 +62,7 @@ 39-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:35:9-41 40 android:testOnly="true" > 41 C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-49:20 +41-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-48:20 42 android:name="net.micode.notes.ui.NotesListActivity" 42-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:37:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" @@ -73,200 +73,198 @@ 45-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-43 46 android:theme="@android:style/Theme.Holo.Light" 46-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:41:13-60 -47 android:uiOptions="splitActionBarWhenNarrow" -47-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-57 -48 android:windowSoftInputMode="adjustPan" > -48-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:43:13-52 -49 -49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:13-48:29 -50 -50-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-69 -50-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:25-66 -51 -52 -52-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:17-77 -52-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:27-74 -53 -54 -55 C:\Project\minote\src\app\src\main\AndroidManifest.xml:51:9-79:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-74 -58 android:launchMode="singleTop" -58-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-43 -59 android:theme="@style/NoteTheme" > -59-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:55:13-45 -60 -60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:13-62:29 -61 -61-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-69 -61-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:25-66 -62 -63 -63-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76 -63-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73 -64 -65 -65-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78 -65-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75 -66 -66-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78 -66-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75 -67 -68 -68-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:13-69:29 -69 -69-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:17-79 -69-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:25-76 -70 -71 -71-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76 -71-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73 -72 -73 -73-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78 -73-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75 -74 -74-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78 -74-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75 -75 -76 -76-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:13-74:29 -77 -77-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:17-71 -77-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:25-68 -78 -79 -79-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76 -79-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73 -80 -81 -82 C:\Project\minote\src\app\src\main\AndroidManifest.xml:76:13-78:54 -83 android:name="android.app.searchable" -83-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:17-54 -84 android:resource="@xml/searchable" /> -84-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:78:17-51 -85 -86 -87 C:\Project\minote\src\app\src\main\AndroidManifest.xml:81:9-84:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:13-63 -89 android:authorities="micode_notes" -89-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-47 -90 android:multiprocess="true" /> -90-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:84:13-40 -91 -92 C:\Project\minote\src\app\src\main\AndroidManifest.xml:86:9-98:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:13-57 -94 android:label="@string/app_widget2x2" > -94-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-50 -95 -95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-93:29 -96 -96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-84 -96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-81 -97 +47 android:windowSoftInputMode="adjustPan" > +47-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-52 +48 +48-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:44:13-47:29 +49 +49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:17-69 +49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:25-66 +50 +51 +51-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-77 +51-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:27-74 +52 +53 +54 C:\Project\minote\src\app\src\main\AndroidManifest.xml:50:9-78:20 +55 android:name="net.micode.notes.ui.NoteEditActivity" +55-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:51:13-48 +56 android:configChanges="keyboardHidden|orientation|screenSize" +56-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-74 +57 android:launchMode="singleTop" +57-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-43 +58 android:theme="@style/NoteTheme" > +58-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-45 +59 +59-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:56:13-61:29 +60 +60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:17-69 +60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:25-66 +61 +62 +62-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-76 +62-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:27-73 +63 +64 +64-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-78 +64-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:23-75 +65 +65-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-78 +65-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:23-75 +66 +67 +67-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:63:13-68:29 +68 +68-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:17-79 +68-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:25-76 +69 +70 +70-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-76 +70-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:27-73 +71 +72 +72-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-78 +72-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:23-75 +73 +73-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-78 +73-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:23-75 +74 +75 +75-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:70:13-73:29 +76 +76-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:17-71 +76-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:25-68 +77 +78 +78-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-76 +78-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:27-73 +79 +80 +81 C:\Project\minote\src\app\src\main\AndroidManifest.xml:75:13-77:54 +82 android:name="android.app.searchable" +82-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:76:17-54 +83 android:resource="@xml/searchable" /> +83-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:17-51 +84 +85 +86 C:\Project\minote\src\app\src\main\AndroidManifest.xml:80:9-83:43 +87 android:name="net.micode.notes.data.NotesProvider" +87-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:81:13-63 +88 android:authorities="micode_notes" +88-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:13-47 +89 android:multiprocess="true" /> +89-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-40 +90 +91 C:\Project\minote\src\app\src\main\AndroidManifest.xml:85:9-97:20 +92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +92-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:86:13-57 +93 android:label="@string/app_widget2x2" > +93-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:13-50 +94 +94-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-92:29 +95 +95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:17-84 +95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:25-81 +96 +96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-85 +96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-82 +97 97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85 97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82 -98 -98-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85 -98-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82 -99 -100 -101 C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:13-97:58 -102 android:name="android.appwidget.provider" -102-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-55 -104 -105 C:\Project\minote\src\app\src\main\AndroidManifest.xml:99:9-112:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:13-57 -107 android:label="@string/app_widget4x4" > -107-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:101:13-50 -108 -108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-93:29 -109 -109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-84 -109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-81 -110 +98 +99 +100 C:\Project\minote\src\app\src\main\AndroidManifest.xml:94:13-96:58 +101 android:name="android.appwidget.provider" +101-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:17-58 +102 android:resource="@xml/widget_2x_info" /> +102-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-55 +103 +104 C:\Project\minote\src\app\src\main\AndroidManifest.xml:98:9-111:20 +105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +105-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:99:13-57 +106 android:label="@string/app_widget4x4" > +106-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:13-50 +107 +107-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-92:29 +108 +108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:17-84 +108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:25-81 +109 +109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-85 +109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-82 +110 110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85 110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82 -111 -111-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85 -111-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82 -112 -113 -114 C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:13-97:58 -115 android:name="android.appwidget.provider" -115-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-55 -117 -118 -118-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:9-118:20 -118-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:19-55 -119 -119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:13-117:29 -120 -120-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:17-79 -120-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:25-76 -121 -122 -123 C:\Project\minote\src\app\src\main\AndroidManifest.xml:120:9-123:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:13-61 -125 android:process=":remote" > -125-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:122:13-38 -126 -127 -128 C:\Project\minote\src\app\src\main\AndroidManifest.xml:125:9-130:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:13-50 -130 android:label="@string/app_name" -130-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-45 -131 android:launchMode="singleInstance" -131-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:129:13-75 -133 -134 C:\Project\minote\src\app\src\main\AndroidManifest.xml:132:9-137:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:13-71 -136 android:label="@string/preferences_title" -136-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-54 -137 android:launchMode="singleTop" -137-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:136:13-60 -139 -140 -141 C:\Project\minote\src\app\src\main\AndroidManifest.xml:139:9-142:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:13-74 -143 android:exported="false" > -143-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:141:13-37 -144 -145 -146 C:\Project\minote\src\app\src\main\AndroidManifest.xml:144:9-146:52 -147 android:name="android.app.default_searchable" -147-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:146:13-49 -149 -150 -151 +111 +112 +113 C:\Project\minote\src\app\src\main\AndroidManifest.xml:94:13-96:58 +114 android:name="android.appwidget.provider" +114-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:17-58 +115 android:resource="@xml/widget_4x_info" /> +115-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-55 +116 +117 +117-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:113:9-117:20 +117-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:113:19-55 +118 +118-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:13-116:29 +119 +119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:17-79 +119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:25-76 +120 +121 +122 C:\Project\minote\src\app\src\main\AndroidManifest.xml:119:9-122:20 +123 android:name="net.micode.notes.ui.AlarmReceiver" +123-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:120:13-61 +124 android:process=":remote" > +124-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:13-38 +125 +126 +127 C:\Project\minote\src\app\src\main\AndroidManifest.xml:124:9-129:20 +128 android:name="net.micode.notes.ui.AlarmAlertActivity" +128-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:125:13-50 +129 android:label="@string/app_name" +129-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:13-45 +130 android:launchMode="singleInstance" +130-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-48 +131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +131-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-75 +132 +133 C:\Project\minote\src\app\src\main\AndroidManifest.xml:131:9-136:20 +134 android:name="net.micode.notes.ui.NotesPreferenceActivity" +134-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:132:13-71 +135 android:label="@string/preferences_title" +135-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:13-54 +136 android:launchMode="singleTop" +136-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-43 +137 android:theme="@android:style/Theme.Holo.Light" > +137-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-60 +138 +139 +140 C:\Project\minote\src\app\src\main\AndroidManifest.xml:138:9-141:19 +141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +141-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:139:13-74 +142 android:exported="false" > +142-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:13-37 +143 +144 +145 C:\Project\minote\src\app\src\main\AndroidManifest.xml:143:9-145:52 +146 android:name="android.app.default_searchable" +146-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:144:13-58 +147 android:value=".ui.NoteEditActivity" /> +147-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:13-49 +148 +149 +150 diff --git a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index d9bce2f..a966206 100644 --- a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -44,7 +44,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@android:style/Theme.Holo.Light" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > diff --git a/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ index 9b9cf4d..0935bec 100644 Binary files a/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ differ diff --git a/src/app/build/outputs/apk/debug/app-debug.apk b/src/app/build/outputs/apk/debug/app-debug.apk index 3bb3bdf..5e9910f 100644 Binary files a/src/app/build/outputs/apk/debug/app-debug.apk and b/src/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt index f057af5..44c6bb1 100644 --- a/src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,12 +1,12 @@ -- Merging decision tree log --- manifest -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-148:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-148:12 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 package ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:19:5-31 INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml @@ -58,21 +58,19 @@ ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:31:5-81 android:name ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:31:22-78 application -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:33:5-147:19 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:33:5-146:19 android:label ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:35:9-41 android:icon ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:34:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-49:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-48:20 android:label ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:39:13-45 android:launchMode ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-43 android:windowSoftInputMode - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:43:13-52 - android:uiOptions - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-57 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-52 android:configChanges ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:38:13-74 android:theme @@ -80,145 +78,145 @@ ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-49:20 android:name ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:37:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:13-48:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:44:13-47:29 action#android.intent.action.MAIN -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-69 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:17-69 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:25-66 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:25-66 category#android.intent.category.LAUNCHER -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:17-77 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-77 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:27-74 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:51:9-79:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:50:9-78:20 android:launchMode - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-43 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-43 android:configChanges - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-74 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-74 android:theme - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:55:13-45 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-45 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-48 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:51: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 C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:13-62:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:56:13-61:29 action#android.intent.action.VIEW -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-69 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:17-69 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:25-66 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:25-66 category#android.intent.category.DEFAULT -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-76 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:27-73 data -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-78 android:mimeType - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:59: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 C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:13-69:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:63:13-68:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:17-79 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:17-79 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:25-76 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:13-74:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:70:13-73:29 action#android.intent.action.SEARCH -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:17-71 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:17-71 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:25-68 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:25-68 meta-data#android.app.searchable -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:76:13-78:54 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:75:13-77:54 android:resource - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:78:17-51 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:17-51 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:17-54 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:76:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:81:9-84:43 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:80:9-83:43 android:authorities - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-47 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:13-47 android:multiprocess - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:84:13-40 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-40 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:13-63 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:81:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:86:9-98:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:85:9-97:20 android:label - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-50 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:13-50 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:13-57 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:86: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 C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-93:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-92:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-84 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:17-84 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-81 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:25-81 action#android.appwidget.action.APPWIDGET_DELETED +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-85 + android:name + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-82 +action#android.intent.action.PRIVACY_MODE_CHANGED ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85 android:name ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85 - android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82 meta-data#android.appwidget.provider -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:13-97:58 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:94:13-96:58 android:resource - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-55 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-55 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-58 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:99:9-112:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:98:9-111:20 android:label - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:101:13-50 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:13-50 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:13-57 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:99:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:9-118:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:113:9-117:20 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:19-55 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:113:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:13-117:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:13-116:29 action#android.intent.action.BOOT_COMPLETED -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:17-79 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:17-79 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:25-76 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:120:9-123:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:119:9-122:20 android:process - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:122:13-38 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:13-38 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:13-61 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:120:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:125:9-130:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:124:9-129:20 android:label - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-45 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:13-45 android:launchMode - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-48 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-48 android:theme - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:129:13-75 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-75 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:13-50 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:125:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:132:9-137:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:131:9-136:20 android:label - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-54 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:13-54 android:launchMode - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-43 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-43 android:theme - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:136:13-60 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-60 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:13-71 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:132:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:139:9-142:19 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:138:9-141:19 android:exported - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:141:13-37 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:13-37 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:13-74 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:139:13-74 meta-data#android.app.default_searchable -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:144:9-146:52 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:143:9-145:52 android:value - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:146:13-49 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:13-49 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:13-58 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:144:13-58 uses-sdk INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml reason: use-sdk injection requested INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml index 1431fcb..ae0cf92 100644 --- a/src/app/src/main/AndroidManifest.xml +++ b/src/app/src/main/AndroidManifest.xml @@ -39,7 +39,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@android:style/Theme.Holo.Light" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index d093306..2f96fa4 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -888,6 +888,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt public boolean onPrepareOptionsMenu(Menu menu) { menu.clear(); if (mState == ListEditState.NOTE_LIST) { + //显示actionbar getMenuInflater().inflate(R.menu.note_list, menu); // 设置是否同步 menu.findItem(R.id.menu_sync).setTitle(