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

Commit 95cccb9d authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Make all lockscreen widgets follow haptic flag." into jb-mr1-dev

parents 6b77a76d 723a725e

core/java/com/android/internal/widget/RotarySelector.java

+11 −4
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ import android.graphics.Bitmap; 
import android.graphics.BitmapFactory;

import android.graphics.Matrix;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.os.Vibrator;

import android.provider.Settings;

import android.util.AttributeSet;

import android.util.Log;

import android.view.MotionEvent;
@@ -667,12 +669,17 @@ public class RotarySelector extends View { 
     * Triggers haptic feedback.

     */

    private synchronized void vibrate(long duration) {

        final boolean hapticEnabled = Settings.System.getIntForUser(

                mContext.getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED, 1,

                UserHandle.USER_CURRENT) != 0;

        if (hapticEnabled) {

            if (mVibrator == null) {

            mVibrator = (android.os.Vibrator)

                    getContext().getSystemService(Context.VIBRATOR_SERVICE);

                mVibrator = (android.os.Vibrator) getContext()

                        .getSystemService(Context.VIBRATOR_SERVICE);

            }

            mVibrator.vibrate(duration);

        }

    }



    /**

     * Draw the bitmap so that it's centered

core/java/com/android/internal/widget/SlidingTab.java

+11 −4
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.os.Vibrator;

import android.provider.Settings;

import android.util.AttributeSet;

import android.util.Log;

import android.view.Gravity;
@@ -811,12 +813,17 @@ public class SlidingTab extends ViewGroup { 
     * Triggers haptic feedback.

     */

    private synchronized void vibrate(long duration) {

        final boolean hapticEnabled = Settings.System.getIntForUser(

                mContext.getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED, 1,

                UserHandle.USER_CURRENT) != 0;

        if (hapticEnabled) {

            if (mVibrator == null) {

            mVibrator = (android.os.Vibrator)

                    getContext().getSystemService(Context.VIBRATOR_SERVICE);

                mVibrator = (android.os.Vibrator) getContext()

                        .getSystemService(Context.VIBRATOR_SERVICE);

            }

            mVibrator.vibrate(duration);

        }

    }



    /**

     * Registers a callback to be invoked when the user triggers an event.

core/java/com/android/internal/widget/WaveView.java

+11 −4
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ import android.graphics.Bitmap; 
import android.graphics.BitmapFactory;

import android.graphics.Canvas;

import android.graphics.drawable.BitmapDrawable;

import android.os.UserHandle;

import android.os.Vibrator;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.Log;
@@ -573,12 +575,17 @@ public class WaveView extends View implements ValueAnimator.AnimatorUpdateListen 
     * Triggers haptic feedback.

     */

    private synchronized void vibrate(long duration) {

        final boolean hapticEnabled = Settings.System.getIntForUser(

                mContext.getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED, 1,

                UserHandle.USER_CURRENT) != 0;

        if (hapticEnabled) {

            if (mVibrator == null) {

            mVibrator = (android.os.Vibrator)

                    getContext().getSystemService(Context.VIBRATOR_SERVICE);

                mVibrator = (android.os.Vibrator) getContext()

                        .getSystemService(Context.VIBRATOR_SERVICE);

            }

            mVibrator.vibrate(duration);

        }

    }



    /**

     * Registers a callback to be invoked when the user triggers an event.

core/java/com/android/internal/widget/multiwaveview/GlowPadView.java

+6 −1
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ import android.content.res.TypedArray; 
import android.graphics.Canvas;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.Vibrator;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.Log;
@@ -543,7 +545,10 @@ public class GlowPadView extends View { 
    }



    private void vibrate() {

        if (mVibrator != null) {

        final boolean hapticEnabled = Settings.System.getIntForUser(

                mContext.getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED, 1,

                UserHandle.USER_CURRENT) != 0;

        if (mVibrator != null && hapticEnabled) {

            mVibrator.vibrate(mVibrationDuration);

        }

    }

core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java

+6 −1
Original line number Diff line number Diff line
@@ -32,7 +32,9 @@ import android.graphics.Canvas; 
import android.graphics.RectF;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.Vibrator;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.Log;
@@ -593,7 +595,10 @@ public class MultiWaveView extends View { 
    }



    private void vibrate() {

        if (mVibrator != null) {

        final boolean hapticEnabled = Settings.System.getIntForUser(

                mContext.getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED, 1,

                UserHandle.USER_CURRENT) != 0;

        if (mVibrator != null && hapticEnabled) {

            mVibrator.vibrate(mVibrationDuration);

        }

    }