summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorm0viefreak <m0viefreak.cm@googlemail.com>2011-12-21 15:42:33 +0100
committerm0viefreak <m0viefreak.cm@googlemail.com>2011-12-21 15:45:28 +0100
commitafcd8cafc226ee53d0d93523ef00396ef035caac (patch)
tree4a6d2775132b6b908915656ea57f629c8da5e05c
parent66414dd515c6dfc08f3e9e6a722bfeaf99f3023f (diff)
downloadpackages_apps_Contacts-afcd8cafc226ee53d0d93523ef00396ef035caac.tar.gz
packages_apps_Contacts-afcd8cafc226ee53d0d93523ef00396ef035caac.tar.bz2
packages_apps_Contacts-afcd8cafc226ee53d0d93523ef00396ef035caac.zip
Dialpad: T9 Dialer - Additional Fixes
Included fixes from http://review.cyanogenmod.com/#change,11107 Change-Id: Icec955bdb03e8341df5c6f2d82bd6448fcc191f0
-rw-r--r--src/com/android/contacts/T9Search.java4
-rw-r--r--src/com/android/contacts/TwelveKeyDialer.java7
2 files changed, 4 insertions, 7 deletions
diff --git a/src/com/android/contacts/T9Search.java b/src/com/android/contacts/T9Search.java
index a4913a5ce..073db75a7 100644
--- a/src/com/android/contacts/T9Search.java
+++ b/src/com/android/contacts/T9Search.java
@@ -314,7 +314,7 @@ class T9Search {
ContactItem o = mItems.get(position);
holder.name.setText(o.name, TextView.BufferType.SPANNABLE);
- holder.number.setText(o.number + " (" + o.groupType + ")", TextView.BufferType.SPANNABLE);
+ holder.number.setText(o.normalNumber + " (" + o.groupType + ")", TextView.BufferType.SPANNABLE);
if (o.nameMatchId != -1) {
Spannable s = (Spannable) holder.name.getText();
int nameStart = o.normalName.indexOf(mPrevInput);
@@ -346,4 +346,4 @@ class T9Search {
}
-} \ No newline at end of file
+}
diff --git a/src/com/android/contacts/TwelveKeyDialer.java b/src/com/android/contacts/TwelveKeyDialer.java
index 8710df97a..b1fa6bb37 100644
--- a/src/com/android/contacts/TwelveKeyDialer.java
+++ b/src/com/android/contacts/TwelveKeyDialer.java
@@ -590,6 +590,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
*/
private void hideT9 () {
if (!isT9On()) {
+ toggleT9();
mT9Top.setVisibility(View.GONE);
} else {
mT9Top.setVisibility(View.VISIBLE);
@@ -601,10 +602,6 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
* Toggles between expanded list and dialpad
*/
private void toggleT9() {
- if (!isT9On()) {
- hideT9();
- return;
- }
if (mT9Flipper.getCurrentView() == mT9List) {
mT9Toggle.setChecked(false);
animateT9();
@@ -1238,7 +1235,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
mDialpadChooser.setAdapter(mDialpadChooserAdapter);
}
} else {
- if (isT9On() && !mDigits.getText().toString().isEmpty()) {
+ if (isT9On()) {
if (mT9Flipper.getCurrentView() != mT9List) {
mT9Toggle.setChecked(false);
searchContacts();