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

Commit 972d121e authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Fixing folder icons not handling clicks 

Change-Id: I52c21086d5734783ffc26e75b301ecce1a8bb956
parent 016d7e93

src/com/android/launcher3/folder/Folder.java

+1 −9
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.launcher3.folder; 


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

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

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

import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;



import android.animation.Animator;
@@ -86,7 +85,7 @@ import java.util.List; 
/**

 * Represents a set of icons chosen by the user or generated by the system.

 */

public class Folder extends AbstractFloatingView implements DragSource, View.OnClickListener,

public class Folder extends AbstractFloatingView implements DragSource,

        View.OnLongClickListener, DropTarget, FolderListener, TextView.OnEditorActionListener,

        View.OnFocusChangeListener, DragListener, ExtendedEditText.OnBackKeyListener {

    private static final String TAG = "Launcher.Folder";
@@ -253,13 +252,6 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC 
        mFooterHeight = mFooter.getMeasuredHeight();

    }



    public void onClick(View v) {

        Object tag = v.getTag();

        if (tag instanceof ShortcutInfo) {

            mLauncher.onClick(v);

        }

    }



    public boolean onLongClick(View v) {

        // Return if global dragging is not enabled

        if (!mLauncher.isDraggingEnabled()) return true;

src/com/android/launcher3/folder/FolderPagedView.java

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.launcher3.Workspace.ItemOperator; 
import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.keyboard.ViewGroupFocusHelper;

import com.android.launcher3.pageindicators.PageIndicatorDots;

import com.android.launcher3.touch.ItemClickHandler;

import com.android.launcher3.util.Thunk;



import java.util.ArrayList;
@@ -237,7 +238,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { 
                R.layout.folder_application, null, false);

        textView.applyFromShortcutInfo(item);

        textView.setHapticFeedbackEnabled(false);

        textView.setOnClickListener(mFolder);

        textView.setOnClickListener(ItemClickHandler.INSTANCE);

        textView.setOnLongClickListener(mFolder);

        textView.setOnFocusChangeListener(mFocusIndicatorHelper);

        textView.setOnKeyListener(mKeyListener);