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

Commit 01d5d7e5 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 407bfa30: Use View.performHapticFeedback for haptic vibration 

* commit '407bfa30':
  Use View.performHapticFeedback for haptic vibration
parents bc891fe6 407bfa30

src/com/android/dialer/dialpad/DialpadFragment.java

+3 −16
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.text.TextUtils; 
import android.text.TextWatcher;

import android.util.AttributeSet;

import android.util.Log;

import android.view.HapticFeedbackConstants;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.Menu;
@@ -82,7 +83,6 @@ import com.android.dialer.calllog.PhoneAccountUtils; 
import com.android.dialer.util.DialerUtils;

import com.android.dialer.util.IntentUtil;

import com.android.phone.common.CallLogAsync;

import com.android.phone.common.HapticFeedback;

import com.android.phone.common.animation.AnimUtils;

import com.android.phone.common.dialpad.DialpadKeyButton;

import com.android.phone.common.dialpad.DialpadView;
@@ -208,9 +208,6 @@ public class DialpadFragment extends Fragment 
    // determines if we want to playback local DTMF tones.

    private boolean mDTMFToneEnabled;



    // Vibration (haptic feedback) for dialer key presses.

    private final HapticFeedback mHaptic = new HapticFeedback();



    /** Identifier for the "Add Call" intent extra. */

    private static final String ADD_CALL_MODE_KEY = "add_call_mode";
@@ -330,13 +327,6 @@ public class DialpadFragment extends Fragment 


        mCurrentCountryIso = GeoUtil.getCurrentCountryIso(getActivity());



        try {

            mHaptic.init(getActivity(),

                         getResources().getBoolean(R.bool.config_enable_dialer_key_vibration));

        } catch (Resources.NotFoundException nfe) {

             Log.e(TAG, "Vibrate control bool missing.", nfe);

        }



        mProhibitedPhoneNumberRegexp = getResources().getString(

                R.string.config_prohibited_phone_number_regexp);
@@ -651,9 +641,6 @@ public class DialpadFragment extends Fragment 


        stopWatch.lap("dtwd");



        // Retrieve the haptic feedback setting.

        mHaptic.checkSystemSetting();



        stopWatch.lap("hptc");



        mPressedDialpadKeys.clear();
@@ -787,7 +774,7 @@ public class DialpadFragment extends Fragment 
                break;

        }



        mHaptic.vibrate();

        getView().performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);

        KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, keyCode);

        mDigits.onKeyDown(keyCode, event);
@@ -916,7 +903,7 @@ public class DialpadFragment extends Fragment 
    public void onClick(View view) {

        switch (view.getId()) {

            case R.id.dialpad_floating_action_button:

                mHaptic.vibrate();

                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);

                handleDialButtonPressed();

                break;

            case R.id.deleteButton: {