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

Commit 2d652c1d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Show work switch tip" into ub-launcher3-master

parents e3284434 9f7f9d9e

quickstep/recents_ui_overrides/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ 
    <dimen name="all_apps_label_top_padding">16dp</dimen>

    <dimen name="all_apps_label_bottom_padding">8dp</dimen>

    <dimen name="all_apps_label_text_size">14sp</dimen>

    <dimen name="all_apps_tip_bottom_margin">8dp</dimen>

    <!-- The size of corner radius of the arrow in the arrow toast. -->

    <dimen name="arrow_toast_corner_radius">2dp</dimen>



    <!-- Minimum distance to swipe to trigger accessibility gesture -->

    <dimen name="accessibility_gesture_min_swipe_distance">80dp</dimen>

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java

+1 −1
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ import static com.android.quickstep.logging.UserEventDispatcherExtension.ALL_APP 
import android.os.UserManager;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.ArrowTipView;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherStateManager;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.FloatingHeaderView;

import com.android.launcher3.views.ArrowTipView;

import com.android.systemui.shared.system.LauncherEventUtil;



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.view.View; 


import androidx.core.app.NotificationCompat;



import com.android.launcher3.ArrowTipView;

import com.android.launcher3.CellLayout;

import com.android.launcher3.FolderInfo;

import com.android.launcher3.Hotseat;
@@ -43,6 +42,7 @@ import com.android.launcher3.util.ActivityTracker; 
import com.android.launcher3.util.GridOccupancy;

import com.android.launcher3.util.IntArray;

import com.android.launcher3.util.Themes;

import com.android.launcher3.views.ArrowTipView;

import com.android.launcher3.views.Snackbar;



import java.util.ArrayDeque;

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java

+3 −3
Original line number Diff line number Diff line
@@ -826,8 +826,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
        super.onInitializeAccessibilityNodeInfo(info);



        info.addAction(

                new AccessibilityNodeInfo.AccessibilityAction(R.string.accessibility_close_task,

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

                new AccessibilityNodeInfo.AccessibilityAction(R.string.accessibility_close,

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



        final Context context = getContext();

        for (SystemShortcut s : TaskOverlayFactory.getEnabledShortcuts(this)) {
@@ -851,7 +851,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 


    @Override

    public boolean performAccessibilityAction(int action, Bundle arguments) {

        if (action == R.string.accessibility_close_task) {

        if (action == R.string.accessibility_close) {

            getRecentsView().dismissTask(this, true /*animateTaskView*/,

                    true /*removeTask*/);

            return true;

quickstep/res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ 
    <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->

    <string name="recents_empty_message">No recent items</string>



    <!-- Content description for the recent apps's accessibility option that closes it. [CHAR LIMIT=NONE] -->

    <string name="accessibility_close_task">Close</string>



    <!-- Content description for the recent apps's accessibility option that opens its usage settings. [CHAR LIMIT=NONE] -->

    <string name="accessibility_app_usage_settings">App usage settings</string>