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

Commit 96a7524c authored by Xin Li's avatar Xin Li
Browse files

Merge Android 13 QPR1 

Bug: 261731544
Merged-In: I61ad93cf5e8d8e25cf856c807027769f209c371a
Change-Id: Iae118f5f502be298c25568ab08b9696eee22f61f
parents 780358bd 74197a86

Android.bp

+136 −3
Original line number Diff line number Diff line
@@ -35,9 +35,7 @@ android_library { 
    ],

    srcs: [

        "tests/tapl/**/*.java",

        "src/com/android/launcher3/ResourceUtils.java",

        "src/com/android/launcher3/testing/TestProtocol.java",

        "src/com/android/launcher3/testing/*Request.java",

        "src/com/android/launcher3/testing/shared/**/*.java",

    ],

    resource_dirs: [ ],

    manifest: "tests/tapl/AndroidManifest.xml",
@@ -313,3 +311,138 @@ android_library { 
        baseline_filename: "lint-baseline-launcher3.xml",

    },

}



// Build rule for Launcher3 Go app for Android Go devices.

android_app {

    name: "Launcher3Go",



    static_libs: ["Launcher3CommonDepsLib"],



    srcs: [

        "src/**/*.java",

        "src_ui_overrides/**/*.java",

        "go/src/**/*.java",

    ],



    resource_dirs: ["go/res"],



    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },



    sdk_version: "current",

    min_sdk_version: "current",

    target_sdk_version: "current",

    privileged: true,

    system_ext_specific: true,

    overrides: [

        "Home",

        "Launcher2",

        "Launcher3",

        "Launcher3QuickStep",

    ],

    required: ["privapp_whitelist_com.android.launcher3"],



    additional_manifests: [

        "AndroidManifest.xml",

        "AndroidManifest-common.xml",

    ],



    manifest: "go/AndroidManifest.xml",

    jacoco: {

        include_filter: ["com.android.launcher3.*"],

    }



}



// Build rule for Quickstep app.

android_app {

    name: "Launcher3QuickStep",



    static_libs: ["Launcher3QuickStepLib"],

    optimize: {

        enabled: false,

    },



    platform_apis: true,

    min_sdk_version: "current",

    target_sdk_version: "current",



    privileged: true,

    system_ext_specific: true,

    overrides: [

        "Home",

        "Launcher2",

        "Launcher3",

    ],

    required: ["privapp_whitelist_com.android.launcher3"],



    resource_dirs: ["quickstep/res"],



    additional_manifests: [

        "quickstep/AndroidManifest-launcher.xml",

        "AndroidManifest-common.xml",

    ],



    manifest: "quickstep/AndroidManifest.xml",

    jacoco: {

        include_filter: ["com.android.launcher3.*"],

    }



}



// Build rule for Launcher3 Go app with quickstep for Android Go devices.

android_app {

    name: "Launcher3QuickStepGo",



    static_libs: [

        "SystemUI-statsd",

        "SystemUISharedLib",

        "LauncherGoResLib",

    ],



    platform_apis: true,

    min_sdk_version: "current",

    target_sdk_version: "current",



    srcs: [

        "src/**/*.java",

        "quickstep/src/**/*.java",

        "go/src/**/*.java",

        "go/quickstep/src/**/*.java",

    ],



    resource_dirs: [

        "go/quickstep/res",

        "go/res",

        "quickstep/res",

    ],



    optimize: {

        proguard_flags_files: ["proguard.flags"],

        enabled: true,

    },



    privileged: true,

    system_ext_specific: true,

    overrides: [

        "Home",

        "Launcher2",

        "Launcher3",

        "Launcher3QuickStep",

    ],

    required: ["privapp_whitelist_com.android.launcher3"],



    additional_manifests: [

        "go/AndroidManifest.xml",

        "go/AndroidManifest-launcher.xml",

        "AndroidManifest-common.xml",

    ],



    manifest: "quickstep/AndroidManifest.xml",

    jacoco: {

        include_filter: ["com.android.launcher3.*"],

    }



}

Android.mk

deleted100644 → 0
+0 −147
Original line number Diff line number Diff line 
#

