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

Commit 478414a7 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes I4532e429,I532645de into ub-launcher3-qt-future-dev 

* changes:
  Defer listening on widget host until after the state transition ends
  Migrate to using DefaultDisplay
parents fad2f373 ef528767

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

+1 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import android.os.Vibrator; 
import android.provider.Settings;

import android.view.MotionEvent;

import android.view.View;

import android.view.WindowManager;

import android.view.animation.Interpolator;



import androidx.annotation.UiThread;
@@ -274,7 +273,7 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten 
            overviewStackBounds = getStackBounds(dp);

        }

        dp.updateInsets(targetSet.homeContentInsets);

        dp.updateIsSeascape(mContext.getSystemService(WindowManager.class));

        dp.updateIsSeascape(mContext);

        if (runningTaskTarget != null) {

            mClipAnimationHelper.updateSource(overviewStackBounds, runningTaskTarget);

        }

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

+14 −23
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.quickstep;



import static android.view.MotionEvent.ACTION_DOWN;



import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;

import static com.android.launcher3.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;

import static com.android.launcher3.config.FeatureFlags.ENABLE_HINTS_IN_OVERVIEW;
@@ -51,8 +52,6 @@ import android.content.res.Configuration; 
import android.graphics.Point;

import android.graphics.RectF;

import android.graphics.Region;

import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManager.DisplayListener;

import android.os.Build;

import android.os.Bundle;

import android.os.IBinder;
@@ -62,14 +61,14 @@ import android.os.RemoteException; 
import android.text.TextUtils;

import android.util.Log;

import android.view.Choreographer;

import android.view.Display;

import android.view.InputEvent;

import android.view.MotionEvent;

import android.view.Surface;

import android.view.WindowManager;



import androidx.annotation.BinderThread;

import androidx.annotation.UiThread;

import androidx.annotation.WorkerThread;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.R;

import com.android.launcher3.ResourceUtils;
@@ -80,6 +79,7 @@ import com.android.launcher3.logging.UserEventDispatcher; 
import com.android.launcher3.model.AppLaunchTracker;

import com.android.launcher3.provider.RestoreDbTask;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.DefaultDisplay;

import com.android.quickstep.SysUINavigationMode.Mode;

import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;

