PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "More debug tracing for switching to all apps not sending the final event" into ub-launcher3-qt-dev

Browse Source
This commit is contained in:
Vadim Tryshev
2019-05-31 21:20:21 +00:00
committed by Android (Google) Code Review
parent 43522d25f2 a8f77a6afd
commit 719908c84b
4 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherStateManager.java
+6
View File
@@ -40,6 +40,7 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import androidx.annotation.IntDef;
@@ -474,6 +475,11 @@ public class LauncherStateManager {
// Only change the stable states after the transitions have finished
if (state != mCurrentStableState) {
mLastStableState = state.getHistoryForState(mCurrentStableState);
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG,
"mCurrentStableState = " + state.getClass().getSimpleName() + " @ " +
android.util.Log.getStackTraceString(new Throwable()));
}
mCurrentStableState = state;
}
src/com/android/launcher3/allapps/AllAppsTransitionController.java
+6
View File
@@ -14,6 +14,7 @@ import static com.android.launcher3.util.SystemUiController.UI_STATE_ALL_APPS;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.util.Log;
import android.util.Property;
import android.view.animation.Interpolator;
@@ -29,6 +30,7 @@ import com.android.launcher3.anim.AnimationSuccessListener;
import com.android.launcher3.anim.AnimatorSetBuilder;
import com.android.launcher3.anim.SpringObjectAnimator;
import com.android.launcher3.anim.PropertySetter;
import com.android.launcher3.testing.TestProtocol;
import com.android.launcher3.util.MultiValueAlpha;
import com.android.launcher3.util.Themes;
import com.android.launcher3.views.ScrimView;
@@ -162,6 +164,10 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil
@Override
public void setStateWithAnimation(LauncherState toState,
AnimatorSetBuilder builder, AnimationConfig config) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG,
"setStateWithAnimation " + toState.getClass().getSimpleName());
}
float targetProgress = toState.getVerticalProgress(mLauncher);
if (Float.compare(mProgress, targetProgress) == 0) {
setAlphas(toState, config, builder);
src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+16
View File
@@ -31,6 +31,7 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ValueAnimator;
import android.os.SystemClock;
import android.util.Log;
import android.view.HapticFeedbackConstants;
import android.view.MotionEvent;
@@ -118,6 +119,9 @@ public abstract class AbstractStateChangeTouchController
@Override
public final boolean onControllerInterceptTouchEvent(MotionEvent ev) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onControllerInterceptTouchEvent 1 " + ev);
}
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
mNoIntercept = !canInterceptTouch(ev);
if (mNoIntercept) {
@@ -147,6 +151,9 @@ public abstract class AbstractStateChangeTouchController
return false;
}
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onControllerInterceptTouchEvent 2 ");
}
onControllerTouchEvent(ev);
return mDetector.isDraggingOrSettling();
}
@@ -234,6 +241,9 @@ public abstract class AbstractStateChangeTouchController
@Override
public void onDragStart(boolean start) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onDragStart 1 " + start);
}
mStartState = mLauncher.getStateManager().getState();
if (mStartState == ALL_APPS) {
mStartContainerType = LauncherLogProto.ContainerType.ALLAPPS;
@@ -243,6 +253,9 @@ public abstract class AbstractStateChangeTouchController
mStartContainerType = LauncherLogProto.ContainerType.TASKSWITCHER;
}
if (mCurrentAnimation == null) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onDragStart 2");
}
mFromState = mStartState;
mToState = null;
cancelAnimationControllers();
@@ -552,6 +565,9 @@ public abstract class AbstractStateChangeTouchController
}
private void cancelAnimationControllers() {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "cancelAnimationControllers");
}
mCurrentAnimation = null;
cancelAtomicComponentsController();
mDetector.finishedScrolling();
src/com/android/launcher3/touch/SwipeDetector.java
+12
View File
@@ -158,6 +158,9 @@ public class SwipeDetector {
// SETTLING -> (View settled) -> IDLE
private void setState(ScrollState newState) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "setState -- start: " + newState);
}
if (DBG) {
Log.d(TAG, "setState:" + mState + "->" + newState);
}
@@ -165,6 +168,9 @@ public class SwipeDetector {
if (newState == ScrollState.DRAGGING) {
initializeDragging();
if (mState == ScrollState.IDLE) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "setState -- 1: " + newState);
}
reportDragStart(false /* recatch */);
} else if (mState == ScrollState.SETTLING) {
reportDragStart(true /* recatch */);
@@ -318,9 +324,15 @@ public class SwipeDetector {
break;
}
mDisplacement = mDir.getDisplacement(ev, pointerIndex, mDownPos, mIsRtl);
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onTouchEvent 1");
}
// handle state and listener calls.
if (mState != ScrollState.DRAGGING && shouldScrollStart(ev, pointerIndex)) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onTouchEvent 2");
}
setState(ScrollState.DRAGGING);
}
if (mState == ScrollState.DRAGGING) {