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

Commit 6982de24 authored by Tony Wickham's avatar Tony Wickham
Browse files

resolve merge conflicts of 2fd02086 to ub-launcher3-master 

Change-Id: I20ad6eaace81786be080e28d6eb551908add6d90
parents 3f0a53fa 2fd02086

src/com/android/launcher3/AnotherWindowDropTarget.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.graphics.Rect; 
public class AnotherWindowDropTarget implements DropTarget {

    final Launcher mLauncher;



    public AnotherWindowDropTarget (Context context) { mLauncher = (Launcher) context; }

    public AnotherWindowDropTarget (Context context) { mLauncher = Launcher.getLauncher(context); }



    @Override

    public boolean isDropEnabled() { return true; }

src/com/android/launcher3/ButtonDropTarget.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public abstract class ButtonDropTarget extends TextView 


    public ButtonDropTarget(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

        mLauncher = (Launcher) context;

        mLauncher = Launcher.getLauncher(context);



        Resources resources = getResources();

        mBottomDragPadding = resources.getDimensionPixelSize(R.dimen.drop_target_drag_padding);

src/com/android/launcher3/CellLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { 
        // the user where a dragged item will land when dropped.

        setWillNotDraw(false);

        setClipToPadding(false);

        mLauncher = (Launcher) context;

        mLauncher = Launcher.getLauncher(context);



        DeviceProfile grid = mLauncher.getDeviceProfile();

src/com/android/launcher3/FocusHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class FocusHelper { 
            return consume;

        }



        final Launcher launcher = (Launcher) v.getContext();

        final Launcher launcher = Launcher.getLauncher(v.getContext());

        final DeviceProfile profile = launcher.getDeviceProfile();



        if (DEBUG) {
@@ -333,7 +333,7 @@ public class FocusHelper { 
            return consume;

        }



        Launcher launcher = (Launcher) v.getContext();

        Launcher launcher = Launcher.getLauncher(v.getContext());

        DeviceProfile profile = launcher.getDeviceProfile();



        if (DEBUG) {

src/com/android/launcher3/Hotseat.java

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public class Hotseat extends FrameLayout 


    public Hotseat(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

        mLauncher = (Launcher) context;

        mLauncher = Launcher.getLauncher(context);

        mHasVerticalHotseat = mLauncher.getDeviceProfile().isVerticalBarLayout();

        mBackgroundColor = ColorUtils.setAlphaComponent(

                ContextCompat.getColor(context, R.color.all_apps_container_color), 0);