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

Commit 329fca45 authored by Tony Wickham's avatar Tony Wickham
Browse files

Move overview haptic feedback to VibratorWrapper singleton 

Bug: 141886704
Change-Id: I0178a52088dd4150d7ba054983697ea63a00d9a8
Merged-In: I0178a52088dd4150d7ba054983697ea63a00d9a8
parent 0c7b01a6

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java

+3 −3
Original line number Diff line number Diff line
@@ -35,12 +35,12 @@ import static com.android.launcher3.anim.Interpolators.ACCEL; 
import static com.android.launcher3.anim.Interpolators.DEACCEL;

import static com.android.launcher3.anim.Interpolators.DEACCEL_3;

import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;

import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.view.HapticFeedbackConstants;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewConfiguration;
@@ -50,6 +50,7 @@ import com.android.launcher3.LauncherState; 
import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.util.VibratorWrapper;

import com.android.quickstep.OverviewInteractionState;

import com.android.quickstep.util.MotionPauseDetector;

import com.android.quickstep.views.RecentsView;
@@ -106,8 +107,7 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
                    }

                });

                mPeekAnim.start();

                recentsView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,

                        HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);

                VibratorWrapper.INSTANCE.get(mLauncher).vibrate(OVERVIEW_HAPTIC);



                mLauncher.getDragLayer().getScrim().animateToSysuiMultiplier(isPaused ? 0 : 1,

                        peekDuration, 0);

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

+3 −22
Original line number Diff line number Diff line
@@ -15,15 +15,12 @@ 
 */

package com.android.quickstep;



import static android.os.VibrationEffect.EFFECT_CLICK;

import static android.os.VibrationEffect.createPredefined;



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

import static com.android.launcher3.anim.Interpolators.ACCEL_1_5;

import static com.android.launcher3.anim.Interpolators.DEACCEL;

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

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;

import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;

import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;
@@ -39,9 +36,6 @@ import android.graphics.RectF; 
import android.os.Build;

import android.os.Handler;

import android.os.Looper;

import android.os.VibrationEffect;

import android.os.Vibrator;

import android.provider.Settings;

import android.view.MotionEvent;

import android.view.View;

import android.view.animation.Interpolator;
@@ -56,6 +50,7 @@ import com.android.launcher3.Utilities; 
import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.graphics.RotationMode;

import com.android.launcher3.util.VibratorWrapper;

import com.android.launcher3.views.FloatingIconView;

import com.android.quickstep.ActivityControlHelper.ActivityInitListener;

import com.android.quickstep.ActivityControlHelper.HomeAnimationFactory;
@@ -105,7 +100,6 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten 
    protected final ClipAnimationHelper mClipAnimationHelper;

    protected final TransformParams mTransformParams = new TransformParams();



    private final Vibrator mVibrator;

    protected final Mode mMode;



    // Shift in the range of [0, 1].
@@ -146,7 +140,6 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten 


        mClipAnimationHelper = new ClipAnimationHelper(context);

        mPageSpacing = context.getResources().getDimensionPixelSize(R.dimen.recents_page_spacing);

        mVibrator = context.getSystemService(Vibrator.class);

        initTransitionEndpoints(InvariantDeviceProfile.INSTANCE.get(mContext)

                .getDeviceProfile(mContext));

    }
@@ -160,19 +153,7 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten 
    }



    protected void performHapticFeedback() {

        if (!mVibrator.hasVibrator()) {

            return;

        }

        if (Settings.System.getInt(

                mContext.getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) == 0) {

            return;

        }



        VibrationEffect effect = createPredefined(EFFECT_CLICK);

        if (effect == null) {

            return;

        }

        UI_HELPER_EXECUTOR.execute(() -> mVibrator.vibrate(effect));

        VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC);

    }



    public Consumer<MotionEvent> getRecentsViewDispatcher(RotationMode rotationMode) {

src/com/android/launcher3/util/VibratorWrapper.java

0 → 100644
+84 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.launcher3.util;



import static android.os.VibrationEffect.createPredefined;

import static android.provider.Settings.System.HAPTIC_FEEDBACK_ENABLED;



import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;



import android.annotation.TargetApi;

import android.content.ContentResolver;

import android.content.Context;

import android.database.ContentObserver;

import android.os.Build;

import android.os.VibrationEffect;

import android.os.Vibrator;

import android.provider.Settings;



/**

 * Wrapper around {@link Vibrator} to easily perform haptic feedback where necessary.

 */

@TargetApi(Build.VERSION_CODES.Q)

public class VibratorWrapper {



    public static final MainThreadInitializedObject<VibratorWrapper> INSTANCE =

            new MainThreadInitializedObject<>(VibratorWrapper::new);



    private static final VibrationEffect EFFECT_CLICK =

            createPredefined(VibrationEffect.EFFECT_CLICK);



    /**

     * Haptic when entering overview.

     */

    public static final VibrationEffect OVERVIEW_HAPTIC = EFFECT_CLICK;



    private final Vibrator mVibrator;

    private final boolean mHasVibrator;



    private boolean mIsHapticFeedbackEnabled;



    public VibratorWrapper(Context context) {

        mVibrator = context.getSystemService(Vibrator.class);

        mHasVibrator = mVibrator.hasVibrator();

        if (mHasVibrator) {

            final ContentResolver resolver = context.getContentResolver();

            mIsHapticFeedbackEnabled = isHapticFeedbackEnabled(resolver);

            final ContentObserver observer = new ContentObserver(MAIN_EXECUTOR.getHandler()) {

                @Override

                public void onChange(boolean selfChange) {

                    mIsHapticFeedbackEnabled = isHapticFeedbackEnabled(resolver);

                }

            };

            resolver.registerContentObserver(Settings.System.getUriFor(HAPTIC_FEEDBACK_ENABLED),

                    false /* notifyForDescendents */, observer);

        } else {

            mIsHapticFeedbackEnabled = false;

        }

    }



    private boolean isHapticFeedbackEnabled(ContentResolver resolver) {

        return Settings.System.getInt(resolver, HAPTIC_FEEDBACK_ENABLED, 0) == 1;

    }



    /** Vibrates with the given effect if haptic feedback is available and enabled. */

    public void vibrate(VibrationEffect vibrationEffect) {

        if (mHasVibrator && mIsHapticFeedbackEnabled) {

            UI_HELPER_EXECUTOR.execute(() -> mVibrator.vibrate(vibrationEffect));

        }

    }

}