Skip to content

Commit 3b9c71a

Browse files
yuchuangu85yuchuangu85
committed
update to android 15 s1 release version
1 parent 7d1211c commit 3b9c71a

File tree

1,624 files changed

+105352
-41623
lines changed

Some content is hidden

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

1,624 files changed

+105352
-41623
lines changed

‎.DS_Store

12 KB
Binary file not shown.

‎Android.bp

+97-133
Large diffs are not rendered by default.

‎AndroidManifest-common.xml

+15-10
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,22 @@
5252
name in the permissions. eq com.mypackage.permission.READ_SETTINGS
5353
-->
5454
<permission
55-
android:name="${packageName}.permission.READ_SETTINGS"
55+
android:name="${applicationId}.permission.READ_SETTINGS"
5656
android:protectionLevel="signatureOrSystem"
5757
android:label="@string/permlab_read_settings"
5858
android:description="@string/permdesc_read_settings"/>
5959
<permission
60-
android:name="${packageName}.permission.WRITE_SETTINGS"
60+
android:name="${applicationId}.permission.WRITE_SETTINGS"
6161
android:protectionLevel="signatureOrSystem"
6262
android:label="@string/permlab_write_settings"
6363
android:description="@string/permdesc_write_settings"/>
6464

65-
<uses-permission android:name="${packageName}.permission.READ_SETTINGS" />
66-
<uses-permission android:name="${packageName}.permission.WRITE_SETTINGS" />
65+
<uses-permission android:name="${applicationId}.permission.READ_SETTINGS" />
66+
<uses-permission android:name="${applicationId}.permission.WRITE_SETTINGS" />
6767

6868
<application
6969
android:backupAgent="com.android.launcher3.LauncherBackupAgent"
70+
android:name="com.android.launcher3.LauncherApplication"
7071
android:fullBackupOnly="true"
7172
android:backupInForeground="true"
7273
android:fullBackupContent="@xml/backupscheme"
@@ -125,18 +126,18 @@
125126
-->
126127
<provider
127128
android:name="com.android.launcher3.LauncherProvider"
128-
android:authorities="${packageName}.settings"
129+
android:authorities="${applicationId}.settings"
129130
android:exported="true"
130-
android:writePermission="${packageName}.permission.WRITE_SETTINGS"
131-
android:readPermission="${packageName}.permission.READ_SETTINGS" />
131+
android:writePermission="${applicationId}.permission.WRITE_SETTINGS"
132+
android:readPermission="${applicationId}.permission.READ_SETTINGS" />
132133

133134
<!--
134135
The content provider for exposing various launcher grid options.
135136
TODO: Add proper permissions
136137
-->
137138
<provider
138139
android:name="com.android.launcher3.graphics.GridCustomizationsProvider"
139-
android:authorities="${packageName}.grid_control"
140+
android:authorities="${applicationId}.grid_control"
140141
android:exported="true" />
141142

142143
<!--
@@ -156,7 +157,7 @@
156157

157158
<provider
158159
android:name="com.android.launcher3.testing.TestInformationProvider"
159-
android:authorities="${packageName}.TestInfo"
160+
android:authorities="${applicationId}.TestInfo"
160161
android:readPermission="android.permission.WRITE_SECURE_SETTINGS"
161162
android:writePermission="android.permission.WRITE_SECURE_SETTINGS"
162163
android:exported="true"
@@ -178,10 +179,14 @@
178179
</intent-filter>
179180
</activity>
180181

181-
<!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
182+
<!-- Disable eager initialization of Jetpack libraries. See bug 197780098. -->
182183
<provider
183184
android:name="androidx.startup.InitializationProvider"
184185
android:authorities="${applicationId}.androidx-startup"
185186
tools:node="remove" />
187+
188+
<property
189+
android:name="android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED"
190+
android:value="true" />
186191
</application>
187192
</manifest>

‎AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<manifest
2121
xmlns:android="http://schemas.android.com/apk/res/android"
2222
package="com.android.launcher3">
23-
<uses-sdk android:targetSdkVersion="33" android:minSdkVersion="26"/>
23+
<uses-sdk android:targetSdkVersion="33" android:minSdkVersion="30"/>
2424
<!--
2525
Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
2626
Refer comments around specific entries on how to extend individual components.

