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

Commit 636e5842 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge Android 10 into master"

parents 032d5f74 ecb37ee8

.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ local.properties 
gradle/

build/

gradlew*

.DS_Store

Android.bp

0 → 100644
+32 −0
Original line number Diff line number Diff line 
// Copyright (C) 2018 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.



android_library {

    name: "launcher-aosp-tapl",

    static_libs: [

        "androidx.annotation_annotation",

        "androidx.test.runner",

        "androidx.test.rules",

        "androidx.test.uiautomator_uiautomator",

        "SystemUISharedLib",

    ],

    srcs: [

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

        "src/com/android/launcher3/util/SecureSettingsObserver.java",

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

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

    ],

    manifest: "tests/tapl/AndroidManifest.xml",

    platform_apis: true,

}

Android.mk

+124 −29
Original line number Diff line number Diff line
@@ -17,16 +17,27 @@ 
LOCAL_PATH := $(call my-dir)



#

# Prebuilt Java Libraries

# Build rule for plugin lib (needed to write a plugin).

#

include $(CLEAR_VARS)

LOCAL_MODULE := libSharedSystemUI

LOCAL_USE_AAPT2 := true

LOCAL_AAPT2_ONLY := true

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_SRC_FILES := quickstep/libs/sysui_shared.jar

LOCAL_UNINSTALLABLE_MODULE := true



ifneq (,$(wildcard frameworks/base))

    LOCAL_STATIC_JAVA_LIBRARIES:= PluginCoreLib

else

    LOCAL_STATIC_JAVA_LIBRARIES:= libPluginCore

endif



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src_plugins)



LOCAL_SDK_VERSION := current

include $(BUILD_PREBUILT)

LOCAL_MIN_SDK_VERSION := 28

LOCAL_MODULE := LauncherPluginLib



include $(BUILD_STATIC_JAVA_LIBRARY)



#

# Build rule for Launcher3 dependencies lib.
@@ -37,13 +48,17 @@ LOCAL_AAPT2_ONLY := true 
LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-v4 \

    android-support-v7-recyclerview \

    android-support-dynamic-animation

    androidx.recyclerview_recyclerview \

    androidx.dynamicanimation_dynamicanimation \

    androidx.preference_preference \

    iconloader_base



LOCAL_STATIC_JAVA_LIBRARIES := LauncherPluginLib



LOCAL_SRC_FILES := \

    $(call all-proto-files-under, protos) \

    $(call all-proto-files-under, proto_overrides)

    $(call all-proto-files-under, proto_overrides) \

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



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
@@ -68,18 +83,24 @@ include $(CLEAR_VARS) 
LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib

LOCAL_STATIC_ANDROID_LIBRARIES := \

    Launcher3CommonDepsLib \

    SecondaryDisplayLauncherLib

LOCAL_SRC_FILES := \

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

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

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

    $(call all-java-files-under, src_flags)



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

# Proguard is disable for testing. Derivarive prjects to keep proguard enabled

LOCAL_PROGUARD_ENABLED := disabled



LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_PACKAGE_NAME := Launcher3

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRODUCT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
@@ -100,7 +121,7 @@ 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_flags)

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



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/go/res
@@ -110,6 +131,7 @@ LOCAL_SDK_VERSION := current 
LOCAL_MIN_SDK_VERSION := 21

LOCAL_PACKAGE_NAME := Launcher3Go

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRODUCT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
@@ -129,21 +151,32 @@ LOCAL_USE_AAPT2 := true 
LOCAL_AAPT2_ONLY := true

LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI

LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib

ifneq (,$(wildcard frameworks/base))

  LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano

  LOCAL_PRIVATE_PLATFORM_APIS := true

else

  LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos

  LOCAL_SDK_VERSION := system_current

  LOCAL_MIN_SDK_VERSION := 26

endif

LOCAL_MODULE := Launcher3QuickStepLib

LOCAL_PRIVILEGED_MODULE := true

