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

Commit d140f3c7 authored by Adam Cohen's avatar Adam Cohen
Browse files

Ensure that custom actions are available to all apps items 

-> When BubbleTextViews were being recycled, the RecyclerView was clearing the
   AccessibilityDelegate. Ensure that this is reset by the adapter when a
   BubbleTextView is reused.

issue 25948877

(cherry picked from commit 6e92f053)

Change-Id: I5f0773333186e5ffe4600f49330b4390cd3fbaeb
parent 26a4f6c8

src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java

+3 −1
Original line number Diff line number Diff line
@@ -118,7 +118,9 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme 
                    info.addAction(mActions.get(RESIZE));

                }

            }

        } if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) {

        }



        if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) {

            info.addAction(mActions.get(ADD_TO_WORKSPACE));

        }

    }

src/com/android/launcher3/allapps/AllAppsGridAdapter.java

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.widget.TextView; 
import com.android.launcher3.AppInfo;

import com.android.launcher3.BubbleTextView;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;
@@ -564,12 +565,16 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. 
                AppInfo info = mApps.getAdapterItems().get(position).appInfo;

                BubbleTextView icon = (BubbleTextView) holder.mContent;

                icon.applyFromApplicationInfo(info);

                icon.setAccessibilityDelegate(

                        LauncherAppState.getInstance().getAccessibilityDelegate());

                break;

            }

            case PREDICTION_ICON_VIEW_TYPE: {

                AppInfo info = mApps.getAdapterItems().get(position).appInfo;

                BubbleTextView icon = (BubbleTextView) holder.mContent;

                icon.applyFromApplicationInfo(info);

                icon.setAccessibilityDelegate(

                        LauncherAppState.getInstance().getAccessibilityDelegate());

                break;

            }

            case EMPTY_SEARCH_VIEW_TYPE: