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

Commit 884f8f21 authored by Matt Casey's avatar Matt Casey
Browse files

Merging from ub-launcher3-master @ build 6369897 

Test: manual, presubmit on the source branch
Bug:150504032

x20/teams/android-launcher/merge/ub-launcher3-master_6369897.html

Change-Id: Id94544cf790a7dcf0841f66648ac864bf2f530d4
parents 4c04982f 839d0d71

quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable 
            WorkspaceItemInfo info = predictions.get(i);

            PredictedAppIcon icon = PredictedAppIcon.createIcon(mSampleHotseat, info);

            icon.setEnabled(false);

            icon.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);

            icon.verifyHighRes();

            CellLayout.LayoutParams lp = new CellLayout.LayoutParams(i, 0, 1, 1);

            mSampleHotseat.addViewToCellLayout(icon, i, info.getViewId(), lp, true);

quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java

+4 −1
Original line number Diff line number Diff line
@@ -349,7 +349,10 @@ public class HotseatPredictionController implements DragController.DragListener, 
                mHotSeatItemsCount);

    }



    private void pinPrediction(ItemInfo info) {

    /**

     * Pins a predicted app icon into place.

     */

    public void pinPrediction(ItemInfo info) {

        PredictedAppIcon icon = (PredictedAppIcon) mHotseat.getChildAt(

                mHotseat.getCellXFromOrder(info.rank),

                mHotseat.getCellYFromOrder(info.rank));

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PredictedAppIcon.java

+36 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.launcher3.uioverrides;



import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.PIN_PREDICTION;

import static com.android.launcher3.graphics.IconShape.getShape;



import android.content.Context;
@@ -26,15 +27,19 @@ import android.graphics.Rect; 
import android.util.AttributeSet;

import android.view.LayoutInflater;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityNodeInfo;



import androidx.core.graphics.ColorUtils;



import com.android.launcher3.CellLayout;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.ItemInfo;

import com.android.launcher3.Launcher;

import com.android.launcher3.R;

import com.android.launcher3.WorkspaceItemInfo;

import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;

import com.android.launcher3.graphics.IconPalette;

import com.android.launcher3.hybridhotseat.HotseatPredictionController;

import com.android.launcher3.icons.IconNormalizer;

import com.android.launcher3.touch.ItemClickHandler;

import com.android.launcher3.touch.ItemLongClickListener;
@@ -43,7 +48,8 @@ import com.android.launcher3.views.DoubleShadowBubbleTextView; 
/**

 * A BubbleTextView with a ring around it's drawable

 */

public class PredictedAppIcon extends DoubleShadowBubbleTextView {

public class PredictedAppIcon extends DoubleShadowBubbleTextView implements

        LauncherAccessibilityDelegate.AccessibilityActionHandler {



    private static final float RING_EFFECT_RATIO = 0.11f;
@@ -97,6 +103,13 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView { 
        super.applyFromWorkspaceItem(info);

        int color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);

        mIconRingPaint.setColor(ColorUtils.setAlphaComponent(color, 200));

        if (mIsPinned) {

            setContentDescription(info.contentDescription);

        } else {

            setContentDescription(

                    getContext().getString(R.string.hotseat_prediction_content_description,

                            info.contentDescription));

        }

    }



    /**
@@ -104,9 +117,9 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView { 
     */

    public void pin(WorkspaceItemInfo info) {

        if (mIsPinned) return;

        mIsPinned = true;

        applyFromWorkspaceItem(info);

        setOnLongClickListener(ItemLongClickListener.INSTANCE_WORKSPACE);

        mIsPinned = true;

        ((CellLayout.LayoutParams) getLayoutParams()).canReorder = true;

        invalidate();

    }
@@ -121,6 +134,27 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView { 
        verifyHighRes();

    }



    @Override

    public void addSupportedAccessibilityActions(AccessibilityNodeInfo accessibilityNodeInfo) {

        accessibilityNodeInfo.addAction(

                new AccessibilityNodeInfo.AccessibilityAction(PIN_PREDICTION,

                        getContext().getText(R.string.pin_prediction)));

    }



    @Override

    public boolean performAccessibilityAction(int action, ItemInfo info) {

        QuickstepLauncher launcher = Launcher.cast(Launcher.getLauncher(getContext()));

        if (action == PIN_PREDICTION) {

            if (launcher == null || launcher.getHotseatPredictionController() == null) {

                return false;

            }

            HotseatPredictionController controller = launcher.getHotseatPredictionController();

            controller.pinPrediction(info);

            return true;

        }

        return false;

    }



    @Override

    public void getIconBounds(Rect outBounds) {

        super.getIconBounds(outBounds);

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+0 −81
Original line number Diff line number Diff line
@@ -19,12 +19,9 @@ import static com.android.launcher3.LauncherState.NORMAL; 
import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;



import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.os.Bundle;

import android.view.Gravity;

import android.view.View;



import androidx.annotation.Nullable;
@@ -38,7 +35,6 @@ import com.android.launcher3.WorkspaceItemInfo; 
import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.folder.Folder;

import com.android.launcher3.graphics.RotationMode;

import com.android.launcher3.hybridhotseat.HotseatPredictionController;

import com.android.launcher3.popup.SystemShortcut;

import com.android.launcher3.uioverrides.touchcontrollers.FlingAndHoldTouchController;
@@ -72,77 +68,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { 
     */

    public static final AsyncCommand SET_SHELF_HEIGHT = (context, arg1, arg2) ->

            SystemUiProxy.INSTANCE.get(context).setShelfHeight(arg1 != 0, arg2);

    public static final RotationMode ROTATION_LANDSCAPE = new RotationMode(-90) {

        @Override

        public void mapRect(int left, int top, int right, int bottom, Rect out) {

            out.left = top;

            out.top = right;

            out.right = bottom;

            out.bottom = left;

        }



        @Override

        public void mapInsets(Context context, Rect insets, Rect out) {

            // If there is a display cutout, the top insets in portrait would also include the

            // cutout, which we will get as the left inset in landscape. Using the max of left and

            // top allows us to cover both cases (with or without cutout).

            if (SysUINavigationMode.getMode(context) == NO_BUTTON) {

                out.top = Math.max(insets.top, insets.left);

                out.bottom = Math.max(insets.right, insets.bottom);

                out.left = out.right = 0;

            } else {

                out.top = Math.max(insets.top, insets.left);

                out.bottom = insets.right;

                out.left = insets.bottom;

                out.right = 0;

            }

        }

    };

    public static final RotationMode ROTATION_SEASCAPE = new RotationMode(90) {

        @Override

        public void mapRect(int left, int top, int right, int bottom, Rect out) {

            out.left = bottom;

            out.top = left;

            out.right = top;

            out.bottom = right;

        }



        @Override

        public void mapInsets(Context context, Rect insets, Rect out) {

            if (SysUINavigationMode.getMode(context) == NO_BUTTON) {

                out.top = Math.max(insets.top, insets.right);

                out.bottom = Math.max(insets.left, insets.bottom);

                out.left = out.right = 0;

            } else {

                out.top = Math.max(insets.top, insets.right);

                out.bottom = insets.left;

                out.right = insets.bottom;

                out.left = 0;

            }

        }



        @Override

        public int toNaturalGravity(int absoluteGravity) {

            int horizontalGravity = absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK;

            int verticalGravity = absoluteGravity & Gravity.VERTICAL_GRAVITY_MASK;



            if (horizontalGravity == Gravity.RIGHT) {

                horizontalGravity = Gravity.LEFT;

            } else if (horizontalGravity == Gravity.LEFT) {

                horizontalGravity = Gravity.RIGHT;

            }



            if (verticalGravity == Gravity.TOP) {

                verticalGravity = Gravity.BOTTOM;

            } else if (verticalGravity == Gravity.BOTTOM) {

                verticalGravity = Gravity.TOP;

            }



            return ((absoluteGravity & ~Gravity.HORIZONTAL_GRAVITY_MASK)

                    & ~Gravity.VERTICAL_GRAVITY_MASK)

                    | horizontalGravity | verticalGravity;

        }

    };

    private HotseatPredictionController mHotseatPredictionController;



    @Override
@@ -153,12 +78,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { 
        }

    }



    @Override

    protected RotationMode getFakeRotationMode(DeviceProfile dp) {

        return !dp.isVerticalBarLayout() ? RotationMode.NORMAL

                : (dp.isSeascape() ? ROTATION_SEASCAPE : ROTATION_LANDSCAPE);

    }



    @Override

    public void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.launcher3.uioverrides;



import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;

import static com.android.launcher3.LauncherState.OVERVIEW_BUTTONS;

import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT;

import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -91,7 +92,7 @@ public final class RecentsViewStateController extends 


        View actionsView = mLauncher.getActionsView();

        if (actionsView != null) {

            propertySetter.setViewAlpha(actionsView, buttonAlpha, actionInterpolator);

            propertySetter.setFloat(actionsView, VIEW_ALPHA, buttonAlpha, actionInterpolator);

        }

    }