Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bac85d03 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12L

Bug: 222710654
Merged-In: Icf0cc432ab3a97614b27efcf6fc9d18ea423a743
Change-Id: I478c152d8d5bc197a29253e7cfc8e6016e949a77
parents 55ce0a91 11a04548
Loading
Loading
Loading
Loading
+53 −2
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ min_launcher3_sdk_version = "26"

android_library {
    name: "launcher-aosp-tapl",
    libs: [
        "framework-statsd",
    ],
    static_libs: [
        "androidx.annotation_annotation",
        "androidx.test.runner",
@@ -137,9 +140,13 @@ android_app {
    ],
    srcs: [
        "src/**/*.java",
        "src/**/*.kt",
        "src_shortcuts_overrides/**/*.java",
        "src_shortcuts_overrides/**/*.kt",
        "src_ui_overrides/**/*.java",
        "src_ui_overrides/**/*.kt",
        "ext_tests/src/**/*.java",
        "ext_tests/src/**/*.kt",
    ],
    resource_dirs: [
        "ext_tests/res",
@@ -180,8 +187,12 @@ android_library {
    resource_dirs: [
        "quickstep/res",
    ],
    libs: [
        "framework-statsd",
    ],
    static_libs: [
        "Launcher3ResLib",
        "lottie",
        "SystemUISharedLib",
        "SystemUI-statsd",
    ],
@@ -193,7 +204,10 @@ android_library {
// Source code used for test helpers
filegroup {
    name: "launcher-src-ext-tests",
    srcs: ["ext_tests/src/**/*.java"],
    srcs: [
        "ext_tests/src/**/*.java",
        "ext_tests/src/**/*.kt",
    ],
}

// Common source files used to build launcher
@@ -201,8 +215,11 @@ filegroup {
    name: "launcher-src-no-build-config",
    srcs: [
        "src/**/*.java",
        "src/**/*.kt",
        "src_shortcuts_overrides/**/*.java",
        "src_shortcuts_overrides/**/*.kt",
        "quickstep/src/**/*.java",
        "quickstep/src/**/*.kt",
    ],
}

@@ -212,20 +229,27 @@ filegroup {
    srcs: ["proguard.flags"],
}


// Library with all the dependencies for building Launcher Go
android_library {
    name: "LauncherGoResLib",
    srcs: [
        "src/**/*.java",
        "src/**/*.kt",
        "quickstep/src/**/*.java",
        "quickstep/src/**/*.kt",
        "go/src/**/*.java",
        "go/src/**/*.kt",
        "go/quickstep/src/**/*.java",
        "go/quickstep/src/**/*.kt",
    ],
    resource_dirs: [
        "go/res",
        "go/quickstep/res",
    ],
    // Note the ordering here is important when it comes to resource
    // overriding. We want the most specific resource overrides defined
    // in QuickstepResLib to take precendece, so it should be the final
    // dependency. See b/205278434 for how this can go wrong.
    static_libs: [
        "Launcher3CommonDepsLib",
        "QuickstepResLib",
@@ -241,3 +265,30 @@ android_library {
    },
}

// Build rule for Quickstep library
android_library {
    name: "Launcher3QuickStepLib",
    srcs: [
        ":launcher-src-no-build-config",
    ],
    resource_dirs: [],
    libs: [
        "framework-statsd",
    ],
    // Note the ordering here is important when it comes to resource
    // overriding. We want the most specific resource overrides defined
    // in QuickstepResLib to take precendece, so it should be the final
    // dependency. See b/208647810 for how this can go wrong.
    static_libs: [
        "SystemUI-statsd",
        "SystemUISharedLib",
        "Launcher3CommonDepsLib",
        "QuickstepResLib",
    ],
    manifest: "quickstep/AndroidManifest.xml",
    platform_apis: true,
    min_sdk_version: "current",
    lint: {
        baseline_filename: "lint-baseline-launcher3.xml",
    },
}
+1 −38
Original line number Diff line number Diff line
@@ -53,43 +53,6 @@ LOCAL_LICENSE_PACKAGE_NAME := Android Launcher3
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
include $(BUILD_PACKAGE)

#
# Build rule for Quickstep library.
#
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_AAPT2_ONLY := true
LOCAL_MODULE_TAGS := optional

LOCAL_STATIC_JAVA_LIBRARIES := \
    SystemUI-statsd \
    SystemUISharedLib
ifneq (,$(wildcard frameworks/base))
  LOCAL_PRIVATE_PLATFORM_APIS := true
else
  LOCAL_SDK_VERSION := system_current
  LOCAL_MIN_SDK_VERSION := 26
endif
LOCAL_MODULE := Launcher3QuickStepLib
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_LICENSE_PACKAGE_NAME := Android Launcher3
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_PRIVILEGED_MODULE := true
LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib

LOCAL_SRC_FILES := \
    $(call all-java-files-under, src) \
    $(call all-java-files-under, quickstep/src) \
    $(call all-java-files-under, src_shortcuts_overrides)

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res
LOCAL_PROGUARD_ENABLED := disabled


LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
include $(BUILD_STATIC_JAVA_LIBRARY)

#
# Build rule for Quickstep app.
#
@@ -144,7 +107,7 @@ else
  LOCAL_SDK_VERSION := system_current
  LOCAL_MIN_SDK_VERSION := 26
endif
LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
LOCAL_STATIC_ANDROID_LIBRARIES := LauncherGoResLib

LOCAL_SRC_FILES := \
    $(call all-java-files-under, src) \
+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@
    with some minor changed based on the derivative app.
    -->

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.CALL_PHONE" />
    <uses-permission android:name="android.permission.SET_WALLPAPER" />
    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@
        android:fullBackupOnly="true"
        android:fullBackupContent="@xml/backupscheme"
        android:hardwareAccelerated="true"
        android:debuggable="true"
        android:icon="@drawable/ic_launcher_home"
        android:label="@string/derived_app_name"
        android:theme="@style/AppTheme"
@@ -49,7 +50,7 @@
            android:stateNotNeeded="true"
            android:windowSoftInputMode="adjustPan"
            android:screenOrientation="unspecified"
            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|density"
            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
            android:resizeableActivity="true"
            android:resumeWhilePausing="true"
            android:taskAffinity=""

buglist_with_title.txt

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line
144170434  twickham  P1        FIXED   Improve Overview ->  Home transition ----
149934536  twickham  P2        FIXED   Update gesture nav pullback logic ----
154951045  peanutbutter  P1        FIXED   Odd animation occuring at times when swiping to home ----
154964045  awickham  P2        FIXED   "Clear all" text is not in the middle of app's window vertically ----
158701272  twickham  P4        FIXED   Discontinuities when long-swiping to home ----
160361464  tracyzhou  P2        FIXED   Place launcher above the target app in live tile mode ----
160568387  twickham  P2        FIXED   Can't get to app switcher by swiping up (motion pause not detected) ----
160718310  xuqiu     P1        FIXED   With "Select" overview action selected, App icon is missing in other overview apps after orientation change ----
160748731  sunnygoyal  P2        ASSIGNED  Unify prediction model with Launcher model ----
160759508  twickham  P2        FIXED   Swipe up cannot back to home screen in overview. ----
161273376  xuqiu     P2        FIXED   [Overview Actions] Add logging and helpful messages ----
161536946  twickham  P2        FIXED   Haptics don't indicate snap-to in overview,  ----
161685099  winsonc   P2        FIXED   Screen still stay at the quick settings/notification when I swipe up with 3 finger to check the all apps. ----
161801331  hyunyoungs  P2        FIXED   Change AllAppsSearch plugin to support only data fetch ----
161901771  xuqiu     P1        FIXED   Overlapping layer of highlights with app layout getting darker when keep rotating the device from "Feedback" viewpoint in split screen ----
161939759  sunnygoyal  P2        FIXED   RD1A: Going to overview in landscape mode clips the screen content ----
162012217  perumaal  P2        ASSIGNED  Leaked Activity Caused by Gleams ----
162454040  bookatz   P2        ASSIGNED  Create multiuser test that checks that opening an app works properly ----
162480567  sfufa     P4        FIXED   Enable Item Decorations for search items ----
162564471  tracyzhou  P2        FIXED   [Live tile] Handle tapping overview actions in live tile mode ----
162623012  zakcohen  P1        ASSIGNED  Enable chips flag ----
162812884  winsonc   P2        ASSIGNED  [R]The color have not changed in some page after turning on the dark theme. ----
162861289  hyunyoungs  P2        FIXED   Add FocusIndicator support to DEVICE_SEARCH feature in S ----
162871508  sfufa     P2        ASSIGNED  Introduce support for Hero app section ----
Loading