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

Commit aea65680 authored by Jon's avatar Jon
Browse files

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

Bug: 80134723
Test: manual
Change-Id: I48e091d078b967374b04e3f96b5ae63cf27dceda
parents d00202ed 327ce118

Android.mk

+50 −0
Original line number Diff line number Diff line
@@ -185,7 +185,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)





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

proguard.flags

+6 −0
Original line number Diff line number Diff line
@@ -120,6 +120,12 @@ 
  *;

}



# Discovery bounce animation

-keep class com.android.launcher3.allapps.DiscoveryBounce$VerticalProgressWrapper {

  public void setProgress(float);

  public float getProgress();

}



# BUG(70852369): Surpress additional warnings after changing from Proguard to R8

-dontwarn android.app.**

-dontwarn android.view.**

quickstep/res/layout/task.xml

+4 −1
Original line number Diff line number Diff line
@@ -13,9 +13,11 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.quickstep.views.TaskView xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.quickstep.views.TaskView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:focusable="false"

    android:elevation="4dp">



    <com.android.quickstep.views.TaskThumbnailView
@@ -29,5 +31,6 @@ 
        android:layout_width="@dimen/task_thumbnail_icon_size"

        android:layout_height="@dimen/task_thumbnail_icon_size"

        android:importantForAccessibility="no"

        android:focusable="false"

        android:layout_gravity="top|center_horizontal" />

</com.android.quickstep.views.TaskView>
 
 No newline at end of file

quickstep/res/values-af/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -25,6 +25,5 @@ 
    <string name="recents_empty_message" msgid="7040467240571714191">"Geen onlangse items nie"</string>

    <string name="accessibility_close_task" msgid="5354563209433803643">"Maak toe"</string>

    <string name="recents_clear_all" msgid="5328176793634888831">"Vee alles uit"</string>

    <!-- no translation found for accessibility_recent_apps (4058661986695117371) -->

    <skip />

    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Onlangse programme"</string>

</resources>

quickstep/res/values-am/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -25,6 +25,5 @@ 
    <string name="recents_empty_message" msgid="7040467240571714191">"ምንም የቅርብ ጊዜ ንጥሎች የሉም"</string>

    <string name="accessibility_close_task" msgid="5354563209433803643">"ዝጋ"</string>

    <string name="recents_clear_all" msgid="5328176793634888831">"ሁሉንም አጽዳ"</string>

    <!-- no translation found for accessibility_recent_apps (4058661986695117371) -->

    <skip />

    <string name="accessibility_recent_apps" msgid="4058661986695117371">"የቅርብ ጊዜ መተግበሪያዎች"</string>

</resources>