import com.android.quickstep.inputconsumers.AccessibilityInputConsumer;
@@ -132,7 +132,7 @@ class ArgList extends LinkedList<String> { 
 */

@TargetApi(Build.VERSION_CODES.Q)

public class TouchInteractionService extends Service implements

        NavigationModeChangeListener, DisplayListener {

        NavigationModeChangeListener, DefaultDisplay.DisplayInfoChangeListener {



    /**

     * NOTE: This value should be kept same as
@@ -323,8 +323,7 @@ public class TouchInteractionService extends Service implements 
            registerReceiver(mUserUnlockedReceiver, new IntentFilter(Intent.ACTION_USER_UNLOCKED));

        }



        mDefaultDisplayId = getSystemService(WindowManager.class).getDefaultDisplay()

                .getDisplayId();

        mDefaultDisplayId = DefaultDisplay.INSTANCE.get(this).getInfo().id;

        String blockingActivity = getString(R.string.gesture_blocking_activity);

        mGestureBlockingActivity = TextUtils.isEmpty(blockingActivity) ? null :

                ComponentName.unflattenFromString(blockingActivity);
@@ -391,9 +390,8 @@ public class TouchInteractionService extends Service implements 
            return;

        }



        Display defaultDisplay = getSystemService(WindowManager.class).getDefaultDisplay();

        Point realSize = new Point();

        defaultDisplay.getRealSize(realSize);

        DefaultDisplay.Info displayInfo = DefaultDisplay.INSTANCE.get(this).getInfo();

        Point realSize = new Point(displayInfo.realSize);

        mSwipeTouchRegion.set(0, 0, realSize.x, realSize.y);

        if (mMode == Mode.NO_BUTTON) {

            int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
@@ -415,7 +413,7 @@ public class TouchInteractionService extends Service implements 
        } else {

            mAssistantLeftRegion.setEmpty();

            mAssistantRightRegion.setEmpty();

            switch (defaultDisplay.getRotation()) {

            switch (displayInfo.rotation) {

                case Surface.ROTATION_90:

                    mSwipeTouchRegion.left = mSwipeTouchRegion.right

                            - getNavbarSize(ResourceUtils.NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE);
@@ -438,10 +436,9 @@ public class TouchInteractionService extends Service implements 
        }

        if (mMode.hasGestures != newMode.hasGestures) {

            if (newMode.hasGestures) {

                getSystemService(DisplayManager.class).registerDisplayListener(

                        this, MAIN_EXECUTOR.getHandler());

                DefaultDisplay.INSTANCE.get(this).addChangeListener(this);

            } else {

                getSystemService(DisplayManager.class).unregisterDisplayListener(this);

                DefaultDisplay.INSTANCE.get(this).removeChangeListener(this);

            }

        }

        mMode = newMode;
@@ -457,14 +454,8 @@ public class TouchInteractionService extends Service implements 
    }



    @Override

    public void onDisplayAdded(int i) { }



    @Override

    public void onDisplayRemoved(int i) { }



    @Override

    public void onDisplayChanged(int displayId) {

        if (displayId != mDefaultDisplayId) {

    public void onDisplayInfoChanged(DefaultDisplay.Info info, int flags) {

        if (info.id != mDefaultDisplayId) {

            return;

        }
@@ -529,7 +520,7 @@ public class TouchInteractionService extends Service implements 
        }

        disposeEventHandlers();

        if (mMode.hasGestures) {

            getSystemService(DisplayManager.class).unregisterDisplayListener(this);

            DefaultDisplay.INSTANCE.get(this).removeChangeListener(this);

        }



        sConnected = false;

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java

+4 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.quickstep.inputconsumers; 
import static android.view.MotionEvent.ACTION_CANCEL;

import static android.view.MotionEvent.ACTION_POINTER_DOWN;

import static android.view.MotionEvent.ACTION_UP;



import static com.android.launcher3.Utilities.squaredHypot;

import static com.android.launcher3.Utilities.squaredTouchSlop;

import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
@@ -35,9 +36,10 @@ import android.graphics.RectF; 
import android.view.MotionEvent;

import android.view.VelocityTracker;

import android.view.ViewConfiguration;

import android.view.WindowManager;



import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.util.DefaultDisplay;

import com.android.quickstep.LockScreenRecentsActivity;

import com.android.quickstep.MultiStateCallback;

import com.android.quickstep.SwipeSharedState;
@@ -103,8 +105,7 @@ public class DeviceLockedInputConsumer implements InputConsumer, 
        mRunningTaskId = runningTaskId;



        // Do not use DeviceProfile as the user data might be locked

        mDisplaySize = new Point();

        context.getSystemService(WindowManager.class).getDefaultDisplay().getRealSize(mDisplaySize);

        mDisplaySize = DefaultDisplay.INSTANCE.get(context).getInfo().realSize;



        // Init states

        mStateCallback = new MultiStateCallback(STATE_NAMES);

quickstep/recents_ui_overrides/src/com/android/quickstep/util/NavBarPosition.java

+2 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON; 


import android.content.Context;

import android.view.Surface;

import android.view.WindowManager;



import com.android.launcher3.graphics.RotationMode;

import com.android.launcher3.util.DefaultDisplay;

import com.android.quickstep.SysUINavigationMode;



/**
@@ -36,8 +36,7 @@ public class NavBarPosition { 


    public NavBarPosition(Context context) {

        mMode = SysUINavigationMode.getMode(context);

        mDisplayRotation = context.getSystemService(WindowManager.class)

                .getDefaultDisplay().getRotation();

        mDisplayRotation = DefaultDisplay.INSTANCE.get(context).getInfo().rotation;

    }



    public boolean isRightEdge() {

quickstep/src/com/android/quickstep/BaseRecentsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -157,6 +157,6 @@ public abstract class BaseRecentsActivity extends BaseDraggingActivity { 
    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {

        super.dump(prefix, fd, writer, args);

        writer.println(prefix + "Misc:");

        dumpMisc(writer);

        dumpMisc(prefix + "\t", writer);

    }

}