diff options
author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:47:16 +0000 |
---|---|---|
committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 05:26:32 +0000 |
commit | 3cb06ac57579ba579ba4954401a56cf93848d77f (patch) | |
tree | 48fa4b8f245f175aba9aaa0652d2955e282a4449 /src/com/android/dialer/dialpad | |
parent | c05baae39c0d852656075d1eaca59d54ed905aa5 (diff) | |
parent | 22d574bdded22377a7d1389df1491ace096d1848 (diff) | |
download | android_packages_apps_Dialer-3cb06ac57579ba579ba4954401a56cf93848d77f.tar.gz android_packages_apps_Dialer-3cb06ac57579ba579ba4954401a56cf93848d77f.tar.bz2 android_packages_apps_Dialer-3cb06ac57579ba579ba4954401a56cf93848d77f.zip |
Merge tag 'android-6.0.0_r26' into cm-13.0
Android 6.0.0 release 26
Change-Id: I2dce2b8ad58cd52f63a674c690971361b9b89e30
Diffstat (limited to 'src/com/android/dialer/dialpad')
-rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index d65e2ebfe..31a3feb30 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -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; @@ -69,6 +70,7 @@ import android.widget.TextView; import com.android.contacts.common.CallUtil; import com.android.contacts.common.GeoUtil; +import com.android.contacts.common.dialog.CallSubjectDialog; import com.android.contacts.common.util.PermissionsUtil; import com.android.contacts.common.util.PhoneNumberFormatter; import com.android.contacts.common.util.StopWatch; @@ -81,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; @@ -224,9 +225,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"; @@ -359,13 +357,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); @@ -690,9 +681,6 @@ public class DialpadFragment extends Fragment stopWatch.lap("dtwd"); - // Retrieve the haptic feedback setting. - mHaptic.checkSystemSetting(); - stopWatch.lap("hptc"); mPressedDialpadKeys.clear(); @@ -826,7 +814,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); @@ -937,9 +925,12 @@ public class DialpadFragment extends Fragment boolean enable = !isDigitsEmpty(); for (int i = 0; i < menu.size(); i++) { - menu.getItem(i).setEnabled(enable); + MenuItem item = menu.getItem(i); + item.setEnabled(enable); + if (item.getItemId() == R.id.menu_call_with_note) { + item.setVisible(CallUtil.isCallWithSubjectSupported(getContext())); + } } - super.show(); } }; @@ -953,7 +944,7 @@ public class DialpadFragment extends Fragment * pressed. */ public void dialButtonPressed() { - mHaptic.vibrate(); + getView().performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY); handleDialButtonPressed(); } @@ -1025,7 +1016,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: { @@ -1602,6 +1593,10 @@ public class DialpadFragment extends Fragment case R.id.menu_add_wait: updateDialString(WAIT); return true; + case R.id.menu_call_with_note: + CallSubjectDialog.start(getActivity(), mDigits.getText().toString()); + hideAndClearDialpad(false); + return true; default: return false; } |