LOCAL_STATIC_ANDROID_LIBRARIES := \

    Launcher3CommonDepsLib \

    SecondaryDisplayLauncherLib



LOCAL_SRC_FILES := \

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

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

    $(call all-java-files-under, src_flags)

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

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

    $(call all-java-files-under, src_shortcuts_overrides)



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res

LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/quickstep/recents_ui_overrides/res

LOCAL_PROGUARD_ENABLED := disabled



LOCAL_SDK_VERSION := system_current

LOCAL_MIN_SDK_VERSION := 26

LOCAL_MODULE := Launcher3QuickStepLib

LOCAL_PRIVILEGED_MODULE := true



LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml

include $(BUILD_STATIC_JAVA_LIBRARY)
@@ -158,15 +191,21 @@ 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_PRODUCT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res

LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/quickstep/recents_ui_overrides/res



LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/AndroidManifest.xml \
@@ -185,25 +224,81 @@ include $(CLEAR_VARS) 
LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI

ifneq (,$(wildcard frameworks/base))

  LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano

  LOCAL_PRIVATE_PLATFORM_APIS := true

else

  LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos

  LOCAL_SDK_VERSION := system_current

  LOCAL_MIN_SDK_VERSION := 26

endif

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, go/src_flags)

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

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



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/quickstep/recents_ui_overrides/res \

    $(LOCAL_PATH)/go/res



LOCAL_PROGUARD_ENABLED := disabled

LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_ENABLED := full



LOCAL_PACKAGE_NAME := Launcher3QuickStepGo

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRODUCT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep Launcher3GoIconRecents

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3



LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/go/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest-common.xml



LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml

LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*

include $(BUILD_PACKAGE)



#

# Build rule for Launcher3 Go app with quickstep and Go-specific

# version of recents for Android Go devices.

#

include $(CLEAR_VARS)

LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := optional



ifneq (,$(wildcard frameworks/base))

  LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano

  LOCAL_PRIVATE_PLATFORM_APIS := true

else

  LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos

  LOCAL_SDK_VERSION := system_current

  LOCAL_MIN_SDK_VERSION := 26

LOCAL_PACKAGE_NAME := Launcher3QuickStepGo

endif

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, go/src) \

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



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/go/res \

    $(LOCAL_PATH)/go/quickstep/res



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_ENABLED := full



LOCAL_PACKAGE_NAME := Launcher3GoIconRecents

LOCAL_PRIVILEGED_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep

LOCAL_PRODUCT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3Go Launcher3QuickStep

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3



LOCAL_FULL_LIBS_MANIFEST_FILES := \

AndroidManifest-common.xml

+68 −3
Original line number Diff line number Diff line
@@ -44,6 +44,28 @@ 
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />





    <!--

    Permissions required for read/write access to the workspace data. These permission name

    should not conflict with that defined in other apps, as such an app should embed its package

    name in the permissions. eq com.mypackage.permission.READ_SETTINGS

    -->

    <permission

        android:name="${packageName}.permission.READ_SETTINGS"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="signatureOrSystem"

        android:label="@string/permlab_read_settings"

        android:description="@string/permdesc_read_settings"/>

    <permission

        android:name="${packageName}.permission.WRITE_SETTINGS"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        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" />



    <application

        android:backupAgent="com.android.launcher3.LauncherBackupAgent"

        android:fullBackupOnly="true"
@@ -88,8 +110,8 @@ 


        <service

            android:name="com.android.launcher3.notification.NotificationListener"

            android:label="@string/icon_badging_service_title"

            android:enabled="@bool/notification_badging_enabled"

            android:label="@string/notification_dots_service_title"

            android:enabled="@bool/notification_dots_enabled"

            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">

            <intent-filter>

                <action android:name="android.service.notification.NotificationListenerService" />
@@ -100,7 +122,7 @@ 
                       android:value="true" />



        <activity android:name="com.android.launcher3.dragndrop.AddItemActivity"

            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"

            android:theme="@style/AppItemActivityTheme"

            android:excludeFromRecents="true"

            android:autoRemoveFromRecents="true"

            android:label="@string/action_add_to_workspace" >
