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

Commit 9aaa9267 authored by Tony's avatar Tony
Browse files

Move InputConsumers to new inputconsumers package 

Change-Id: I3318784523b8ff1b9468cbfed3a2682985274ea8
parent 75d2bcbe

quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsAnimationWrapper.java

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.view.KeyEvent; 
import android.view.MotionEvent;



import com.android.launcher3.util.Preconditions;

import com.android.quickstep.inputconsumers.InputConsumer;

import com.android.quickstep.util.SwipeAnimationTargetSet;

import com.android.systemui.shared.system.InputConsumerController;

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+6 −0
Original line number Diff line number Diff line
@@ -66,6 +66,12 @@ import com.android.launcher3.util.LooperExecutor; 
import com.android.launcher3.util.UiThreadHelper;

import com.android.quickstep.SysUINavigationMode.Mode;

import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;

import com.android.quickstep.inputconsumers.AccessibilityInputConsumer;

import com.android.quickstep.inputconsumers.AssistantTouchConsumer;

import com.android.quickstep.inputconsumers.DeviceLockedInputConsumer;

import com.android.quickstep.inputconsumers.InputConsumer;

import com.android.quickstep.inputconsumers.OtherActivityInputConsumer;

import com.android.quickstep.inputconsumers.OverviewInputConsumer;

import com.android.systemui.shared.recents.IOverviewProxy;

import com.android.systemui.shared.recents.ISystemUiProxy;

import com.android.systemui.shared.system.ActivityManagerWrapper;

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java

+14 −4
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.view.WindowManager; 
import android.view.animation.Interpolator;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.UiThread;



import com.android.launcher3.AbstractFloatingView;
@@ -91,6 +92,8 @@ import com.android.quickstep.ActivityControlHelper.AnimationFactory; 
import com.android.quickstep.ActivityControlHelper.AnimationFactory.ShelfAnimState;

import com.android.quickstep.ActivityControlHelper.HomeAnimationFactory;

import com.android.quickstep.SysUINavigationMode.Mode;

import com.android.quickstep.inputconsumers.InputConsumer;

import com.android.quickstep.inputconsumers.OverviewInputConsumer;

import com.android.quickstep.util.ClipAnimationHelper;

import com.android.quickstep.util.RectFSpringAnim;

import com.android.quickstep.util.RemoteAnimationTargetSet;
@@ -166,7 +169,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
    private static final int LAUNCHER_UI_STATES =

            STATE_LAUNCHER_PRESENT | STATE_LAUNCHER_DRAWN | STATE_LAUNCHER_STARTED;



    enum GestureEndTarget {

    public enum GestureEndTarget {

        HOME(1, STATE_SCALED_CONTROLLER_HOME, true, false, ContainerType.WORKSPACE, false),



        RECENTS(1, STATE_SCALED_CONTROLLER_RECENTS | STATE_CAPTURE_SCREENSHOT
@@ -220,8 +223,8 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
    private final ClipAnimationHelper mClipAnimationHelper;

    private final ClipAnimationHelper.TransformParams mTransformParams;



    protected Runnable mGestureEndCallback;

    protected GestureEndTarget mGestureEndTarget;

    private Runnable mGestureEndCallback;

    private GestureEndTarget mGestureEndTarget;

    // Either RectFSpringAnim (if animating home) or ObjectAnimator (from mCurrentShift) otherwise

    private RunningWindowAnim mRunningWindowAnim;

    private boolean mIsShelfPeeking;
@@ -273,7 +276,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
    private final long mTouchTimeMs;

    private long mLauncherFrameDrawnTime;



    WindowTransformSwipeHandler(RunningTaskInfo runningTaskInfo, Context context,

    public WindowTransformSwipeHandler(RunningTaskInfo runningTaskInfo, Context context,

            long touchTimeMs, ActivityControlHelper<T> controller, boolean continuingLastGesture,

            InputConsumerController inputConsumer) {

        mContext = context;
@@ -1125,6 +1128,13 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
        return anim;

    }



    /**

     * @return The GestureEndTarget if the gesture has ended, else null.

     */

    public @Nullable GestureEndTarget getGestureEndTarget() {

        return mGestureEndTarget;

    }



    @UiThread

    private void resumeLastTask() {

        mRecentsAnimationWrapper.finish(false /* toRecents */, null);

quickstep/recents_ui_overrides/src/com/android/quickstep/AccessibilityInputConsumer.java→quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.quickstep;

package com.android.quickstep.inputconsumers;



import static android.view.MotionEvent.ACTION_CANCEL;

import static android.view.MotionEvent.ACTION_DOWN;

quickstep/recents_ui_overrides/src/com/android/quickstep/AssistantTouchConsumer.java→quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.quickstep;

package com.android.quickstep.inputconsumers;



import static android.view.MotionEvent.ACTION_CANCEL;

import static android.view.MotionEvent.ACTION_DOWN;
@@ -43,6 +43,7 @@ import com.android.launcher3.R; 
import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.logging.UserEventDispatcher;

import com.android.launcher3.touch.SwipeDetector;

import com.android.quickstep.ActivityControlHelper;

import com.android.systemui.shared.recents.ISystemUiProxy;

import com.android.systemui.shared.system.InputMonitorCompat;

import com.android.systemui.shared.system.QuickStepContract;
@@ -236,7 +237,7 @@ public class AssistantTouchConsumer extends DelegateInputConsumer 
        }

    }



    static boolean withinTouchRegion(Context context, MotionEvent ev) {

    public static boolean withinTouchRegion(Context context, MotionEvent ev) {

        final Resources res = context.getResources();

        final int width = res.getDisplayMetrics().widthPixels;

        final int height = res.getDisplayMetrics().heightPixels;