aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Refine logs for debugging TaplTestQuickStep.testOverviewActions on cf_foldables" into sc-v2-dev

Browse Source
This commit is contained in:
Alex Chau
2021-07-10 10:30:27 +00:00
committed by Android (Google) Code Review
parent baaffd5e11 1e767a6ecc
commit f4b2b2d304
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
View File

@@ -30,6 +30,7 @@ import static com.android.quickstep.views.TaskView.FLAG_UPDATE_ALL;
import android.annotation.TargetApi;
import android.os.Build;
import android.util.FloatProperty;
import android.util.Log;
import androidx.annotation.NonNull;
@@ -110,6 +111,8 @@ public final class RecentsViewStateController extends
propertySetter.setFloat(mLauncher.getActionsView().getVisibilityAlpha(),
MultiValueAlpha.VALUE, overviewButtonAlpha, config.getInterpolator(
ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));
Log.v("b/193125090",
"RecentsViewStateController - setVisibilityAlpha: " + overviewButtonAlpha);
float splitPlaceholderAlpha = state.areElementsVisible(mLauncher, SPLIT_PLACHOLDER_VIEW) ?
0.85f : 0;

3
quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
View File

@@ -54,6 +54,7 @@ import android.animation.Animator.AnimatorListener;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.graphics.PointF;
import android.util.Log;
import android.view.MotionEvent;
import android.view.animation.Interpolator;
@@ -227,6 +228,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
mRecentsView.setFullscreenProgress(fromState.getOverviewFullscreenProgress());
mLauncher.getActionsView().getVisibilityAlpha().setValue(
(fromState.getVisibleElements(mLauncher) & OVERVIEW_ACTIONS) != 0 ? 1f : 0f);
Log.v("b/193125090", "NoButtonQuickSwitchTouchController - setVisibilityAlpha: "
+ mLauncher.getActionsView().getVisibilityAlpha().getValue());
float[] scaleAndOffset = toState.getOverviewScaleAndOffset(mLauncher);
// As we drag right, animate the following properties:

4
quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
View File

@@ -32,6 +32,8 @@ import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;
import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
import static com.android.quickstep.views.TaskView.FLAG_UPDATE_ALL;
import android.util.Log;
import com.android.launcher3.anim.PendingAnimation;
import com.android.launcher3.anim.PropertySetter;
import com.android.launcher3.statemanager.StateManager.StateHandler;
@@ -82,6 +84,8 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
float overviewButtonAlpha = state.hasOverviewActions() ? 1 : 0;
setter.setFloat(mActivity.getActionsView().getVisibilityAlpha(),
MultiValueAlpha.VALUE, overviewButtonAlpha, LINEAR);
Log.v("b/193125090",
"FallbackRecentsStateController - setVisibilityAlpha: " + overviewButtonAlpha);
float[] scaleAndOffset = state.getOverviewScaleAndOffset(mActivity);
setter.setFloat(mRecentsView, RECENTS_SCALE_PROPERTY, scaleAndOffset[0],

5
quickstep/src/com/android/quickstep/views/OverviewActionsView.java
View File

@@ -23,6 +23,7 @@ import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Rect;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.FrameLayout;
@@ -162,6 +163,8 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
} else {
mHiddenFlags &= ~visibilityFlags;
}
Log.v("b/193125090",
"updateHiddenFlags - visibilityFlags: " + visibilityFlags + ", enable: " + enable);
boolean isHidden = mHiddenFlags != 0;
mMultiValueAlpha.getProperty(INDEX_HIDDEN_FLAGS_ALPHA).setValue(isHidden ? 0 : 1);
}
@@ -181,6 +184,8 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
mDisabledFlags &= ~disabledFlags;
}
//
Log.v("b/193125090",
"updateDisabledFlags - disabledFlags: " + disabledFlags + ", enable: " + enable);
boolean isEnabled = (mDisabledFlags & ~DISABLED_ROTATED) == 0;
LayoutUtils.setViewEnabled(this, isEnabled);
}

