diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-19 23:02:34 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-19 23:02:34 +0000 |
commit | f976beb4b56b9b0b1ea17c6466d79b16a4eb7477 (patch) | |
tree | 4538bd3030d9cfaf2fa602f693bc483e8d947e11 /java/com/android/dialer/smartdial/SmartDialMap.java | |
parent | 0f76636bba4a2c01663c98fa4f3a88d3435e45d7 (diff) | |
parent | e12f924c45d9e40dbdd23ad01b7bde855b82c4c8 (diff) |
Merge changes Ic5616af0,I5e4c3e61
* changes:
Add flags for the Duo install, activate and invite buttons
Support dual alphabets in smart dial.
Diffstat (limited to 'java/com/android/dialer/smartdial/SmartDialMap.java')
-rw-r--r-- | java/com/android/dialer/smartdial/SmartDialMap.java | 97 |
1 files changed, 70 insertions, 27 deletions
diff --git a/java/com/android/dialer/smartdial/SmartDialMap.java b/java/com/android/dialer/smartdial/SmartDialMap.java index 9638929a6..bc5c9ea72 100644 --- a/java/com/android/dialer/smartdial/SmartDialMap.java +++ b/java/com/android/dialer/smartdial/SmartDialMap.java @@ -16,45 +16,88 @@ package com.android.dialer.smartdial; -/** - * Note: These methods currently take characters as arguments. For future planned language support, - * they will need to be changed to use codepoints instead of characters. - * - * <p>http://docs.oracle.com/javase/6/docs/api/java/lang/String.html#codePointAt(int) - * - * <p>If/when this change is made, LatinSmartDialMap(which operates on chars) will continue to work - * by simply casting from a codepoint to a character. - */ -public interface SmartDialMap { +import android.support.v4.util.SimpleArrayMap; +import com.google.common.base.Optional; + +/** Definition for utilities that supports smart dial in different languages. */ +@SuppressWarnings("Guava") +abstract class SmartDialMap { - /* - * Returns true if the provided character can be mapped to a key on the dialpad + /** + * Returns true if the provided character can be mapped to a key on the dialpad. + * + * <p>The provided character is expected to be a normalized character. See {@link + * SmartDialMap#normalizeCharacter(char)} for details. */ - boolean isValidDialpadCharacter(char ch); + protected boolean isValidDialpadCharacter(char ch) { + return isValidDialpadAlphabeticChar(ch) || isValidDialpadNumericChar(ch); + } - /* - * Returns true if the provided character is a letter, and can be mapped to a key on the dialpad + /** + * Returns true if the provided character is a letter and can be mapped to a key on the dialpad. + * + * <p>The provided character is expected to be a normalized character. See {@link + * SmartDialMap#normalizeCharacter(char)} for details. */ - boolean isValidDialpadAlphabeticChar(char ch); + protected boolean isValidDialpadAlphabeticChar(char ch) { + return getCharToKeyMap().containsKey(ch); + } - /* - * Returns true if the provided character is a digit, and can be mapped to a key on the dialpad + /** + * Returns true if the provided character is a digit, and can be mapped to a key on the dialpad. */ - boolean isValidDialpadNumericChar(char ch); + protected boolean isValidDialpadNumericChar(char ch) { + return '0' <= ch && ch <= '9'; + } - /* - * Get the index of the key on the dialpad which the character corresponds to + /** + * Get the index of the key on the dialpad which the character corresponds to. + * + * <p>The provided character is expected to be a normalized character. See {@link + * SmartDialMap#normalizeCharacter(char)} for details. + * + * <p>An {@link Optional#absent()} is returned if the provided character can't be mapped to a key + * on the dialpad. */ - byte getDialpadIndex(char ch); + protected Optional<Byte> getDialpadIndex(char ch) { + if (isValidDialpadNumericChar(ch)) { + return Optional.of((byte) (ch - '0')); + } - /* - * Get the actual numeric character on the dialpad which the character corresponds to + if (isValidDialpadAlphabeticChar(ch)) { + return Optional.of((byte) (getCharToKeyMap().get(ch) - '0')); + } + + return Optional.absent(); + } + + /** + * Get the actual numeric character on the dialpad which the character corresponds to. + * + * <p>The provided character is expected to be a normalized character. See {@link + * SmartDialMap#normalizeCharacter(char)} for details. + * + * <p>An {@link Optional#absent()} is returned if the provided character can't be mapped to a key + * on the dialpad. */ - char getDialpadNumericCharacter(char ch); + protected Optional<Character> getDialpadNumericCharacter(char ch) { + return isValidDialpadAlphabeticChar(ch) + ? Optional.of(getCharToKeyMap().get(ch)) + : Optional.absent(); + } - /* + /** * Converts uppercase characters to lower case ones, and on a best effort basis, strips accents * from accented characters. + * + * <p>An {@link Optional#absent()} is returned if the provided character can't be mapped to a key + * on the dialpad. + */ + abstract Optional<Character> normalizeCharacter(char ch); + + /** + * Returns a map in which each key is a normalized character and the corresponding value is a + * dialpad key. */ - char normalizeCharacter(char ch); + abstract SimpleArrayMap<Character, Character> getCharToKeyMap(); } |