moved the actionbar to the top of screen

This commit is contained in:
ziji Wu 2019-10-17 09:05:00 +08:00
parent e7e3b4fdb2
commit f7d0e24e1c
16 changed files with 275 additions and 282 deletions

View File

@ -44,7 +44,6 @@
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@android:style/Theme.Holo.Light" android:theme="@android:style/Theme.Holo.Light"
android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="adjustPan" > android:windowSoftInputMode="adjustPan" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

View File

@ -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 base.0=C\:\\Project\\minote\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\out\\classes.dex
path.0=classes.dex path.0=classes.dex
renamed.0=classes.dex renamed.0=classes.dex

View File

@ -45,7 +45,6 @@
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@android:style/Theme.Holo.Light" android:theme="@android:style/Theme.Holo.Light"
android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="adjustPan" > android:windowSoftInputMode="adjustPan" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

View File

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

View File

@ -44,7 +44,6 @@
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@android:style/Theme.Holo.Light" android:theme="@android:style/Theme.Holo.Light"
android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="adjustPan" > android:windowSoftInputMode="adjustPan" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

View File

@ -1,12 +1,12 @@
-- Merging decision tree log --- -- Merging decision tree log ---
manifest manifest
ADDED 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-148: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-148: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-148: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-148: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-148: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-148:12 INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12
package package
ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:19:5-31 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 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 android:name
ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:31:22-78 ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:31:22-78
application 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 android:label
ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:35:9-41 ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:35:9-41
android:icon android:icon
ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:34:9-42 ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:34:9-42
activity#net.micode.notes.ui.NotesListActivity 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 android:label
ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:39:13-45 ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:39:13-45
android:launchMode android:launchMode
ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-43 ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-43
android:windowSoftInputMode android:windowSoftInputMode
ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:43:13-52 ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-52
android:uiOptions
ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-57
android:configChanges android:configChanges
ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:38:13-74 ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:38:13-74
android:theme android:theme
@ -80,145 +78,145 @@ ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-49:20
android:name android:name
ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:37:13-49 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85
android:name android:name
ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 reason: use-sdk injection requested
INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml

View File

@ -39,7 +39,6 @@
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@android:style/Theme.Holo.Light" android:theme="@android:style/Theme.Holo.Light"
android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="adjustPan" > android:windowSoftInputMode="adjustPan" >
<intent-filter> <intent-filter>

View File

@ -888,6 +888,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
public boolean onPrepareOptionsMenu(Menu menu) { public boolean onPrepareOptionsMenu(Menu menu) {
menu.clear(); menu.clear();
if (mState == ListEditState.NOTE_LIST) { if (mState == ListEditState.NOTE_LIST) {
//显示actionbar
getMenuInflater().inflate(R.menu.note_list, menu); getMenuInflater().inflate(R.menu.note_list, menu);
// 设置是否同步 // 设置是否同步
menu.findItem(R.id.menu_sync).setTitle( menu.findItem(R.id.menu_sync).setTitle(