Skip to content

Commit e5e4663

Browse files
yuchuangu85yuchuangu85
committed
添加菜单代码，还未显示
1 parent d1d5ab6 commit e5e4663

File tree

821 files changed

+7005
-3611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

821 files changed

+7005
-3611
lines changed

‎AndroidManifest-common.xml

+25-23
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
3535
android:protectionLevel="dangerous"
3636
android:label="@string/permlab_install_shortcut"
37-
android:description="@string/permdesc_install_shortcut" />
37+
android:description="@string/permdesc_install_shortcut"/>
3838

39-
<uses-permission android:name="android.permission.CALL_PHONE" />
40-
<uses-permission android:name="android.permission.SET_WALLPAPER" />
41-
<uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
42-
<uses-permission android:name="android.permission.BIND_APPWIDGET" />
43-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
44-
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
45-
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
39+
<uses-permission android:name="android.permission.CALL_PHONE"/>
40+
<uses-permission android:name="android.permission.SET_WALLPAPER"/>
41+
<uses-permission android:name="android.permission.SET_WALLPAPER_HINTS"/>
42+
<uses-permission android:name="android.permission.BIND_APPWIDGET"/>
43+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
44+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
45+
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES"/>
4646

4747
<application
4848
android:backupAgent="com.android.launcher3.LauncherBackupAgent"
@@ -53,28 +53,28 @@
5353
android:label="@string/derived_app_name"
5454
android:largeHeap="@bool/config_largeHeap"
5555
android:restoreAnyVersion="true"
56-
android:supportsRtl="true" >
56+
android:supportsRtl="true">
5757

5858
<!-- Intent received used to install shortcuts from other applications -->
5959
<receiver
6060
android:name="com.android.launcher3.InstallShortcutReceiver"
6161
android:permission="com.android.launcher.permission.INSTALL_SHORTCUT"
62-
android:enabled="@bool/enable_install_shortcut_api" >
62+
android:enabled="@bool/enable_install_shortcut_api">
6363
<intent-filter>
64-
<action android:name="com.android.launcher.action.INSTALL_SHORTCUT" />
64+
<action android:name="com.android.launcher.action.INSTALL_SHORTCUT"/>
6565
</intent-filter>
6666
</receiver>
6767

6868
<!-- Intent received when a session is committed -->
6969
<receiver
70-
android:name="com.android.launcher3.SessionCommitReceiver" >
70+
android:name="com.android.launcher3.SessionCommitReceiver">
7171
<intent-filter>
72-
<action android:name="android.content.pm.action.SESSION_COMMITTED" />
72+
<action android:name="android.content.pm.action.SESSION_COMMITTED"/>
7373
</intent-filter>
7474
</receiver>
7575

7676
<!-- Intent received used to initialize a restored widget -->
77-
<receiver android:name="com.android.launcher3.AppWidgetsRestoredReceiver" >
77+
<receiver android:name="com.android.launcher3.AppWidgetsRestoredReceiver">
7878
<intent-filter>
7979
<action android:name="android.appwidget.action.APPWIDGET_HOST_RESTORED"/>
8080
</intent-filter>
@@ -84,29 +84,31 @@
8484
android:name="com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"
8585
android:exported="false"
8686
android:process=":wallpaper_chooser"
87-
android:permission="android.permission.BIND_JOB_SERVICE" />
87+
android:permission="android.permission.BIND_JOB_SERVICE"/>
8888

8989
<service
9090
android:name="com.android.launcher3.notification.NotificationListener"
9191
android:label="@string/icon_badging_service_title"
9292
android:enabled="@bool/notification_badging_enabled"
9393
android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
9494
<intent-filter>
95-
<action android:name="android.service.notification.NotificationListenerService" />
95+
<action android:name="android.service.notification.NotificationListenerService"/>
9696
</intent-filter>
9797
</service>
9898

99-
<meta-data android:name="android.nfc.disable_beam_default"
100-
android:value="true" />
99+
<meta-data
100+
android:name="android.nfc.disable_beam_default"
101+
android:value="true"/>
101102

102-
<activity android:name="com.android.launcher3.dragndrop.AddItemActivity"
103+
<activity
104+
android:name="com.android.launcher3.dragndrop.AddItemActivity"
103105
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
104106
android:excludeFromRecents="true"
105107
android:autoRemoveFromRecents="true"
106-
android:label="@string/action_add_to_workspace" >
108+
android:label="@string/action_add_to_workspace">
107109
<intent-filter>
108-
<action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />
109-
<action android:name="android.content.pm.action.CONFIRM_PIN_APPWIDGET" />
110+
<action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT"/>
111+
<action android:name="android.content.pm.action.CONFIRM_PIN_APPWIDGET"/>
110112
</intent-filter>
111113
</activity>
112114

@@ -116,7 +118,7 @@
116118
-->
117119
<meta-data
118120
android:name="com.android.launcher3.launcher_dump_provider"
119-
android:value="com.android.launcher3.LauncherProvider" />
121+
android:value="com.android.launcher3.LauncherProvider"/>
120122

121123
</application>
122124
</manifest>

‎AndroidManifest.xml