@@ -118,5 +140,48 @@ 
            android:name="com.android.launcher3.launcher_dump_provider"

            android:value="com.android.launcher3.LauncherProvider" />



        <!--

        The settings provider contains Home's data, like the workspace favorites. The permissions

        should be changed to what is defined above. The authorities should also be changed to

        represent the package name.

        -->

        <provider

            android:name="com.android.launcher3.LauncherProvider"

            android:authorities="${packageName}.settings"

            android:exported="true"

            android:writePermission="${packageName}.permission.WRITE_SETTINGS"

            android:readPermission="${packageName}.permission.READ_SETTINGS" />



        <!--

        The content provider for exposing various launcher grid options.

        TODO: Add proper permissions

        -->

        <provider

            android:name="com.android.launcher3.graphics.GridOptionsProvider"

            android:authorities="${packageName}.grid_control"

            android:enabled="false"

            android:exported="true" />



        <!--

        The settings activity. To extend point settings_fragment_name to appropriate fragment class

        -->

        <activity

            android:name="com.android.launcher3.settings.SettingsActivity"

            android:label="@string/settings_button_text"

            android:theme="@android:style/Theme.DeviceDefault.Settings"

            android:autoRemoveFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <provider

            android:name="com.android.launcher3.testing.TestInformationProvider"

            android:authorities="${packageName}.TestInfo"

            android:readPermission="android.permission.WRITE_SECURE_SETTINGS"

            android:writePermission="android.permission.WRITE_SECURE_SETTINGS"

            android:exported="true"

            android:enabled="false" />

    </application>

</manifest>

AndroidManifest.xml

+4 −50
Original line number Diff line number Diff line
@@ -20,35 +20,12 @@ 
<manifest

    xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.launcher3">

    <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21"/>

    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>

    <!--

    Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.

    Refer comments around specific entries on how to extend individual components.

    -->



    <!--

    Permissions required for read/write access to the workspace data. These permission name

    should not conflict with that defined in other apps, as such an app should embed its package

    name in the permissions. eq com.mypackage.permission.READ_SETTINGS

    -->

    <permission

        android:name="com.android.launcher3.permission.READ_SETTINGS"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="signatureOrSystem"

        android:label="@string/permlab_read_settings"

        android:description="@string/permdesc_read_settings"/>

    <permission

        android:name="com.android.launcher3.permission.WRITE_SETTINGS"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="signatureOrSystem"

        android:label="@string/permlab_write_settings"

        android:description="@string/permdesc_write_settings"/>



    <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />

    <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />

    <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />

    <uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" />



    <application

        android:backupAgent="com.android.launcher3.LauncherBackupAgent"

        android:fullBackupOnly="true"
@@ -84,33 +61,10 @@ 
                <category android:name="android.intent.category.MONKEY"/>

                <category android:name="android.intent.category.LAUNCHER_APP" />

            </intent-filter>

            <meta-data

                android:name="com.android.launcher3.grid.control"

                android:value="${packageName}.grid_control" />

        </activity>



        <!--

        The settings activity. When extending keep the intent filter present

        -->

        <activity

            android:name="com.android.launcher3.SettingsActivity"

            android:label="@string/settings_button_text"

            android:theme="@android:style/Theme.DeviceDefault.Settings"

            android:autoRemoveFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <!--

        The settings provider contains Home's data, like the workspace favorites. The permissions

        should be changed to what is defined above. The authorities should also be changed to

        represent the package name.

        -->

        <provider

            android:name="com.android.launcher3.LauncherProvider"

            android:authorities="com.android.launcher3.settings"

            android:exported="true"

            android:writePermission="com.android.launcher3.permission.WRITE_SETTINGS"

            android:readPermission="com.android.launcher3.permission.READ_SETTINGS" />



    </application>

</manifest>