17
quickstep/src/com/android/quickstep/views/RecentsView.java
View File

@@ -989,7 +989,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
@Override
protected void onPageBeginTransition() {
super.onPageBeginTransition();
Log.d("b/193125090", "Disabling ActionsView due to scrolling");
mActionsView.updateDisabledFlags(OverviewActionsView.DISABLED_SCROLLING, true);
}
@@ -997,10 +996,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
protected void onPageEndTransition() {
super.onPageEndTransition();
if (isClearAllHidden()) {
Log.d("b/193125090", "Enabling ActionsView due after scrolling");
mActionsView.updateDisabledFlags(OverviewActionsView.DISABLED_SCROLLING, false);
} else {
Log.d("b/193125090", "Not enabling ActionsView due to ClearAll not hidden");
}
if (getNextPage() > 0) {
setSwipeDownShouldLaunchApp(true);
@@ -1164,7 +1161,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
}
if (mFocusedTaskId == -1 && getTaskViewCount() > 0) {
mFocusedTaskId = getTaskViewAt(0).getTaskId();
Log.d("b/193125090", "applyLoadPlan - mFocusedTaskId: " + mFocusedTaskId);
}
updateTaskSize();
@@ -1274,6 +1270,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
// Fade out the actions view quickly (0.1 range)
mActionsView.getFullscreenAlpha().setValue(
mapToRange(fullscreenProgress, 0, 0.1f, 1f, 0f, LINEAR));
Log.v("b/193125090", "setFullscreenAlpha: " + mActionsView.getFullscreenAlpha().getValue());
}
private void updateTaskStackListenerState() {
@@ -1481,25 +1478,18 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
}
private void updateActionsViewScrollAlpha() {
Log.d("b/193125090", "updateActionsViewScrollAlpha - showAsGrid: " + showAsGrid());
float scrollAlpha = 1f;
if (showAsGrid()) {
TaskView focusedTaskView = getFocusedTaskView();
Log.d("b/193125090",
"updateActionsViewScrollAlpha - focusedTaskView: " + focusedTaskView);
if (focusedTaskView != null) {
float scrollDiff = Math.abs(getScrollForPage(indexOfChild(focusedTaskView))
- mOrientationHandler.getPrimaryScroll(this));
float delta = (mGridSideMargin - scrollDiff) / (float) mGridSideMargin;
scrollAlpha = Utilities.boundToRange(delta, 0, 1);
Log.d("b/193125090",
"updateActionsViewScrollAlpha - focusedTaskScroll: " + getScrollForPage(
indexOfChild(focusedTaskView)) + ", primaryScroll: "
+ mOrientationHandler.getPrimaryScroll(this) + ", mGridSideMargin: "
+ mGridSideMargin);
}
}
mActionsView.getScrollAlpha().setValue(scrollAlpha);
Log.v("b/193125090", "setScrollAlpha: " + scrollAlpha);
}
/**
@@ -1924,6 +1914,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
private void animateActionsViewIn() {
ObjectAnimator anim = ObjectAnimator.ofFloat(
mActionsView.getVisibilityAlpha(), MultiValueAlpha.VALUE, 0, 1);
Log.v("b/193125090", "animateActionsViewIn - setVisibilityAlpha: " + 1);
anim.setDuration(TaskView.SCALE_ICON_DURATION);
anim.start();
}
@@ -2733,6 +2724,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
mEmptyMessagePaint.setAlpha(alphaInt);
mEmptyIcon.setAlpha(alphaInt);
mActionsView.getContentAlpha().setValue(mContentAlpha);
Log.v("b/193125090", "setContentAlpha: " + mContentAlpha);
if (alpha > 0) {
setVisibility(VISIBLE);
@@ -2756,7 +2748,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
@Override
public void setVisibility(int visibility) {
Log.d("b/193125090", "setVisibility: " + visibility);
super.setVisibility(visibility);
if (mActionsView != null) {
mActionsView.updateHiddenFlags(HIDDEN_NO_RECENTS, visibility != VISIBLE);