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

Commit d640a152 authored by Jordan Silva's avatar Jordan Silva Committed by Android (Google) Code Review
Browse files

Merge "Converting orientation handler classes to kotlin" into main

parents 06e819d6 68d82759

quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public final class RecentsViewStateController extends 
        // Create transition animations to split select

        RecentsPagedOrientationHandler orientationHandler =

                ((RecentsView) mLauncher.getOverviewPanel()).getPagedOrientationHandler();

        Pair<FloatProperty, FloatProperty> taskViewsFloat =

        Pair<FloatProperty<RecentsView>, FloatProperty<RecentsView>> taskViewsFloat =

                orientationHandler.getSplitSelectTaskOffset(

                        TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION,

                        mLauncher.getDeviceProfile());

quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java

+2 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.launcher3.states.StateAnimationConfig; 
import com.android.launcher3.util.MultiPropertyFactory;

import com.android.quickstep.RecentsActivity;

import com.android.quickstep.views.ClearAllButton;

import com.android.quickstep.views.RecentsView;



/**

 * State controller for fallback recents activity
@@ -125,7 +126,7 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState 
            setter.add(pa.buildAnim());

        }



        Pair<FloatProperty, FloatProperty> taskViewsFloat =

        Pair<FloatProperty<RecentsView>, FloatProperty<RecentsView>> taskViewsFloat =

                mRecentsView.getPagedOrientationHandler().getSplitSelectTaskOffset(

                        TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION,

                        mActivity.getDeviceProfile());

quickstep/src/com/android/quickstep/orientation/LandscapePagedViewHandler.java

deleted100644 → 0
+0 −704

File deleted.

Preview size limit exceeded, changes collapsed.

quickstep/src/com/android/quickstep/orientation/LandscapePagedViewHandler.kt

0 → 100644
+659 −0

File added.

Preview size limit exceeded, changes collapsed.

quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ public class PortraitPagedViewHandler extends DefaultPagedViewHandler implements 
    }



    @Override

    public Float getFloatingTaskPrimaryTranslation(View floatingTask, DeviceProfile dp) {

    public float getFloatingTaskPrimaryTranslation(View floatingTask, DeviceProfile dp) {

        return dp.isLeftRightSplit

                ? floatingTask.getTranslationX()

                : floatingTask.getTranslationY();