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

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

Merge "Moving LauncherAccessibilityDelegate to accessibility package" into ub-launcher3-burnaby

parents 42690130 83a8f042

src/com/android/launcher3/CellLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -3012,7 +3012,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { 
    // 2. When long clicking on an empty cell in a CellLayout, we save information about the

    //    cellX and cellY coordinates and which page was clicked. We then set this as a tag on

    //    the CellLayout that was long clicked

    static final class CellInfo {

    public static final class CellInfo {

        View cell;

        int cellX = -1;

        int cellY = -1;
@@ -3021,7 +3021,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { 
        long screenId;

        long container;



        CellInfo(View v, ItemInfo info) {

        public CellInfo(View v, ItemInfo info) {

            cell = v;

            cellX = info.cellX;

            cellY = info.cellY;

src/com/android/launcher3/DragLayer.java

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.view.animation.Interpolator; 
import android.widget.FrameLayout;

import android.widget.TextView;



import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;

import com.android.launcher3.util.Thunk;



import java.util.ArrayList;

src/com/android/launcher3/Folder.java

+4 −2
Original line number Diff line number Diff line
@@ -49,13 +49,15 @@ import android.view.inputmethod.EditorInfo; 
import android.view.inputmethod.InputMethodManager;

import android.widget.LinearLayout;

import android.widget.TextView;



import com.android.launcher3.CellLayout.CellInfo;

import com.android.launcher3.DragController.DragListener;

import com.android.launcher3.FolderInfo.FolderListener;

import com.android.launcher3.LauncherAccessibilityDelegate.AccessibilityDragSource;

import com.android.launcher3.UninstallDropTarget.UninstallSource;

import com.android.launcher3.Workspace.ItemOperator;

import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.AccessibilityDragSource;

import com.android.launcher3.util.Thunk;



import java.util.ArrayList;

import java.util.Collections;
@@ -352,7 +354,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 
    /**

     * @return the FolderInfo object associated with this folder

     */

    FolderInfo getInfo() {

    public FolderInfo getInfo() {

        return mInfo;

    }

src/com/android/launcher3/Launcher.java

+3 −2
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ import android.widget.Toast; 


import com.android.launcher3.DropTarget.DragObject;

import com.android.launcher3.PagedView.PageSwitchListener;

import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;

import com.android.launcher3.compat.AppWidgetManagerCompat;

import com.android.launcher3.compat.LauncherActivityInfoCompat;

import com.android.launcher3.compat.LauncherAppsCompat;
@@ -3184,7 +3185,7 @@ public class Launcher extends Activity 
        }

    }



    void closeFolder(Folder folder) {

    public void closeFolder(Folder folder) {

        folder.getInfo().opened = false;



        ViewGroup parent = (ViewGroup) folder.getParent().getParent();
@@ -3337,7 +3338,7 @@ public class Launcher extends Activity 
                true);

    }



    protected void showWorkspace(boolean animated, Runnable onCompleteRunnable) {

    public void showWorkspace(boolean animated, Runnable onCompleteRunnable) {

        showWorkspace(WorkspaceStateTransitionAnimation.SCROLL_TO_CURRENT_PAGE, animated,

                onCompleteRunnable, true);

    }

src/com/android/launcher3/LauncherAppState.java

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.util.Log; 
import android.view.Display;

import android.view.WindowManager;



import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;

import com.android.launcher3.compat.LauncherAppsCompat;

import com.android.launcher3.compat.PackageInstallerCompat;

import com.android.launcher3.util.Thunk;