diff options
author | Yorke Lee <yorkelee@google.com> | 2012-11-12 09:23:21 -0800 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2012-11-30 13:53:09 -0800 |
commit | 33dff202e94cb50c0566becdd240a015fecb4f49 (patch) | |
tree | a82ddca2ede9ad47f0496cbaeb23a18b57f8b54f /src | |
parent | 90db26c1a656c8ce41a9ef3258a46cea1938e0ad (diff) |
Cherrypick Arabic/Farsi pasting into dialpad fix
Bug: 6656969
Change-Id: I0bb094125eb9be2b6508e6ca658ae23da9da19d1
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 4 | ||||
-rw-r--r-- | src/com/android/dialer/dialpad/UnicodeDialerKeyListener.java | 53 |
2 files changed, 54 insertions, 3 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 2c4841685..0c859f171 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -306,14 +306,12 @@ public class DialpadFragment extends Fragment mDigitsContainer = fragmentView.findViewById(R.id.digits_container); mDigits = (EditText) fragmentView.findViewById(R.id.digits); - mDigits.setKeyListener(DialerKeyListener.getInstance()); + mDigits.setKeyListener(UnicodeDialerKeyListener.INSTANCE); mDigits.setOnClickListener(this); mDigits.setOnKeyListener(this); mDigits.setOnLongClickListener(this); mDigits.addTextChangedListener(this); - PhoneNumberFormatter.setPhoneNumberFormattingTextWatcher(getActivity(), mDigits); - // Check for the presence of the keypad View oneButton = fragmentView.findViewById(R.id.one); if (oneButton != null) { diff --git a/src/com/android/dialer/dialpad/UnicodeDialerKeyListener.java b/src/com/android/dialer/dialpad/UnicodeDialerKeyListener.java new file mode 100644 index 000000000..c25c7a9dd --- /dev/null +++ b/src/com/android/dialer/dialpad/UnicodeDialerKeyListener.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2012 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.dialer.dialpad; + +import android.telephony.PhoneNumberUtils; +import android.text.Spanned; +import android.text.method.DialerKeyListener; + +/** + * {@link DialerKeyListener} with Unicode support. Converts any Unicode(e.g. Arabic) characters + * that represent digits into digits before filtering the results so that we can support + * pasted digits from Unicode languages. + */ +public class UnicodeDialerKeyListener extends DialerKeyListener { + public static final UnicodeDialerKeyListener INSTANCE = new UnicodeDialerKeyListener(); + + @Override + public CharSequence filter(CharSequence source, int start, int end, + Spanned dest, int dstart, int dend) { + CharSequence converted = PhoneNumberUtils.replaceUnicodeDigits(source.toString()); + // PhoneNumberUtils.replaceUnicodeDigits performs a character for character replacement, + // so we can assume that start and end positions should remain unchanged. + CharSequence result = super.filter(converted, start, end, dest, dstart, dend); + if (result == null) { + if (source.equals(converted)) { + // There was no conversion or filtering performed. Just return null according to + // the behavior of DialerKeyListener. + return null; + } else { + // filter returns null if the charsequence is to be returned unchanged/unfiltered. + // But in this case we do want to return a modified character string (even if + // none of the characters in the modified string are filtered). So if + // result == null we return the unfiltered but converted numeric string instead. + return converted.subSequence(start, end); + } + } + return result; + } +} |