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

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

Merge "Remove custom focus logic" into ub-launcher3-edmonton

parents bb5d42d1 e598699d

src/com/android/launcher3/FocusHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ class FullscreenKeyEventListener implements View.OnKeyListener { 
    }

}



/**

 * TODO: Reevaluate if this is still required

 */

public class FocusHelper {



    private static final String TAG = "FocusHelper";

src/com/android/launcher3/Hotseat.java

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ public class Hotseat extends FrameLayout implements LogContainerProvider, Insett 
            allAppsButton.setCompoundDrawables(null, d, null, null);



            allAppsButton.setContentDescription(context.getString(R.string.all_apps_button_label));

            allAppsButton.setOnKeyListener(new HotseatIconKeyEventListener());

            if (mLauncher != null) {

                allAppsButton.setOnClickListener((v) -> {

                    if (!mLauncher.isInState(ALL_APPS)) {

src/com/android/launcher3/Workspace.java

+0 −2
Original line number Diff line number Diff line
@@ -881,7 +881,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
        final CellLayout layout;

        if (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {

            layout = mLauncher.getHotseat().getLayout();

            child.setOnKeyListener(new HotseatIconKeyEventListener());



            // Hide folder title in the hotseat

            if (child instanceof FolderIcon) {
@@ -893,7 +892,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
                ((FolderIcon) child).setTextVisible(true);

            }

            layout = getScreenWithId(screenId);

            child.setOnKeyListener(new IconKeyEventListener());

        }



        ViewGroup.LayoutParams genericLp = child.getLayoutParams();

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

+0 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.view.ViewDebug; 
import com.android.launcher3.BubbleTextView;

import com.android.launcher3.CellLayout;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.FocusHelper.PagedFolderKeyEventListener;

import com.android.launcher3.InvariantDeviceProfile;

import com.android.launcher3.ItemInfo;

import com.android.launcher3.Launcher;
@@ -88,7 +87,6 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { 
    private int mGridCountY;



    private Folder mFolder;

    private PagedFolderKeyEventListener mKeyListener;



    public FolderPagedView(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -108,7 +106,6 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { 


    public void setFolder(Folder folder) {

        mFolder = folder;

        mKeyListener = new PagedFolderKeyEventListener(folder);

        mPageIndicator = folder.findViewById(R.id.folder_page_indicator);

        initParentViews(folder);

    }
@@ -241,7 +238,6 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { 
        textView.setOnClickListener(ItemClickHandler.INSTANCE);

        textView.setOnLongClickListener(mFolder);

        textView.setOnFocusChangeListener(mFocusIndicatorHelper);

        textView.setOnKeyListener(mKeyListener);



        textView.setLayoutParams(new CellLayout.LayoutParams(

                item.cellX, item.cellY, item.spanX, item.spanY));