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

Commit 1748c4ad authored by Jon's avatar Jon
Browse files

Merge branch 'ub-launcher3-edmonton-polish' into pi-dev 

Bug: 110425849
Bug: 80134723
Test: manual
Change-Id: I0cf89a4ee08ff2a36e5a586f7e0c04ae970bf13c
parents bf290232 b635be59

Android.mk

+62 −89
Original line number Original line Diff line number Diff line
@@ -29,41 +29,52 @@ LOCAL_SDK_VERSION := current 
include $(BUILD_PREBUILT)

include $(BUILD_PREBUILT)





#

#

# Build rule for Launcher3 app.

# Build rule for Launcher3 dependencies lib.

#

#

include $(CLEAR_VARS)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true

LOCAL_AAPT2_ONLY := true

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional





LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-annotations



LOCAL_STATIC_ANDROID_LIBRARIES := \

LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-compat \

    android-support-v4 \

    android-support-media-compat \

    android-support-core-utils \

    android-support-core-ui \

    android-support-fragment \

    android-support-v7-recyclerview \

    android-support-v7-recyclerview \

    android-support-dynamic-animation

    android-support-dynamic-animation





LOCAL_SRC_FILES := \

LOCAL_SRC_FILES := \

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

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

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

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

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

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

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







LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res





LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_ENABLED := disabled





LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTOC_OPTIMIZE_TYPE := nano

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

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

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java





LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_MODULE := Launcher3CommonDepsLib

LOCAL_PRIVILEGED_MODULE := true

LOCAL_MANIFEST_FILE := AndroidManifest-common.xml



include $(BUILD_STATIC_JAVA_LIBRARY)



#

# Build rule for Launcher3 app.

#

include $(CLEAR_VARS)

LOCAL_USE_AAPT2 := true

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



LOCAL_PROGUARD_FLAG_FILES := proguard.flags





LOCAL_SDK_VERSION := current

LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_MIN_SDK_VERSION := 21
@@ -81,94 +92,69 @@ include $(BUILD_PACKAGE) 
# Build rule for Launcher3 Go app for Android Go devices.

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

#

#

include $(CLEAR_VARS)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib

LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-annotations



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-compat \

    android-support-media-compat \

    android-support-core-utils \

    android-support-core-ui \

    android-support-fragment \

    android-support-v7-recyclerview \

    android-support-dynamic-animation





LOCAL_SRC_FILES := \

LOCAL_SRC_FILES := \

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

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

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

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

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

    $(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_RESOURCE_DIR := $(LOCAL_PATH)/go/res

    $(LOCAL_PATH)/go/res \

    $(LOCAL_PATH)/res \





LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_FLAG_FILES := proguard.flags





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_USE_AAPT2 := true



LOCAL_SDK_VERSION := current

LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_MIN_SDK_VERSION := 21

LOCAL_PACKAGE_NAME := Launcher3Go

LOCAL_PACKAGE_NAME := Launcher3Go

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRIVILEGED_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep





LOCAL_FULL_LIBS_MANIFEST_FILES := \

LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest-common.xml

    $(LOCAL_PATH)/AndroidManifest-common.xml





LOCAL_MANIFEST_FILE := go/AndroidManifest.xml

LOCAL_MANIFEST_FILE := go/AndroidManifest.xml



LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*

LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*



include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





#

#

# Build rule for Quickstep app.

# Build rule for Quickstep library.

#

#

include $(CLEAR_VARS)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true

LOCAL_AAPT2_ONLY := true

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional





LOCAL_STATIC_JAVA_LIBRARIES := \

LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI

    android-support-annotations \

LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib

    libSharedSystemUI



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-compat \

    android-support-media-compat \

    android-support-core-utils \

    android-support-core-ui \

    android-support-fragment \

    android-support-v7-recyclerview \

    android-support-dynamic-animation





LOCAL_SRC_FILES := \

LOCAL_SRC_FILES := \

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

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

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

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

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

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

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

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



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/res \





LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res

LOCAL_PROGUARD_ENABLED := disabled

LOCAL_PROGUARD_ENABLED := disabled





LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_SDK_VERSION := system_current

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

LOCAL_MIN_SDK_VERSION := 26

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java

LOCAL_MODULE := Launcher3QuickStepLib

LOCAL_PRIVILEGED_MODULE := true





LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml

include $(BUILD_STATIC_JAVA_LIBRARY)



#

# Build rule for Quickstep app.

#

include $(CLEAR_VARS)

LOCAL_USE_AAPT2 := true

LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3QuickStepLib

LOCAL_PROGUARD_ENABLED := disabled





LOCAL_SDK_VERSION := system_current

LOCAL_SDK_VERSION := system_current

LOCAL_MIN_SDK_VERSION := 26

LOCAL_MIN_SDK_VERSION := 26
@@ -176,6 +162,8 @@ LOCAL_PACKAGE_NAME := Launcher3QuickStep 
LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRIVILEGED_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3





LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res



LOCAL_FULL_LIBS_MANIFEST_FILES := \

LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest-common.xml

    $(LOCAL_PATH)/AndroidManifest-common.xml
@@ -185,47 +173,33 @@ LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.* 




include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)