# Copyright (C) 2013 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.

#



LOCAL_PATH := $(call my-dir)



#

# Build rule for Launcher3 Go app for Android Go devices.

#

include $(CLEAR_VARS)

LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := optional

LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src) \

    $(call all-java-files-under, src_ui_overrides) \

    $(call all-java-files-under, go/src)



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/go/res



LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 26

LOCAL_PACKAGE_NAME := Launcher3Go

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3



LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest-common.xml



LOCAL_MANIFEST_FILE := go/AndroidManifest.xml

LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*

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

include $(BUILD_PACKAGE)



#

# Build rule for Quickstep app.

#

include $(CLEAR_VARS)

LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3QuickStepLib

LOCAL_PROGUARD_ENABLED := disabled



ifneq (,$(wildcard frameworks/base))

  LOCAL_PRIVATE_PLATFORM_APIS := true

else

  LOCAL_SDK_VERSION := system_current

  LOCAL_MIN_SDK_VERSION := 26

endif

LOCAL_PACKAGE_NAME := Launcher3QuickStep

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res



LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \

    $(LOCAL_PATH)/AndroidManifest-common.xml



LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml

LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*



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

include $(BUILD_PACKAGE)





#

# Build rule for Launcher3 Go app with quickstep for Android Go devices.

#

include $(CLEAR_VARS)

LOCAL_USE_AAPT2 := 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_STATIC_ANDROID_LIBRARIES := LauncherGoResLib



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src) \

    $(call all-java-files-under, quickstep/src) \

    $(call all-java-files-under, go/src) \

    $(call all-java-files-under, go/quickstep/src)



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/go/quickstep/res \

    $(LOCAL_PATH)/go/res \

    $(LOCAL_PATH)/quickstep/res



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_ENABLED := full



LOCAL_PACKAGE_NAME := Launcher3QuickStepGo

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3



LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/go/AndroidManifest.xml \

    $(LOCAL_PATH)/go/AndroidManifest-launcher.xml \

    $(LOCAL_PATH)/AndroidManifest-common.xml



LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml

LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*

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

include $(BUILD_PACKAGE)





# ==================================================

include $(call all-makefiles-under,$(LOCAL_PATH))

OWNERS

+0 −11
Original line number Diff line number Diff line
@@ -7,13 +7,6 @@ 
alexchau@google.com

andraskloczl@google.com

patmanning@google.com

petrcermak@google.com

pbdr@google.com

kideckel@google.com

stevenckng@google.com

ydixit@google.com

boadway@google.com

alinazaidi@google.com

adamcohen@google.com

hyunyoungs@google.com

mrcasey@google.com
@@ -24,10 +17,8 @@ winsonc@google.com 
zakcohen@google.com

santie@google.com

vadimt@google.com

mett@google.com

jonmiranda@google.com

pinyaoting@google.com

sfufa@google.com

gwasserman@google.com

jamesoleary@google.com

joshtrask@google.com
@@ -37,8 +28,6 @@ hwwang@google.com 
tracyzhou@google.com

peanutbutter@google.com

xuqiu@google.com

sreyasr@google.com

thiruram@google.com

brianji@google.com



per-file FeatureFlags.java, globs = set noparent

ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.launcher3.BubbleTextView; 
import com.android.launcher3.LauncherAppState;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.ShortcutAndWidgetContainer;

import com.android.launcher3.testing.shared.TestProtocol;



import java.util.ArrayList;

import java.util.Collection;

go/src/com/android/launcher3/model/WidgetsModel.java

+3 −1
Original line number Diff line number Diff line
@@ -41,8 +41,10 @@ import java.util.Set; 
 */

public class WidgetsModel {



    // True is the widget support is disabled.

    // True if the widget support is disabled.

    public static final boolean GO_DISABLE_WIDGETS = true;

    // True if the shortcut support is disabled.

    public static final boolean GO_DISABLE_SHORTCUTS = true;

    public static final boolean GO_DISABLE_NOTIFICATION_DOTS = true;



    private static final ArrayList<WidgetsListBaseEntry> EMPTY_WIDGET_LIST = new ArrayList<>();