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

Commit 4595166b authored by Mehdi Alizadeh's avatar Mehdi Alizadeh
Browse files

Merging from ub-launcher3-master @ build 6767682 

Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_master_6767682.html

Change-Id: I5e9c73a7ac3033fe82006c4bd72824f56b8988f8
parents 23bb2d1a 532b962a

Android.mk

+5 −12
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PA 
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java



LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_MIN_SDK_VERSION := 26

LOCAL_MODULE := Launcher3CommonDepsLib

LOCAL_PRIVILEGED_MODULE := true

LOCAL_MANIFEST_FILE := AndroidManifest-common.xml
@@ -77,7 +77,7 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags 
LOCAL_PROGUARD_ENABLED := disabled



LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_MIN_SDK_VERSION := 26

LOCAL_PACKAGE_NAME := Launcher3

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true
@@ -108,7 +108,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/go/res 
LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_MIN_SDK_VERSION := 26

LOCAL_PACKAGE_NAME := Launcher3Go

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true
@@ -149,12 +149,9 @@ 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, quickstep/recents_ui_overrides/src) \

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



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/quickstep/recents_ui_overrides/res

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res

LOCAL_PROGUARD_ENABLED := disabled
@@ -183,9 +180,7 @@ 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_PATH)/quickstep/recents_ui_overrides/res

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res



LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \
@@ -220,12 +215,10 @@ 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, 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_FLAG_FILES := proguard.flags

AndroidManifest-common.xml

+0 −18
Original line number Diff line number Diff line
@@ -29,12 +29,6 @@ 
    at compile time. Note that the components defined in AndroidManifest.xml are also required,

    with some minor changed based on the derivative app.

    -->

    <permission

        android:name="com.android.launcher.permission.INSTALL_SHORTCUT"

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

        android:protectionLevel="dangerous"

        android:label="@string/permlab_install_shortcut"

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



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

    <uses-permission android:name="android.permission.SET_WALLPAPER" />
@@ -79,17 +73,6 @@ 
        android:restoreAnyVersion="true"

        android:supportsRtl="true" >



        <!-- Intent received used to install shortcuts from other applications -->

        <receiver

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

            android:permission="com.android.launcher.permission.INSTALL_SHORTCUT"

            android:exported="true"

            android:enabled="@bool/enable_install_shortcut_api" >

            <intent-filter>

                <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" />

            </intent-filter>

        </receiver>



        <!-- Intent received when a session is committed -->

        <receiver

            android:name="com.android.launcher3.SessionCommitReceiver"
@@ -116,7 +99,6 @@ 
        <service

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

            android:label="@string/notification_dots_service_title"

            android:enabled="@bool/notification_dots_enabled"

            android:exported="true"

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

            <intent-filter>

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<manifest

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

    package="com.android.launcher3">

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

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

    <!--

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

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

buglist.txt

0 → 100644
+38 −0
Original line number Diff line number Diff line 
160759508

144170434

144170434

161801331

162564471

160361464

161901771

160568387

162623012

162012217

160718310

160361464

160718310

162012217

160748731

154951045

162861289

149934536

149934536

144170434

144170434

162454040

161273376

149934536

149934536

158701272

162871508

149934536

161939759

154964045

161536946

149934536

161685099

162812884

162480567

162480567

149934536

149934536

buglist_unique.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
144170434

149934536

154951045

154964045

158701272

160361464

160568387

160718310

160748731

160759508

161273376

161536946

161685099

161801331

161901771

161939759

162012217

162454040

162480567

162564471

162623012

162812884

162861289

162871508