update to Launcher3-android14-s2-release

Author: yuchuangu85

Android.bp

@@ -79,7 +79,7 @@ android_library {
         "androidx.test.uiautomator_uiautomator",
         "androidx.preference_preference",
         "SystemUISharedLib",
-        "SystemUIAnimationLib",
+        "animationlib",
         "launcher-testing-shared",
     ],
     srcs: [
@@ -243,7 +243,7 @@ android_library {
         "lottie",
         "SystemUISharedLib",
         "SystemUI-statsd",
-        "SystemUIAnimationLib",
+        "animationlib",
     ],
     manifest: "quickstep/AndroidManifest.xml",
     min_sdk_version: "current",
@@ -305,7 +305,7 @@ android_library {
         "SystemUISharedLib",
         "Launcher3CommonDepsLib",
         "QuickstepResLib",
-        "SystemUIAnimationLib",
+        "animationlib",
     ],
     manifest: "quickstep/AndroidManifest.xml",
     platform_apis: true,

Android.mk

@@ -43,6 +43,7 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     <!-- for rotating surface by arbitrary degree -->
     <uses-permission android:name="android.permission.ROTATE_SURFACE_FLINGER" />
+    <uses-permission android:name="android.permission.WAKEUP_SURFACE_FLINGER" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <!--

AndroidManifest-common.xml

@@ -5,36 +5,14 @@
 #
 
 adamcohen@google.com
-alexchau@google.com
-andonian@google.com
-awickham@google.com
-brdayauon@google.com
-brianji@google.com
 captaincole@google.com
-charlander@google.com
-fbaron@google.com
-ganjam@google.com
-hwwang@google.com
 hyunyoungs@google.com
-jagrutdesai@google.com
-jeremysim@google.com
-jiuyu@google.com
-jonmiranda@google.com
-kylim@google.com
-patmanning@google.com
-peanutbutter@google.com
-pinyaoting@google.com
-randypfohl@google.com
-saumyaprakash@google.com
-sihua@google.com
 sunnygoyal@google.com
-tracyzhou@google.com
-tsuharesu@google.com
 twickham@google.com
 vadimt@google.com
-victortulias@google.com
 winsonc@google.com
-xuqiu@google.com
+jonmiranda@google.com
+alexchau@google.com
 
 per-file FeatureFlags.java, globs = set noparent
 per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.com

OWNERS

@@ -17,7 +17,8 @@
 * Launcher3-11
 * Launcher3-12（可以编译Quickstep版本）
 * Launcher3-13-Qc（高通版本，可以编译Quickstep版本）
-* master (Launcher3-13.0.0_r83(7e9e70085176ea46bf773019a5054942d2fc3811))--Android-13
+* Launcher3-13 (Launcher3-13.0.0_r83(7e9e70085176ea46bf773019a5054942d2fc3811))--Android-13
+* master (Launcher3-android14-s2-release)--Android-14
 
 ## 源码参考
 https://cs.android.com/android/platform/superproject/+/master:packages/apps/Launcher3/

README.md

@@ -14,24 +14,28 @@ buildscript {
     }
 }
 
-final String ANDROID_TOP = "${rootDir}/"
-final String FRAMEWORK_PREBUILTS_DIR = "${ANDROID_TOP}/prebuilts/framework_intermediates/"
+final String ANDROID_TOP = "${rootDir}/../../.."
+final String FRAMEWORK_PREBUILTS_DIR = "${ANDROID_TOP}/prebuilts/libs/"
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.protobuf'
-apply plugin: 'kotlin-android'
-
-def protocVersion = '3.8.0'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
     compileSdkVersion COMPILE_SDK
 
