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

Commit 90eb08d8 authored by Winson Chung's avatar Winson Chung
Browse files

Merging ub-launcher3-qt-dev, build 5582981 

Test: Manual

Bug:118758696 Define grid display options
Bug:123900446 App to home animation should zoom into the app icon
Bug:124510042 [Gesture Nav] Home animation polish
Bug:129985827 [Fully Gestural Navigation] Delay Recents animation when swiping up
Bug:130020567 Handle fullscreen correctly for quick switch
Bug:130193889 Half screenshot in the app switcher
Bug:130292844 App close animation is slightly off for Squircle adaptive icons
Bug:130451254 QSB/Folder icon color depends on three variants of wallpaper shade on light/dark theme
Bug:130521490 Dock bar is too close to the edge when in landscape home screen
Bug:130689544 Unable to quickswitch apps under landscape mode
Bug:131231579 Long-swipe up to app drawer goes to overview
Bug:131360075 [Gesture Nav] Polish/finish landscape
Bug:132269977 Pixel launcher crashed while swiping up home button after disabling an app
Bug:132309376 Launcher held ION buffers after clearing all apps in Recent Apps
Bug:132458092 Recents Go: Transparent apps have double vision for apps to recents
Bug:132584688 Disallowed association between launcher and aiai
Bug:132816938 [Please fix ASAP] Failed test: sometimes home screen doesn't have all_apps
Bug:132892578 Split screen option missing for recent apps after restarting / upgrading the device.
Bug:132898688 NPE in 'com.android.quickstep.views.TaskThumbnailView com.android.quickstep.views.TaskView.getThumbnail()'
Bug:132908798 Gesture haptic double triggers
Bug:132916535 Handle multi-touch
Bug:74500048 Fix launcher transition while in startActivityForResult

Change-Id: I68d6af2ec47f2b379f5607685b2257029ab07a91
parents 662f12fe 0de59396

AndroidManifest-common.xml

+2 −2
Original line number Diff line number Diff line
@@ -154,13 +154,13 @@ 


        <!--

        The content provider for exposing various launcher grid options.

        TODO: Enable when all apps columns are correct

        TODO: Add proper permissions

        -->

        <provider

            android:name="com.android.launcher3.graphics.GridOptionsProvider"

            android:authorities="${packageName}.grid_control"

            android:enabled="false"

            android:exported="true" />

        -->



        <!--

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

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="28" android:minSdkVersion="25"/>

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

    <!--

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

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

go/quickstep/res/layout/task_item_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/task_item_height"

    android:orientation="horizontal">

    android:orientation="horizontal"

    android:clipChildren="false">

    <com.android.quickstep.views.TaskThumbnailIconView

        android:id="@+id/task_icon_and_thumbnail"

        android:layout_width="match_parent"

go/quickstep/src/com/android/quickstep/views/IconRecentsView.java

+39 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.content.Context; 
import android.content.res.Resources;

import android.graphics.Matrix;

import android.graphics.Rect;

import android.graphics.RectF;

import android.graphics.drawable.Drawable;

import android.util.ArraySet;

import android.util.AttributeSet;
@@ -768,6 +769,7 @@ public final class IconRecentsView extends FrameLayout implements Insettable { 
        Rect endRect = new Rect();

        thumbnailView.getGlobalVisibleRect(endRect);

        Rect appBounds = appTarget.sourceContainerBounds;

        RectF currentAppRect = new RectF();



        SyncRtSurfaceTransactionApplierCompat surfaceApplier =

                new SyncRtSurfaceTransactionApplierCompat(this);
@@ -810,17 +812,30 @@ public final class IconRecentsView extends FrameLayout implements Insettable { 


            @Override

            public void onUpdate(float percent) {

                appMatrix.preScale(mScaleX.value, mScaleY.value,

                Matrix m = new Matrix();

                m.preScale(mScaleX.value, mScaleY.value,

                        appBounds.width() / 2.0f, appBounds.height() / 2.0f);

                appMatrix.postTranslate(mTranslationX.value, mTranslationY.value);



                m.postTranslate(mTranslationX.value, mTranslationY.value);

                appMatrix.preConcat(m);

                params[1] = new SurfaceParams(appTarget.leash, mAlpha.value, appMatrix,

                        null /* windowCrop */, getLayer(appTarget, boostedMode),

                        0 /* cornerRadius */);

                surfaceApplier.scheduleApply(params);



                m.mapRect(currentAppRect, new RectF(appBounds));

                setViewToRect(thumbnailView, new RectF(endRect), currentAppRect);

                appMatrix.reset();

            }

        });

        remoteAppAnim.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {

                thumbnailView.setTranslationY(0);

                thumbnailView.setTranslationX(0);

                thumbnailView.setScaleX(1);

                thumbnailView.setScaleY(1);

            }

        });

        anim.play(remoteAppAnim);

    }
@@ -886,6 +901,27 @@ public final class IconRecentsView extends FrameLayout implements Insettable { 
        }

    }



    /**

     * Set view properties so that the view fits to the target rect.

     *

     * @param view view to set

     * @param origRect original rect that view was located

     * @param targetRect rect to set to

     */

    private void setViewToRect(View view, RectF origRect, RectF targetRect) {

        float dX = targetRect.left - origRect.left;

        float dY = targetRect.top - origRect.top;

        view.setTranslationX(dX);

        view.setTranslationY(dY);



        float scaleX = targetRect.width() / origRect.width();

        float scaleY = targetRect.height() / origRect.height();

        view.setPivotX(0);

        view.setPivotY(0);

        view.setScaleX(scaleX);

        view.setScaleY(scaleY);

    }



    @Override

    public void setInsets(Rect insets) {

        mInsets = insets;

quickstep/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -85,6 +85,13 @@ 
            android:name="com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"

            tools:node="remove" />



        <activity

            android:name="com.android.launcher3.proxy.ProxyActivityStarter"

            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"

            android:launchMode="singleTask"

            android:clearTaskOnLaunch="true"

            android:exported="false" />



    </application>



</manifest>