summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/layout/row.xml4
-rw-r--r--res/values-de/strings.xml10
-rw-r--r--res/values-fr/strings.xml57
-rw-r--r--res/values-hu/strings.xml9
-rw-r--r--res/values-ru/strings.xml10
-rw-r--r--res/values-zh-rCN/strings.xml10
-rw-r--r--res/values/strings.xml1
-rw-r--r--src/com/android/contacts/T9Search.java51
-rw-r--r--src/com/android/contacts/TwelveKeyDialer.java55
-rw-r--r--src/com/android/contacts/ui/EditContactActivity.java2
10 files changed, 143 insertions, 66 deletions
diff --git a/res/layout/row.xml b/res/layout/row.xml
index 418a3de04..457d9ec62 100644
--- a/res/layout/row.xml
+++ b/res/layout/row.xml
@@ -18,12 +18,14 @@
<TextView
android:id="@+id/rowName"
android:layout_weight="0.5"
+ android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<TextView
android:id="@+id/rowNumber"
android:layout_weight="0.5"
+ android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 511125b01..eee6c0f2b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -512,5 +512,15 @@
<string name="title_about_credits">Danksagung</string>
<string name="summary_about_credits">Wysie, ChainsDD, geesun, niuchl, rac2030, sileht und der Rest von XDA! :)</string>
+ <string name="t9_sort_title">T9-Sortierung</string>
+ <string name="t9_sort_summary">Reihenfolge der T9-Resultate auswählen</string>
+ <string name="t9_sort_name">Namenstreffer bevorzugen</string>
+ <string name="t9_sort_number">Nummerntreffer bevorzugen</string>
+ <string name="t9_state_title">T9-Wahl aktivieren</string>
+ <string name="t9_state_summary">Aktiviert T9-artiges Suchen mit der Telefontastatur</string>
+ <string name="t9_dial_click_title">Gewählten Kontakt anrufen</string>
+ <string name="t9_dial_click_summary">Ausgewählten Kontakt bei T9-Suche anrufen</string>
+ <string name="t9_add_to_contacts">Zu Kontakten hinzufügen</string>
+
<string name="search_results_searching">Suche läuft\u2026</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3b174fa03..d58a5f7e5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -420,17 +420,17 @@
<!-- Wysie: Preferences strings -->
<!-- Preferences: Dialer -->
- <string name="title_last_dialled">Appeler compose dernier appel</string>
- <string name="summary_last_dialled">Si aucun numéro n\'est entré, le dernier numéro composé sera rappelé </string>
- <string name="title_return_to_dialer">Retour au numéroteur après appel</string>
- <string name="title_vm_button">Bouton d\'action gauche (BAG)</string>
- <string name="title_vm_handler">Gestionnaire de messagerie vocale</string>
- <string name="title_use_1_for_reg_vm">1 appelle la messagerie vocale</string>
+ <string name="title_last_dialled">Touche BIS</string>
+ <string name="summary_last_dialled">Si aucun numéro n\'est entré, le dernier numéro composé sera rappelé</string>
+ <string name="title_return_to_dialer">Retour au clavier après appel</string>
+ <string name="title_vm_button">Bouton d\'action gauche</string>
+ <string name="title_vm_handler">Gestionnaire messagerie</string>
+ <string name="title_use_1_for_reg_vm">1 pour messagerie vocale</string>
<string name="summaryon_use_1_for_reg_vm">La touche 1 est un raccourci pour la messagerie vocale standard</string>
<string name="summaryoff_use_1_for_reg_vm">La touche 1 utilise le gestionnaire de messagerie vocale</string>
- <string name="title_disable_num_check">Ne pas vérifier les numéros</string>
+ <string name="title_disable_num_check">Ne pas vérifier numéros</string>
<string name="summaryon_disable_num_check">Le bouton d\'action gauche et le menu seront toujours actifs</string>
- <string name="summaryoff_disable_num_check">Le bouton d\'action gauche et menu seront actifs dès qu\'un chiffre sera entré</string>
+ <string name="summaryoff_disable_num_check">Le bouton d\'action et le menu seront actifs dès qu\'un chiffre sera entré</string>
<string name="title_enable_haptic_feedback">Retour haptique</string>
<string name="summary_enable_haptic_feedback">Utiliser le retour haptique du clavier - voir les Paramètres CyanogenMod pour les réglages</string>
<string name="title_change_digits_color">Couleur des touches</string>
@@ -442,7 +442,7 @@
<string name="entry_no_vm_handler">Aucun (Appeler Messagerie vocale)</string>
<!-- Preferences: Call log -->
- <string name="title_cl_exact_time">Horodatages absolus/relatifs</string>
+ <string name="title_cl_exact_time">Horodatages absolus</string>
<string name="summaryon_cl_exact_time">Utiliser des horodatages absolus dans l\'historique des appels</string>
<string name="summaryoff_cl_exact_time">Utiliser des horodatages relatifs dans l\'historique des appels</string>
<string name="title_cl_show_seconds">Afficher les secondes</string>
@@ -457,16 +457,16 @@
<string name="summary_contacts_show_dial_button">Afficher un bouton d\'appel à côté des contacts possédant un numéro de téléphone</string>
<string name="title_contacts_show_count">Afficher le nombre de contacts</string>
<string name="summary_contacts_show_count">Le nombre de contacts sera affiché en haut de la liste des contacts</string>
- <string name="title_contacts_show_separators">Séparateurs alphabétiques</string>
- <string name="summaryon_contacts_show_separators">Les séparateurs alphabétiques seront affichés dans la liste des contacts</string>
- <string name="summaryoff_contacts_show_separators">Les séparateurs alphabétiques ne seront pas affichés dans la liste des contacts</string>
+ <string name="title_contacts_show_separators">Répertoire alphabétique</string>
+ <string name="summaryon_contacts_show_separators">Regrouper la liste de contacts par leur première lettre</string>
+ <string name="summaryoff_contacts_show_separators">Ne pas regrouper les contacts par leur première lettre</string>
<!-- Preferences: Contacts - View Contact -->
- <string name="title_view_contact">Afficher contact</string>
+ <string name="title_view_contact">Affichage contact</string>
<string name="summary_view_contact">Configuration de l\'option &quot;Afficher contact&quot;</string>
- <string name="title_show_text_mobile_only">SMS pour les mobiles uniquement</string>
- <string name="summaryon_show_text_mobile_only">Seuls les numéros mobiles auront une action SMS associée</string>
- <string name="summaryoff_show_text_mobile_only">Tous les numéros auront une action SMS associée</string>
+ <string name="title_show_text_mobile_only">SMS sur mobiles uniquement</string>
+ <string name="summaryon_show_text_mobile_only">Seuls les numéros mobiles auront un bouton SMS</string>
+ <string name="summaryoff_show_text_mobile_only">Tous les numéros auront un bouton SMS</string>
<!-- Preferences: Favourites -->
<string name="title_favourites_hide_freq_call">Cacher fréquemment appelés</string>
@@ -479,12 +479,33 @@
<string name="title_misc_category">Divers</string>
<string name="title_sensor_rotation">Rotation automatique</string>
<string name="summary_sensor_rotation">Si activé, la rotation sera effective selon la configuration du système</string>
- <string name="title_data_font_size">Taille police infos contact</string>
+ <string name="title_data_font_size">Police infos contact</string>
<string name="summary_data_font_size">Permet de choisir la taille de la police utilisée pour afficher les informations détaillées des contacts (n° tél., e-mail, adresse, etc.)</string>
+ <string name="title_default_phone_tab">Onglet par défaut</string>
+ <string name="summary_default_phone_tab">Onglet affiché à l\'ouverture de l\'application Téléphone</string>
<!-- Wysie: About strings -->
- <string name="title_about">À propos de</string>
+ <string name="title_about">A propos...</string>
<string name="title_about_name">Nom du mod</string>
<string name="title_about_version">Version</string>
<string name="title_about_credits">Crédits</string>
+
+ <!-- Default Phone Tab strings -->
+ <string name="default_phone_tab_last_used">Dernier utilisé pour appel (Défaut)</string>
+ <string name="default_phone_tab_last_viewed">Dernier affiché</string>
+ <string name="default_phone_tab_phone">Téléphone</string>
+ <string name="default_phone_tab_call_log">Historique</string>
+ <string name="default_phone_tab_contacts">Contacts</string>
+ <string name="default_phone_tab_favorites">Favoris</string>
+
+ <!-- Preferences: T9 -->
+ <string name="t9_sort_title">Mode de tri T9</string>
+ <string name="t9_sort_summary">Méthode de tri des résultats issus du mode T9</string>
+ <string name="t9_sort_name">Noms en priorité</string>
+ <string name="t9_sort_number">Numéros en priorité</string>
+ <string name="t9_state_title">Activer le mode T9</string>
+ <string name="t9_state_summary">Activer la recherche de contacts par les lettres du clavier</string>
+ <string name="t9_dial_click_title">Sélection contact T9</string>
+ <string name="t9_dial_click_summary">Appeler de préférence le contact sélectionné par le mode T9</string>
+
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b95e7d8bc..cea0769f3 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -478,4 +478,13 @@
<string name="summary_about_version">1.2</string>
<string name="title_about_credits">Közreműködők</string>
<string name="summary_about_credits">Wysie, ChainsDD, geesun, niuchl, rac2030, sileht and the rest of XDA! :)\nFordítás: Google, gross76, petikeke, Knife, tothmarcell97 és sok más samdroid.net fórumozó</string>
+
+ <string name="t9_sort_title">T9 Rendezési mód</string>
+ <string name="t9_sort_summary">Keresés eredményeinek szűrése</string>
+ <string name="t9_sort_name">Először nevekre</string>
+ <string name="t9_sort_number">Először számokra</string>
+ <string name="t9_state_title">T9 tárcsázó</string>
+ <string name="t9_state_summary">T9 szerinti keresés a tárcsázóban</string>
+ <string name="t9_dial_click_title">Névjegy tárcsázása</string>
+ <string name="t9_dial_click_summary">Tárcsázza a T9 szerint kiválaszott Névjegyet</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9722298f8..bed537d76 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -481,4 +481,14 @@
<string name="summary_about_version">1.2</string>
<string name="title_about_credits">Благодарность</string>
<string name="summary_about_credits">Wysie, ChainsDD, geesun, niuchl, rac2030, sileht и остальные с XDA! :)</string>
+
+ <string name="t9_sort_title">Режим сортировки T9</string>
+ <string name="t9_sort_summary">Выберите способ фильтрации результатов T9</string>
+ <string name="t9_sort_name">Сначала имена</string>
+ <string name="t9_sort_number">Сначала номера</string>
+ <string name="t9_state_title">Включить набор T9</string>
+ <string name="t9_state_summary">Включить поиск T9 в телефоне</string>
+ <string name="t9_dial_click_title">Вызвать выбранный контакт</string>
+ <string name="t9_dial_click_summary">Вызвать выбранный контакт для T9</string>
+
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 75cfb2e8a..9719d8d2a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -496,4 +496,14 @@
<string name="title_about_version">版本</string>
<string name="title_about_credits">感谢</string>
+ <string name="t9_sort_title">T9排序模式</string>
+ <string name="t9_sort_summary">选择如何过滤T9结果</string>
+ <string name="t9_sort_name">姓名匹配优先</string>
+ <string name="t9_sort_number">号码匹配优先</string>
+ <string name="t9_state_title">开启T9拨号</string>
+ <string name="t9_state_summary">在拨号界面开启T9搜索</string>
+ <string name="t9_dial_click_title">拨打选中的联系人</string>
+ <string name="t9_dial_click_summary">在T9中拨打选中的联系人</string>
+ <string name="t9_add_to_contacts">添加到联系人</string>
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6d53598d3..5aca50a09 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1306,6 +1306,7 @@
<string name="t9_state_summary">Enable T9 searching in dialer</string>
<string name="t9_dial_click_title">Dial selected contact</string>
<string name="t9_dial_click_summary">Dial the selected contact for T9</string>
+ <string name="t9_add_to_contacts">Add to contacts</string>
<string name="t9_map_row_2">2abcàáâäåɑæçǽćčá</string>
<string name="t9_map_row_3">3deféèêë</string>
<string name="t9_map_row_4">4ghiíìïîǵ</string>
diff --git a/src/com/android/contacts/T9Search.java b/src/com/android/contacts/T9Search.java
index a4913a5ce..fe0b9a1b1 100644
--- a/src/com/android/contacts/T9Search.java
+++ b/src/com/android/contacts/T9Search.java
@@ -312,29 +312,36 @@ class T9Search {
}
ContactItem o = mItems.get(position);
+ if (o.name == null) {
+ holder.name.setText(mContext.getResources().getString(R.string.t9_add_to_contacts));
+ holder.number.setVisibility(View.GONE);
+ holder.icon.setImageResource(R.drawable.sym_action_add);
+ holder.icon.assignContactFromPhone(o.number, true);
+ } else {
+ holder.name.setText(o.name, TextView.BufferType.SPANNABLE);
+ holder.number.setText(o.normalNumber + " (" + o.groupType + ")", TextView.BufferType.SPANNABLE);
+ holder.number.setVisibility(View.VISIBLE);
+ if (o.nameMatchId != -1) {
+ Spannable s = (Spannable) holder.name.getText();
+ int nameStart = o.normalName.indexOf(mPrevInput);
+ s.setSpan(new ForegroundColorSpan(Color.WHITE),
+ nameStart, nameStart + mPrevInput.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+ holder.name.setText(s);
+ }
+ if (o.numberMatchId != -1) {
+ Spannable s = (Spannable) holder.number.getText();
+ int numberStart = o.numberMatchId;
+ s.setSpan(new ForegroundColorSpan(Color.WHITE),
+ numberStart, numberStart + mPrevInput.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+ holder.number.setText(s);
+ }
+ if (o.photo != null)
+ holder.icon.setImageBitmap(o.photo);
+ else
+ holder.icon.setImageResource(R.drawable.ic_contact_list_picture);
- holder.name.setText(o.name, TextView.BufferType.SPANNABLE);
- holder.number.setText(o.number + " (" + o.groupType + ")", TextView.BufferType.SPANNABLE);
- if (o.nameMatchId != -1) {
- Spannable s = (Spannable) holder.name.getText();
- int nameStart = o.normalName.indexOf(mPrevInput);
- s.setSpan(new ForegroundColorSpan(Color.WHITE),
- nameStart, nameStart + mPrevInput.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
- holder.name.setText(s);
+ holder.icon.assignContactFromPhone(o.number, true);
}
- if (o.numberMatchId != -1) {
- Spannable s = (Spannable) holder.number.getText();
- int numberStart = o.numberMatchId;
- s.setSpan(new ForegroundColorSpan(Color.WHITE),
- numberStart, numberStart + mPrevInput.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
- holder.number.setText(s);
- }
- if (o.photo != null)
- holder.icon.setImageBitmap(o.photo);
- else
- holder.icon.setImageResource(R.drawable.ic_contact_list_picture);
-
- holder.icon.assignContactFromPhone(o.number, true);
return convertView;
}
@@ -346,4 +353,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..2c83f64dd 100644
--- a/src/com/android/contacts/TwelveKeyDialer.java
+++ b/src/com/android/contacts/TwelveKeyDialer.java
@@ -53,11 +53,9 @@ import android.telephony.PhoneNumberUtils;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
import android.text.Editable;
-import android.text.Spannable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.DialerKeyListener;
-import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -79,7 +77,6 @@ import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
-import android.widget.QuickContactBadge;
import android.widget.TextView;
import android.widget.ToggleButton;
import android.widget.ViewSwitcher;
@@ -271,6 +268,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
mT9ListTop = (ListView) findViewById(R.id.t9listtop);
if (mT9ListTop != null) {
mT9ListTop.setOnItemClickListener(this);
+ mT9ListTop.setTag(new ContactItem());
}
mT9Toggle = (ToggleButton) findViewById(R.id.t9toggle);
if (mT9Toggle != null) {
@@ -583,13 +581,13 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
updateDialer();
}
-
/**
* Hides the topresult layout
* Needed to reclaim the space when T9 is off.
*/
private void hideT9 () {
if (!isT9On()) {
+ toggleT9();
mT9Top.setVisibility(View.GONE);
} else {
mT9Top.setVisibility(View.VISIBLE);
@@ -601,10 +599,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();
@@ -622,6 +616,12 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
if (length > 0) {
if (sT9Search != null) {
T9SearchResult result = sT9Search.search(mDigits.getText().toString());
+ if (mT9AdapterTop == null) {
+ mT9AdapterTop = sT9Search.new T9Adapter(this, 0, new ArrayList<ContactItem>(),getLayoutInflater());
+ mT9AdapterTop.setNotifyOnChange(true);
+ } else {
+ mT9AdapterTop.clear();
+ }
if (result != null) {
if (mT9Adapter == null) {
mT9Adapter = sT9Search.new T9Adapter(this, 0, result.getResults(),getLayoutInflater());
@@ -636,28 +636,26 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
mT9List.setAdapter(mT9Adapter);
}
- if (mT9AdapterTop == null) {
- mT9AdapterTop = sT9Search.new T9Adapter(this, 0, new ArrayList<ContactItem>(),getLayoutInflater());
- mT9AdapterTop.setNotifyOnChange(true);
- } else {
- mT9AdapterTop.clear();
- }
mT9AdapterTop.add(result.getTopContact());
- if (mT9ListTop.getAdapter() == null) {
- mT9ListTop.setAdapter(mT9AdapterTop);
- }
-
- mT9ListTop.setVisibility(View.VISIBLE);
if (result.getNumResults()> 1) {
mT9Toggle.setVisibility(View.VISIBLE);
} else {
mT9Toggle.setVisibility(View.GONE);
+ toggleT9();
}
+ mT9Toggle.setTag(null);
} else {
- mT9ListTop.setVisibility(View.INVISIBLE);
- mT9Toggle.setVisibility(View.INVISIBLE);
+ ContactItem contact = (ContactItem) mT9ListTop.getTag();
+ contact.number = mDigits.getText().toString();
+ mT9AdapterTop.add(contact);
+ mT9Toggle.setTag(new Boolean(true));
+ mT9Toggle.setVisibility(View.GONE);
toggleT9();
}
+ mT9ListTop.setVisibility(View.VISIBLE);
+ if (mT9ListTop.getAdapter() == null) {
+ mT9ListTop.setAdapter(mT9AdapterTop);
+ }
}
} else {
mT9ListTop.setVisibility(View.INVISIBLE);
@@ -1142,6 +1140,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
// Only if set in options.
mDigits.setText(mLastNumberDialed);
mDigits.setSelection(mDigits.length());
+ searchContacts();
return;
} else {
// Rare case: there's no "last number dialed". There's
@@ -1238,7 +1237,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();
@@ -1361,10 +1360,16 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener,
*/
public void onItemClick(AdapterView parent, View v, int position, long id) {
if (parent == mT9List || parent == mT9ListTop) {
- if (parent == mT9List)
+ if (parent == mT9List) {
mDigits.setText(mT9Adapter.getItem(position).number);
- else
- mDigits.setText(mT9AdapterTop.getItem(position).number);
+ } else {
+ if (mT9Toggle.getTag() == null) {
+ mDigits.setText(mT9AdapterTop.getItem(position).number);
+ } else {
+ addToContacts();
+ return;
+ }
+ }
mDigits.setSelection(mDigits.length());
if (dialOnTap()) {
dialButtonPressed();
diff --git a/src/com/android/contacts/ui/EditContactActivity.java b/src/com/android/contacts/ui/EditContactActivity.java
index 4c9d92092..a604e7306 100644
--- a/src/com/android/contacts/ui/EditContactActivity.java
+++ b/src/com/android/contacts/ui/EditContactActivity.java
@@ -1397,6 +1397,8 @@ public final class EditContactActivity extends Activity
if (!skipAccountTypeCheck) {
if (oneSource.accountType == null) {
return 1;
+ } else if (twoSource.accountType == null) {
+ return -1;
}
value = oneSource.accountType.compareTo(twoSource.accountType);
if (value != 0) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 10:55:21 +0000