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

Commit ecfb5ef3 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Adding Launcher3QuickstepGo target am: c551927c 

Change-Id: If124bc414c80dd07621d7714e9f2f7a26385ac51
parents cae48a2a c551927c

Android.mk

+50 −0
Original line number Diff line number Diff line
@@ -173,7 +173,57 @@ LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.* 


include $(BUILD_PACKAGE)



#

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

#

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-recyclerview \

    android-support-dynamic-animation \

    libSharedSystemUI



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-proto-files-under, protos) \

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



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/go/res \

    $(LOCAL_PATH)/res \

    prebuilts/sdk/current/support/v7/recyclerview/res \



LOCAL_PROGUARD_ENABLED := disabled



LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java



LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages android.support.v7.recyclerview \



LOCAL_SDK_VERSION := system_current

LOCAL_MIN_SDK_VERSION := 26

LOCAL_PACKAGE_NAME := Launcher3QuickStepGo

LOCAL_PRIVILEGED_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 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)





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

quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java

+10 −6
Original line number Diff line number Diff line
@@ -227,13 +227,17 @@ public class ClipAnimationHelper { 
        dl.getDescendantRectRelativeToSelf(ttv, targetRect.rect);

        updateTargetRect(targetRect);



        // Transform the clip relative to the target rect.

        if (target == null) {

            // Transform the clip relative to the target rect. Only do this in the case where we

            // aren't applying the insets to the app windows (where the clip should be in target app

            // space)

            float scale = mTargetRect.width() / mSourceRect.width();

            mSourceWindowClipInsets.left = mSourceWindowClipInsets.left * scale;

            mSourceWindowClipInsets.top = mSourceWindowClipInsets.top * scale;

            mSourceWindowClipInsets.right = mSourceWindowClipInsets.right * scale;

            mSourceWindowClipInsets.bottom = mSourceWindowClipInsets.bottom * scale;

        }

    }



    private void updateStackBoundsToMultiWindowTaskSize(BaseDraggingActivity activity) {

        ISystemUiProxy sysUiProxy = RecentsModel.getInstance(activity).getSystemUiProxy();