‎Launcher3-refs_heads_android15-s1-release.iml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
7+
<sourceFolder url="file://$MODULE_DIR$/src_build_config" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src_no_quickstep" isTestSource="false" />
9+
<sourceFolder url="file://$MODULE_DIR$/src_plugins" isTestSource="false" />
10+
</content>
11+
<orderEntry type="inheritedJdk" />
12+
<orderEntry type="sourceFolder" forTests="false" />
13+
<orderEntry type="module" module-name="quickstep" />
14+
<orderEntry type="module" module-name="multivalentTestsForDevice1" />
15+
<orderEntry type="module" module-name="go" />
16+
<orderEntry type="module" module-name="multivalentTests" />
17+
<orderEntry type="module" module-name="tests" />
18+
<orderEntry type="module" module-name="quickstep" />
19+
<orderEntry type="module" module-name="multivalentTestsForDevice1" />
20+
<orderEntry type="module" module-name="go" />
21+
<orderEntry type="module" module-name="tests" />
22+
<orderEntry type="module" module-name="multivalentTests" />
23+
<orderEntry type="module" module-name="quickstep" />
24+
<orderEntry type="module" module-name="go" />
25+
<orderEntry type="module" module-name="multivalentTests" />
26+
<orderEntry type="module" module-name="multivalentTestsForDevice1" />
27+
<orderEntry type="module" module-name="tests" />
28+
</component>
29+
</module>

‎OWNERS

+39-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,51 @@
55
#
66

77
adamcohen@google.com
8-
captaincole@google.com
98
hyunyoungs@google.com
10-
sunnygoyal@google.com
119
twickham@google.com
1210
vadimt@google.com
1311
winsonc@google.com
1412
jonmiranda@google.com
13+
awickham@google.com
14+
agvard@google.com
15+
16+
# Launcher workspace eng team
17+
captaincole@google.com
18+
sunnygoyal@google.com
19+
charlander@google.com
20+
fbaron@google.com
21+
fengjial@google.com
22+
fransebas@google.com
23+
pinyaoting@google.com
24+
andonian@google.com
25+
sihua@google.com
26+
27+
# Multitasking eng team
28+
tracyzhou@google.com
29+
peanutbutter@google.com
30+
jeremysim@google.com
31+
atsjenk@google.com
32+
brianji@google.com
33+
34+
# Overview eng team
1535
alexchau@google.com
36+
samcackett@google.com
37+
silvajordan@google.com
38+
uwaisashraf@google.com
39+
40+
# Physical Keyboard & Trackpad eng team
41+
patmanning@google.com
42+
helencheuk@google.com
43+
44+
# Widget Picker team
45+
shamalip@google.com
46+
zakcohen@google.com
1647

1748
per-file FeatureFlags.java, globs = set noparent
1849
per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.com
50+
51+
per-file DeviceConfigWrapper.java, globs = set noparent
52+
per-file DeviceConfigWrapper.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com
53+
54+
# Predictive Back
55+
per-file LauncherBackAnimationController.java = shanh@google.com, gallmann@google.com

‎PREUPLOAD.cfg

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1+
[Builtin Hooks]
2+
ktfmt = true
3+
4+
[Builtin Hooks Options]
5+
ktfmt = --kotlinlang-style
6+
7+
[Tool Paths]
8+
ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh
9+
110
[Hook Scripts]
211
checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --config_xml tools/checkstyle.xml --sha ${PREUPLOAD_COMMIT}
312

4-
ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check ${PREUPLOAD_FILES}
13+
flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PATH}

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
* Launcher3-12（可以编译Quickstep版本）
1919
* Launcher3-13-Qc（高通版本，可以编译Quickstep版本）
2020
* Launcher3-13 (Launcher3-13.0.0_r83(7e9e70085176ea46bf773019a5054942d2fc3811))--Android-13
21-
* master (Launcher3-android14-s2-release)--Android-14
21+
* Launcher3-14-s2-release (android14-s2-release)
22+
* main (android15-s1-release)--Android-15
2223

2324
## 源码参考
2425
https://cs.android.com/android/platform/superproject/+/master:packages/apps/Launcher3/

‎aconfig/Android.bp

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Copyright (C) 2023 The Android Open Source Project
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
package {
16+
// See: http://go/android-license-faq
17+
default_applicable_licenses: ["Android-Apache-2.0"],
18+
}
19+
20+
aconfig_declarations {
21+
name: "com_android_launcher3_flags",
22+
package: "com.android.launcher3",
23+
container: "system_ext",
24+
srcs: ["**/*.aconfig"],
25+
}
26+
27+
java_aconfig_library {
28+
name: "com_android_launcher3_flags_lib",
29+
aconfig_declarations: "com_android_launcher3_flags",
30+
}

0 commit comments

Comments
 (0)