diff options
19 files changed, 14 insertions, 52 deletions
diff --git a/res/drawable-hdpi/ic_more_vert_24dp.png b/res/drawable-hdpi/ic_more_vert_24dp.png Binary files differnew file mode 100644 index 000000000..67f07e473 --- /dev/null +++ b/res/drawable-hdpi/ic_more_vert_24dp.png diff --git a/res/drawable-hdpi/overflow_thumbnail.png b/res/drawable-hdpi/overflow_thumbnail.png Binary files differdeleted file mode 100644 index 57db353f7..000000000 --- a/res/drawable-hdpi/overflow_thumbnail.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_more_vert_24dp.png b/res/drawable-mdpi/ic_more_vert_24dp.png Binary files differnew file mode 100644 index 000000000..017e45ede --- /dev/null +++ b/res/drawable-mdpi/ic_more_vert_24dp.png diff --git a/res/drawable-mdpi/overflow_thumbnail.png b/res/drawable-mdpi/overflow_thumbnail.png Binary files differdeleted file mode 100644 index c69937428..000000000 --- a/res/drawable-mdpi/overflow_thumbnail.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_more_vert_24dp.png b/res/drawable-xhdpi/ic_more_vert_24dp.png Binary files differnew file mode 100644 index 000000000..efab8a74f --- /dev/null +++ b/res/drawable-xhdpi/ic_more_vert_24dp.png diff --git a/res/drawable-xhdpi/overflow_thumbnail.png b/res/drawable-xhdpi/overflow_thumbnail.png Binary files differdeleted file mode 100644 index e538b9894..000000000 --- a/res/drawable-xhdpi/overflow_thumbnail.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_more_vert_24dp.png b/res/drawable-xxhdpi/ic_more_vert_24dp.png Binary files differnew file mode 100644 index 000000000..d32281307 --- /dev/null +++ b/res/drawable-xxhdpi/ic_more_vert_24dp.png diff --git a/res/drawable-xxhdpi/overflow_thumbnail.png b/res/drawable-xxhdpi/overflow_thumbnail.png Binary files differdeleted file mode 100644 index 7f3f73386..000000000 --- a/res/drawable-xxhdpi/overflow_thumbnail.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_more_vert_24dp.png b/res/drawable-xxxhdpi/ic_more_vert_24dp.png Binary files differnew file mode 100644 index 000000000..2f2cb3d00 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_more_vert_24dp.png diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml index f274a9d34..8b00fba61 100644 --- a/res/layout/phone_favorite_tile_view.xml +++ b/res/layout/phone_favorite_tile_view.xml @@ -108,7 +108,7 @@ <ImageButton android:id="@id/contact_tile_secondary_button" - android:src="@drawable/overflow_thumbnail" + android:src="@drawable/ic_more_vert_24dp" android:background="@drawable/item_background_material_dark" android:layout_height="@dimen/contact_tile_info_button_height_and_width" android:layout_width="@dimen/contact_tile_info_button_height_and_width" diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml index cc5e3868e..8a9e25f7f 100644 --- a/res/menu/dialtacts_options.xml +++ b/res/menu/dialtacts_options.xml @@ -30,6 +30,6 @@ android:title="@string/menu_newContact"/> <item android:id="@+id/menu_call_settings" - android:title="@string/dialer_settings_label" - android:orderInCategory="2" /> + android:title="@string/dialer_settings_label" /> + </menu> diff --git a/res/mipmap-xxxhdpi/ic_launcher_phone.png b/res/mipmap-xxxhdpi/ic_launcher_phone.png Binary files differindex 8c92ac132..26f51f153 100644 --- a/res/mipmap-xxxhdpi/ic_launcher_phone.png +++ b/res/mipmap-xxxhdpi/ic_launcher_phone.png diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml index 7efd086f5..4b5ef9b2e 100644 --- a/res/values-az-rAZ/strings.xml +++ b/res/values-az-rAZ/strings.xml @@ -20,7 +20,6 @@ <string name="applicationLabel" msgid="8490255569343340580">"Nömrə yığan"</string> <string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string> <string name="recentCallsIconLabel" msgid="1419116422359067949">"Zəng jurnalı"</string> - <string name="menu_sendTextMessage" msgid="6937343460284499306">"Mətnli mesaj göndərin"</string> <string name="recentCalls_callNumber" msgid="1756372533999226126">"Zəng <xliff:g id="NAME">%s</xliff:g>"</string> <string name="recentCalls_editNumberBeforeCall" msgid="7756171675833267857">"Zəng etmədən öncə nömrəyə düzəliş edin"</string> <string name="recentCalls_addToContact" msgid="1429899535546487008">"Kontaktlara əlavə edin"</string> @@ -124,5 +123,4 @@ <skip /> <string name="favorite_hidden_undo" msgid="2508998611039406474">"Geri qaytar"</string> <string name="search_shortcut_call_number" msgid="7277194656832895870">"<xliff:g id="NUMBER">%s</xliff:g> nömrəsinə zəng edin"</string> - <string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Kontaktlara əlavə edin"</string> </resources> diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 61aeed5b0..787b6fae4 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -238,7 +238,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O */ private String mVoiceSearchQuery; - private class OptionsPopupMenu extends PopupMenu { + protected class OptionsPopupMenu extends PopupMenu { public OptionsPopupMenu(Context context, View anchor) { super(context, anchor, Gravity.END); } @@ -808,7 +808,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O } } - private OptionsPopupMenu buildOptionsMenu(View invoker) { + protected OptionsPopupMenu buildOptionsMenu(View invoker) { final OptionsPopupMenu popupMenu = new OptionsPopupMenu(this, invoker); popupMenu.inflate(R.menu.dialtacts_options); final Menu menu = popupMenu.getMenu(); diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java index f466c417c..46c6de6c9 100644 --- a/src/com/android/dialer/SpecialCharSequenceMgr.java +++ b/src/com/android/dialer/SpecialCharSequenceMgr.java @@ -33,6 +33,7 @@ import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; import android.telephony.PhoneNumberUtils; import android.telephony.TelephonyManager; +import android.text.TextUtils; import android.util.Log; import android.view.WindowManager; import android.widget.EditText; @@ -310,13 +311,16 @@ public class SpecialCharSequenceMgr { List<String> deviceIds = new ArrayList<String>(); for (int slot = 0; slot < telephonyManager.getPhoneCount(); slot++) { - deviceIds.add(telephonyManager.getDeviceId(slot)); + String deviceId = telephonyManager.getDeviceId(slot); + if (!TextUtils.isEmpty(deviceId)) { + deviceIds.add(deviceId); + } } AlertDialog alert = new AlertDialog.Builder(context) .setTitle(labelResId) .setItems(deviceIds.toArray(new String[deviceIds.size()]), null) - .setPositiveButton(R.string.ok, null) + .setPositiveButton(android.R.string.ok, null) .setCancelable(false) .show(); return true; diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 121851733..e06155120 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -1250,48 +1250,6 @@ public class CallLogAdapter extends GroupingListAdapter mDayGroups.clear(); } - /* - * Get the number from the Contacts, if available, since sometimes - * the number provided by caller id may not be formatted properly - * depending on the carrier (roaming) in use at the time of the - * incoming call. - * Logic : If the caller-id number starts with a "+", use it - * Else if the number in the contacts starts with a "+", use that one - * Else if the number in the contacts is longer, use that one - */ - public String getBetterNumberFromContacts(String number, String countryIso) { - String matchingNumber = null; - // Look in the cache first. If it's not found then query the Phones db - NumberWithCountryIso numberCountryIso = new NumberWithCountryIso(number, countryIso); - ContactInfo ci = mContactInfoCache.getPossiblyExpired(numberCountryIso); - if (ci != null && ci != ContactInfo.EMPTY) { - matchingNumber = ci.number; - } else { - try { - Cursor phonesCursor = mContext.getContentResolver().query( - Uri.withAppendedPath(PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, number), - PhoneQuery._PROJECTION, null, null, null); - if (phonesCursor != null) { - try { - if (phonesCursor.moveToFirst()) { - matchingNumber = phonesCursor.getString(PhoneQuery.MATCHED_NUMBER); - } - } finally { - phonesCursor.close(); - } - } - } catch (Exception e) { - // Use the number from the call log - } - } - if (!TextUtils.isEmpty(matchingNumber) && - (matchingNumber.startsWith("+") - || matchingNumber.length() > number.length())) { - number = matchingNumber; - } - return number; - } - /** * Retrieves the call Ids represented by the current call log row. * diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java index 24ddc7351..000e139fe 100644 --- a/src/com/android/dialer/list/SearchFragment.java +++ b/src/com/android/dialer/list/SearchFragment.java @@ -22,6 +22,7 @@ import android.net.Uri; import android.os.Bundle; import android.provider.ContactsContract; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.view.animation.Interpolator; import android.widget.AbsListView; @@ -40,6 +41,7 @@ import com.android.dialer.util.DialerUtils; import com.android.phone.common.animation.AnimUtils; public class SearchFragment extends PhoneNumberPickerFragment { + private static final String TAG = SearchFragment.class.getSimpleName(); private static final String SMS_URI_PREFIX = "sms:"; private OnListFragmentScrolledListener mActivityScrollListener; @@ -156,6 +158,7 @@ public class SearchFragment extends PhoneNumberPickerFragment { final Intent intent; final String number; + Log.i(TAG, "onItemClick: shortcutType=" + shortcutType); switch (shortcutType) { case DialerPhoneNumberListAdapter.SHORTCUT_INVALID: super.onItemClick(position, id); diff --git a/tests/res/drawable/default_icon.png b/tests/res/drawable/default_icon.png Binary files differdeleted file mode 100644 index cea0eb3b7..000000000 --- a/tests/res/drawable/default_icon.png +++ /dev/null diff --git a/tests/res/xml/iconset.xml b/tests/res/xml/iconset.xml index ec3894566..2f7798db1 100644 --- a/tests/res/xml/iconset.xml +++ b/tests/res/xml/iconset.xml @@ -17,7 +17,6 @@ <icon-set xmlns:android="http://schemas.android.com/apk/res/android"> - <icon-default android:icon="@drawable/default_icon" /> <icon android:mimeType="vnd.android.cursor.item/phone" android:icon="@drawable/phone_icon" /> |
