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

Commit 3c5e748b authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Removing menu and dialog for custom actions hanlding. These do not work... 

Merge "Removing menu and dialog for custom actions hanlding. These do not work well with gesture-nav and can potentially block the Launcher UI." into sc-dev
parents 4d6b0270 384b578a

quickstep/src/com/android/launcher3/QuickstepAccessibilityDelegate.java

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.launcher3;



import android.view.KeyEvent;

import android.view.View;



import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.uioverrides.PredictedAppIcon;

import com.android.launcher3.uioverrides.QuickstepLauncher;



import java.util.List;



public class QuickstepAccessibilityDelegate extends LauncherAccessibilityDelegate {



    public QuickstepAccessibilityDelegate(QuickstepLauncher launcher) {

        super(launcher);

        mActions.put(PIN_PREDICTION, new LauncherAction(

                PIN_PREDICTION, R.string.pin_prediction, KeyEvent.KEYCODE_P));

    }



    @Override

    protected void getSupportedActions(View host, ItemInfo item, List<LauncherAction> out) {

        if (host instanceof PredictedAppIcon && !((PredictedAppIcon) host).isPinned()) {

            out.add(new LauncherAction(PIN_PREDICTION, R.string.pin_prediction,

                    KeyEvent.KEYCODE_P));

        }

        super.getSupportedActions(host, item, out);

    }



    @Override

    protected boolean performAction(View host, ItemInfo item, int action, boolean fromKeyboard) {

        QuickstepLauncher launcher = (QuickstepLauncher) mLauncher;

        if (action == PIN_PREDICTION) {

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

                return false;

            }

            launcher.getHotseatPredictionController().pinPrediction(item);

            return true;

        }

        return super.performAction(host, item, action, fromKeyboard);

    }

}

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

+5 −29
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

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;
@@ -29,7 +28,6 @@ import android.os.Process; 
import android.util.AttributeSet;

import android.view.LayoutInflater;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityNodeInfo;



import androidx.core.graphics.ColorUtils;
@@ -37,9 +35,7 @@ import com.android.launcher3.CellLayout; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.R;

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.icons.LauncherIcons;

import com.android.launcher3.model.data.ItemInfo;
@@ -53,8 +49,7 @@ import com.android.launcher3.views.DoubleShadowBubbleTextView; 
/**

 * A BubbleTextView with a ring around it's drawable

 */

public class PredictedAppIcon extends DoubleShadowBubbleTextView implements

        LauncherAccessibilityDelegate.AccessibilityActionHandler {

public class PredictedAppIcon extends DoubleShadowBubbleTextView {



    private static final int RING_SHADOW_COLOR = 0x99000000;

    private static final float RING_EFFECT_RATIO = 0.095f;
@@ -147,29 +142,6 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView implements 
        verifyHighRes();

    }



    @Override

    public void addSupportedAccessibilityActions(AccessibilityNodeInfo accessibilityNodeInfo) {

        if (!mIsPinned) {

            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) {

                return false;

            }

            HotseatPredictionController controller = launcher.getHotseatPredictionController();

            controller.pinPrediction(info);

            return true;

        }

        return false;

    }



    @Override

    public void getIconBounds(Rect outBounds) {

        super.getIconBounds(outBounds);
@@ -179,6 +151,10 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView implements 
        }

    }



    public boolean isPinned() {

        return mIsPinned;

    }



    private int getOutlineOffsetX() {

        return (getMeasuredWidth() / 2) - mNormalizedIconRadius;

    }

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

+7 −0
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ import com.android.launcher3.DeviceProfile; 
import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.LauncherState;

import com.android.launcher3.QuickstepAccessibilityDelegate;

import com.android.launcher3.Workspace;

import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.appprediction.PredictionRowView;

import com.android.launcher3.hybridhotseat.HotseatPredictionController;
@@ -134,6 +136,11 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { 
        mHotseatPredictionController.logLaunchedAppRankingInfo(info, instanceId);

    }



    @Override

    protected LauncherAccessibilityDelegate createAccessibilityDelegate() {

        return new QuickstepAccessibilityDelegate(this);

    }



    /**

     * Returns Prediction controller for hybrid hotseat

     */

res/drawable/ic_widget_height_decrease.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2021 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/textColorPrimary">

  <path

      android:fillColor="#FFFFFF"

      android:pathData="M8,19h3v3h2v-3h3l-4,-4 -4,4zM16,4h-3L13,1h-2v3L8,4l4,4 4,-4zM4,9v2h16L20,9L4,9zM4,12h16v2H4z"/>

</vector>

res/drawable/ic_widget_height_increase.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2021 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/textColorPrimary">

  <path

      android:fillColor="#FFFFFF"

      android:pathData="M4,20h16v2L4,22zM4,2h16v2L4,4zM13,9h3l-4,-4 -4,4h3v6L8,15l4,4 4,-4h-3z"/>

</vector>