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

Commit b3ef909b authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Merge branch 'ub-launcher3-master', build 5258802 

Test: Manual

Bug:111697218  [Quickstep 1.1] Integrate PiP / Live Tiles into Quickstep
Bug:111698021  [Quickstep 1.1] Improve motion within Quickstep
Bug:111699315  [Quickstep 2] Improve Quickscrub / switch gesture
Bug:111926330  [Quickstep 2] Nav bar, gestures, edge-to-edge, and OEM updates
Bug:112324288  Pixel launcher keeps on crashing when trying to remove a widget
Bug:114136250  Have a more spartan RecentsActivity on android go
Bug:117332845  testPendingWidget_autoRestored is failing on TAP
Bug:118206886  Add fallback launcher mechanism
Bug:118319143  1Digital Wellbeing - Implement showing app's remaining time in Launcher
Bug:119500058  Tests switch Launcher to a state without icons
Bug:120628042  Add race condition repro tests
Bug:122262084  Expose Launcher grid customization options
Bug:122262946  Each app installed from playstore occupies new workspace
Bug:122345781  Inflation happens and a binder call during swipe up gesture, that may cause jank
Bug:122347746  Jank in app closing animation for Maps on taimen
Bug:122472687  Recents icon shape should change when theme changed.
Bug:122545624  Iconloaderlib: make createIconBitmap in BaseIconFactory a public method
Bug:122612839  Flash of old snapshot when swiping up
Bug:122662526  Test broken: can't swipe back from AllApps to Overview
Bug:122809947  [C2][F2] Launcher keeps restarting after Setup wizard, it impacts testing seriously.
Bug:65162781  Status bar gradient sometimes slides up when unlocking
Change-Id: I22774df74963efb9189ea2a8bf3cdace6361c988
parents 6542ba6c f530c403

Android.mk

+57 −3
Original line number Diff line number Diff line
@@ -182,15 +182,20 @@ else 
endif

LOCAL_MODULE := Launcher3QuickStepLib

LOCAL_PRIVILEGED_MODULE := true

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

    $(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
@@ -219,7 +224,9 @@ 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 \
@@ -251,10 +258,12 @@ 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
@@ -273,6 +282,51 @@ 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

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 := Launcher3QuickStepGoIconRecents

LOCAL_PRIVILEGED_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep



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)





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

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

AndroidManifest-common.xml

+9 −0
Original line number Diff line number Diff line
@@ -152,6 +152,15 @@ 
            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:exported="true" />



        <!--

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

        -->

AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ 
                <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>



    </application>

SecondaryDisplayLauncher/res/values-af/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="8116646702313548897">"SecondaryDisplayLauncher"</string>

    <string name="couldnt_launch" msgid="7873588052226763866">"Kon nie die aktiwiteit begin nie"</string>

    <string name="add_app_shortcut" msgid="2756755330707509435">"Voeg programkortpad by"</string>

    <string name="set_wallpaper" msgid="6475195450505435904">"Stel muurpapier"</string>

SecondaryDisplayLauncher/res/values-am/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="8116646702313548897">"SecondaryDisplayLauncher"</string>

    <string name="couldnt_launch" msgid="7873588052226763866">"እንቅስቃሴውን ማስጀመር አልተቻለም"</string>

    <string name="add_app_shortcut" msgid="2756755330707509435">"የመተግበሪያ አቋራጭ ያክሉ"</string>

    <string name="set_wallpaper" msgid="6475195450505435904">"ልጣፍ አዘጋጅ"</string>