#

#

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

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

#

#

include $(CLEAR_VARS)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional





LOCAL_STATIC_JAVA_LIBRARIES := \

LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI

    android-support-v4 \

LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib

    android-support-v7-recyclerview \

    android-support-dynamic-animation \

    libSharedSystemUI





LOCAL_SRC_FILES := \

LOCAL_SRC_FILES := \

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

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

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

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

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

    $(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_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/go/res \

    $(LOCAL_PATH)/go/res

    $(LOCAL_PATH)/res \

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





LOCAL_PROGUARD_ENABLED := disabled

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_SDK_VERSION := system_current

LOCAL_MIN_SDK_VERSION := 26

LOCAL_MIN_SDK_VERSION := 26

LOCAL_PACKAGE_NAME := Launcher3QuickStepGo

LOCAL_PACKAGE_NAME := Launcher3QuickStepGo

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRIVILEGED_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep





LOCAL_FULL_LIBS_MANIFEST_FILES := \

LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/go/AndroidManifest.xml \

    $(LOCAL_PATH)/go/AndroidManifest.xml \
@@ -234,7 +208,6 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \ 




LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml

LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml

LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*

LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*



include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)

AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ 
        android:hardwareAccelerated="true"

        android:hardwareAccelerated="true"

        android:icon="@drawable/ic_launcher_home"

        android:icon="@drawable/ic_launcher_home"

        android:label="@string/derived_app_name"

        android:label="@string/derived_app_name"

        android:theme="@style/LauncherTheme"

        android:theme="@style/AppTheme"

        android:largeHeap="@bool/config_largeHeap"

        android:largeHeap="@bool/config_largeHeap"

        android:restoreAnyVersion="true"

        android:restoreAnyVersion="true"

        android:supportsRtl="true" >

        android:supportsRtl="true" >

go/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:hardwareAccelerated="true"

        android:hardwareAccelerated="true"

        android:icon="@drawable/ic_launcher_home"

        android:icon="@drawable/ic_launcher_home"

        android:label="@string/derived_app_name"

        android:label="@string/derived_app_name"

        android:theme="@style/LauncherTheme"

        android:theme="@style/AppTheme"

        android:largeHeap="@bool/config_largeHeap"

        android:largeHeap="@bool/config_largeHeap"

        android:restoreAnyVersion="true"

        android:restoreAnyVersion="true"

        android:supportsRtl="true" >

        android:supportsRtl="true" >

quickstep/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:hardwareAccelerated="true"

        android:hardwareAccelerated="true"

        android:icon="@drawable/ic_launcher_home"

        android:icon="@drawable/ic_launcher_home"

        android:label="@string/derived_app_name"

        android:label="@string/derived_app_name"

        android:theme="@style/LauncherTheme"

        android:theme="@style/AppTheme"

        android:largeHeap="@bool/config_largeHeap"

        android:largeHeap="@bool/config_largeHeap"

        android:restoreAnyVersion="true"

        android:restoreAnyVersion="true"

        android:supportsRtl="true" >

        android:supportsRtl="true" >

quickstep/libs/sysui_shared.jar

+3.96 KiB (130 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file