+    namespace = 'com.android.launcher3'
+
     defaultConfig {
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
+        buildConfigField "boolean", "IS_STUDIO_BUILD", "false"
+        buildConfigField "boolean", "QSB_ON_FIRST_SCREEN", "true"
+        buildConfigField "boolean", "IS_DEBUG_DEVICE", "false"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -40,13 +44,10 @@ android {
             minifyEnabled false
         }
     }
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     // The flavor dimensions for build variants (e.g. aospWithQuickstep, aospWithoutQuickstep)
@@ -56,7 +57,7 @@ android {
     productFlavors {
         aosp {
             dimension "app"
-            applicationId 'com.android.ttlauncher3'
+            applicationId 'com.android.launcher3'
             testApplicationId 'com.android.launcher3.tests'
         }
 
@@ -140,63 +141,59 @@ android {
             manifest.srcFile "quickstep/AndroidManifest.xml"
         }
     }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 }
 
 allprojects {
     repositories {
-        //maven { url "../../../prebuilts/sdk/current/androidx/m2repository" }
-        //maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }
-        //maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }
+//        maven { url "../../../prebuilts/sdk/current/androidx/m2repository" }
+//        maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }
+//        maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }
         mavenCentral()
         google()
-        mavenLocal()
-        gradlePluginPortal()
         maven { url 'https://maven.aliyun.com/repository/jcenter' }
         maven { url 'https://maven.aliyun.com/repository/google' }
         maven { url 'https://maven.aliyun.com/repository/central' }
         maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
     }
-//    gradle.projectsEvaluated {
-//        tasks.withType(JavaCompile) {
-//            options.compilerArgs.add("-Xbootclasspath/p:${FRAMEWORK_PREBUILTS_DIR}/libs/framework.jar")
-//        }
-//    }
 }
 
 dependencies {
-    implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
-    implementation "androidx.recyclerview:recyclerview:1.3.1"
-    implementation "androidx.preference:preference:1.2.1"
+    implementation "androidx.dynamicanimation:dynamicanimation:${ANDROID_X_VERSION}"
+    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
+    implementation "androidx.preference:preference:${ANDROID_X_VERSION}"
     implementation project(':IconLoader')
+    implementation project(':systemUIPluginCore')
 //    implementation project(':UiTestsLibLauncher')
-    //withQuickstepImplementation project(':SharedLibWrapper')
-    implementation "androidx.slice:slice-builders:1.0.0"
-    implementation "com.google.protobuf:protobuf-javalite:3.8.0"
+//    withQuickstepImplementation project(':SharedLibWrapper')
+    implementation 'com.google.protobuf:protobuf-javalite:3.8.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
+
     // Recents lib dependency
-    withQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'sysui_shared.jar')
+    withQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}", include: 'sysui_shared.jar')
 
     // Required for AOSP to compile. This is already included in the sysui_shared.jar
-    withoutQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'plugin_core.jar')
-//    compileOnly files("${FRAMEWORK_PREBUILTS_DIR}/libs/framework.jar")
-
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation "com.google.android.material:material:1.5.0"
-
-    //testImplementation 'junit:junit:4.12'
-    //androidTestImplementation "org.mockito:mockito-core:1.9.5"
-    //androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
-    //androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
-    //androidTestImplementation 'com.android.support.test:runner:1.0.0'
-    //androidTestImplementation 'com.android.support.test:rules:1.0.0'
-    //androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    //androidTestImplementation "androidx.annotation:annotation:${ANDROID_X_VERSION}"
-    //implementation 'com.google.dagger:dagger:2.11-rc2'
-    //annotationProcessor 'com.google.dagger:dagger-compiler:2.11-rc2'
-    //implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    api 'com.airbnb.android:lottie:5.2.0'
+    withoutQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}", include: 'plugin_core.jar')
+
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation "org.mockito:mockito-core:1.9.5"
+    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
+    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+    androidTestImplementation 'com.android.support.test:runner:1.0.0'
+    androidTestImplementation 'com.android.support.test:rules:1.0.0'
+    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    androidTestImplementation "androidx.annotation:annotation:${ANDROID_X_VERSION}"
+
+    api 'com.airbnb.android:lottie:3.3.0'
+
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.slice:slice-builders:1.0.0'
 }
 
+def protocVersion = '3.8.0'
+
 protobuf {
     // Configure the protoc executable
     protoc {