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

Commit e23dd92a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove debug logs for b/193125090" into sc-v2-dev

parents fb0492b7 4e3460b8

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

+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 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;
@@ -111,8 +110,6 @@ 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;

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java

+0 −3
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 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;
@@ -228,8 +227,6 @@ 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:

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

+0 −4
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 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;
@@ -84,8 +82,6 @@ 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],

quickstep/src/com/android/quickstep/views/OverviewActionsView.java

+0 −6
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 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;
@@ -163,8 +162,6 @@ 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);

    }
@@ -183,9 +180,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
        } else {

            mDisabledFlags &= ~disabledFlags;

        }

        //

        Log.v("b/193125090",

                "updateDisabledFlags - disabledFlags: " + disabledFlags + ", enable: " + enable);

        boolean isEnabled = (mDisabledFlags & ~DISABLED_ROTATED) == 0;

        LayoutUtils.setViewEnabled(this, isEnabled);

    }

quickstep/src/com/android/quickstep/views/RecentsView.java

+0 −5
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ import android.text.StaticLayout; 
import android.text.TextPaint;

import android.util.AttributeSet;

import android.util.FloatProperty;

import android.util.Log;

import android.util.SparseBooleanArray;

import android.view.Gravity;

import android.view.HapticFeedbackConstants;
@@ -1270,7 +1269,6 @@ 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() {
@@ -1489,7 +1487,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
            }

        }

        mActionsView.getScrollAlpha().setValue(scrollAlpha);

        Log.v("b/193125090", "setScrollAlpha: " + scrollAlpha);

    }



    /**
@@ -1914,7 +1911,6 @@ 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();

    }
@@ -2724,7 +2720,6 @@ 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);