+34-32
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919
-->
2020
<manifest
21-
xmlns:android="http://schemas.android.com/apk/res/android"
22-
package="com.android.launcher3">
21+
package="com.android.launcher3"
22+
xmlns:android="http://schemas.android.com/apk/res/android">
2323
<!--
2424
Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
2525
Refer comments around specific entries on how to extend individual components.
@@ -32,58 +32,60 @@
3232
-->
3333
<permission
3434
android:name="com.android.launcher3.permission.READ_SETTINGS"
35-
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
36-
android:protectionLevel="signatureOrSystem"
35+
android:description="@string/permdesc_read_settings"
3736
android:label="@string/permlab_read_settings"
38-
android:description="@string/permdesc_read_settings"/>
37+
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
38+
android:protectionLevel="signatureOrSystem"/>
3939
<permission
4040
android:name="com.android.launcher3.permission.WRITE_SETTINGS"
41-
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
42-
android:protectionLevel="signatureOrSystem"
41+
android:description="@string/permdesc_write_settings"
4342
android:label="@string/permlab_write_settings"
44-
android:description="@string/permdesc_write_settings"/>
43+
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
44+
android:protectionLevel="signatureOrSystem"/>
4545

46-
<uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
47-
<uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
48-
<uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />
49-
<uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" />
46+
<uses-permission android:name="com.android.launcher.permission.READ_SETTINGS"/>
47+
<uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS"/>
48+
<uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS"/>
49+
<uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS"/>
5050

5151
<application
5252
android:backupAgent="com.android.launcher3.LauncherBackupAgent"
53-
android:fullBackupOnly="true"
5453
android:fullBackupContent="@xml/backupscheme"
54+
android:fullBackupOnly="true"
5555
android:hardwareAccelerated="true"
5656
android:icon="@drawable/ic_launcher_home"
5757
android:label="@string/derived_app_name"
58-
android:theme="@style/LauncherTheme"
5958
android:largeHeap="@bool/config_largeHeap"
6059
android:restoreAnyVersion="true"
61-
android:supportsRtl="true" >
60+
android:supportsRtl="true"
61+
android:theme="@style/LauncherTheme">
6262

6363
<!--
6464
Main launcher activity. When extending only change the name, and keep all the
6565
attributes and intent filters the same
6666
-->
6767
<activity
6868
android:name="com.android.launcher3.Launcher"
69-
android:launchMode="singleTask"
69+
android:autoRemoveFromRecents="true"
7070
android:clearTaskOnLaunch="true"
71-
android:stateNotNeeded="true"
72-
android:windowSoftInputMode="adjustPan"
73-
android:screenOrientation="unspecified"
7471
android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
72+
android:enabled="true"
73+
android:launchMode="singleTask"
7574
android:resizeableActivity="true"
7675
android:resumeWhilePausing="true"
76+
android:screenOrientation="unspecified"
77+
android:stateNotNeeded="true"
7778
android:taskAffinity=""
78-
android:enabled="true">
79+
android:windowSoftInputMode="adjustPan">
7980
<intent-filter>
80-
<action android:name="android.intent.action.MAIN" />
81-
<action android:name="android.intent.action.VIEW" />
82-
<category android:name="android.intent.category.HOME" />
83-
<category android:name="android.intent.category.DEFAULT" />
81+
<action android:name="android.intent.action.MAIN"/>
82+
<action android:name="android.intent.action.VIEW"/>
83+
84+
<category android:name="android.intent.category.HOME"/>
85+
<category android:name="android.intent.category.DEFAULT"/>
8486
<category android:name="android.intent.category.MONKEY"/>
85-
<category android:name="android.intent.category.LAUNCHER_APP" />
86-
<category android:name="android.intent.category.LAUNCHER" />
87+
<category android:name="android.intent.category.LAUNCHER_APP"/>
88+
<category android:name="android.intent.category.LAUNCHER"/>
8789
</intent-filter>
8890
</activity>
8991

@@ -92,12 +94,12 @@
9294
-->
9395
<activity
9496
android:name="com.android.launcher3.SettingsActivity"
97+
android:autoRemoveFromRecents="true"
9598
android:label="@string/settings_button_text"
96-
android:theme="@android:style/Theme.DeviceDefault.Settings"
97-
android:autoRemoveFromRecents="true">
99+
android:theme="@android:style/Theme.DeviceDefault.Settings">
98100
<intent-filter>
99-
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
100-
<category android:name="android.intent.category.DEFAULT" />
101+
<action android:name="android.intent.action.APPLICATION_PREFERENCES"/>
102+
<category android:name="android.intent.category.DEFAULT"/>
101103
</intent-filter>
102104
</activity>
103105

@@ -110,8 +112,8 @@
110112
android:name="com.android.launcher3.LauncherProvider"
111113
android:authorities="com.android.mxlauncher3.settings"
112114
android:exported="true"
113-
android:writePermission="com.android.launcher3.permission.WRITE_SETTINGS"
114-
android:readPermission="com.android.launcher3.permission.READ_SETTINGS" />
115+
android:readPermission="com.android.launcher3.permission.READ_SETTINGS"
116+
android:writePermission="com.android.launcher3.permission.WRITE_SETTINGS"/>
115117

116118
</application>
117119
</manifest>

‎Launcher-master.iml

-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
146146
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
147147
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
148-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
149148
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
150149
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
151150
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />

‎build.gradle

-7
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ android {
5757
}
5858
}
5959

60-
// Disable release builds for now
61-
android.variantFilter { variant ->
62-
if (variant.buildType.name.endsWith('release')) {
63-
variant.setIgnore(true);
64-
}
65-
}
66-
6760
sourceSets {
6861
main {
6962
res.srcDirs = ['res']

0 commit comments

Comments
 (0)