Launcher3 A15 Merge

AndroidManifest-common.xml

@@ -56,21 +56,22 @@
  name in the permissions. eq com.mypackage.permission.READ_SETTINGS
  -->
  <permission
- android:name="${packageName}.permission.READ_SETTINGS"
+ android:name="${applicationId}.permission.READ_SETTINGS"
  android:protectionLevel="signatureOrSystem"
  android:label="@string/permlab_read_settings"
  android:description="@string/permdesc_read_settings"/>
  <permission
- android:name="${packageName}.permission.WRITE_SETTINGS"
+ android:name="${applicationId}.permission.WRITE_SETTINGS"
  android:protectionLevel="signatureOrSystem"
  android:label="@string/permlab_write_settings"
  android:description="@string/permdesc_write_settings"/>
 
- <uses-permission android:name="${packageName}.permission.READ_SETTINGS" />
- <uses-permission android:name="${packageName}.permission.WRITE_SETTINGS" />
+ <uses-permission android:name="${applicationId}.permission.READ_SETTINGS" />
+ <uses-permission android:name="${applicationId}.permission.WRITE_SETTINGS" />
 
  <application
  android:backupAgent="com.android.launcher3.LauncherBackupAgent"
+ android:name="com.android.launcher3.LauncherApplication"
  android:fullBackupOnly="true"
  android:backupInForeground="true"
  android:fullBackupContent="@xml/backupscheme"
@@ -130,18 +131,18 @@
  -->
  <provider
  android:name="com.android.launcher3.LauncherProvider"
- android:authorities="${packageName}.settings"
+ android:authorities="${applicationId}.settings"
  android:exported="true"
- android:writePermission="${packageName}.permission.WRITE_SETTINGS"
- android:readPermission="${packageName}.permission.READ_SETTINGS" />
+ android:writePermission="${applicationId}.permission.WRITE_SETTINGS"
+ android:readPermission="${applicationId}.permission.READ_SETTINGS" />
 
  <!--
  The content provider for exposing various launcher grid options.
  TODO: Add proper permissions
  -->
  <provider
  android:name="com.android.launcher3.graphics.GridCustomizationsProvider"
- android:authorities="${packageName}.grid_control"
+ android:authorities="${applicationId}.grid_control"
  android:exported="true" />
 
  <!--
@@ -161,7 +162,7 @@
 
  <provider
  android:name="com.android.launcher3.testing.TestInformationProvider"
- android:authorities="${packageName}.TestInfo"
+ android:authorities="${applicationId}.TestInfo"
  android:readPermission="android.permission.WRITE_SECURE_SETTINGS"
  android:writePermission="android.permission.WRITE_SECURE_SETTINGS"
  android:exported="true"
@@ -183,10 +184,14 @@
  </intent-filter>
  </activity>
 
- <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
+ <!-- Disable eager initialization of Jetpack libraries. See bug 197780098. -->
  <provider
  android:name="androidx.startup.InitializationProvider"
  android:authorities="${applicationId}.androidx-startup"
  tools:node="remove" />
+
+ <property
+ android:name="android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED"
+ android:value="true" />
  </application>
 </manifest>

OWNERS

@@ -5,17 +5,51 @@
 #
 
 [email protected]
-[email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
+[email protected]
+[email protected]
+
+# Launcher workspace eng team
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+
+# Multitasking eng team
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+
+# Overview eng team
 [email protected]
+[email protected]
+[email protected]
+[email protected]
+
+# Physical Keyboard & Trackpad eng team
 [email protected]
-[email protected]
-[email protected]
+[email protected]
+
+# Widget Picker team
+[email protected]
+[email protected]
 
 per-file FeatureFlags.java, globs = set noparent
 per-file FeatureFlags.java = [email protected], [email protected], [email protected], [email protected], [email protected]
+
+per-file DeviceConfigWrapper.java, globs = set noparent
+per-file DeviceConfigWrapper.java = [email protected], [email protected], [email protected], [email protected]
+
+# Predictive Back
+per-file LauncherBackAnimationController.java = [email protected], [email protected]

PREUPLOAD.cfg

@@ -1,4 +1,13 @@
+[Builtin Hooks]
+ktfmt = true
+
+[Builtin Hooks Options]
+ktfmt = --kotlinlang-style
+
+[Tool Paths]
+ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh
+
 [Hook Scripts]
 checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --config_xml tools/checkstyle.xml --sha ${PREUPLOAD_COMMIT}
 
-ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check ${PREUPLOAD_FILES}
+flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PATH}

aconfig/Android.bp

@@ -0,0 +1,30 @@
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+aconfig_declarations {
+ name: "com_android_launcher3_flags",
+ package: "com.android.launcher3",
+ container: "system_ext",
+ srcs: ["**/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "com_android_launcher3_flags_lib",
+ aconfig_declarations: "com_android_launcher3_flags",
+}