diff options
| -rw-r--r-- | res/layout/call_log_fragment.xml | 5 | ||||
| -rw-r--r-- | res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | src/com/android/dialer/list/RegularSearchListAdapter.java | 18 |
3 files changed, 21 insertions, 3 deletions
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml index cee6af15e..a5a307207 100644 --- a/res/layout/call_log_fragment.xml +++ b/res/layout/call_log_fragment.xml @@ -41,14 +41,15 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/background_dialer_call_log" - android:padding="8dp" /> + android:paddingStart="@dimen/call_log_horizontal_margin" + android:paddingEnd="@dimen/call_log_horizontal_margin" /> <include android:id="@+id/empty_list_view" android:layout_width="match_parent" android:layout_height="match_parent" layout="@layout/empty_list_view" - android:visibility="gone"/> + android:visibility="gone" /> </FrameLayout> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b9b3aa587..d4a36cfb1 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -22,6 +22,7 @@ <dimen name="remove_text_size">16dp</dimen> <!-- Call Log --> + <dimen name="call_log_horizontal_margin">8dp</dimen> <dimen name="call_log_call_action_size">32dp</dimen> <dimen name="call_log_call_action_width">54dp</dimen> <dimen name="call_log_icon_margin">4dp</dimen> diff --git a/src/com/android/dialer/list/RegularSearchListAdapter.java b/src/com/android/dialer/list/RegularSearchListAdapter.java index 3c55bc012..6c7045814 100644 --- a/src/com/android/dialer/list/RegularSearchListAdapter.java +++ b/src/com/android/dialer/list/RegularSearchListAdapter.java @@ -68,7 +68,9 @@ public class RegularSearchListAdapter extends DialerPhoneNumberListAdapter { @Override public void setQueryString(String queryString) { - final boolean showNumberShortcuts = !TextUtils.isEmpty(getFormattedQueryString()); + // Don't show actions if the query string contains a letter. + final boolean showNumberShortcuts = !TextUtils.isEmpty(getFormattedQueryString()) + && hasDigitsInQueryString(); boolean changed = false; changed |= setShortcutEnabled(SHORTCUT_DIRECT_CALL, showNumberShortcuts); changed |= setShortcutEnabled(SHORTCUT_SEND_SMS_MESSAGE, showNumberShortcuts); @@ -79,4 +81,18 @@ public class RegularSearchListAdapter extends DialerPhoneNumberListAdapter { } super.setQueryString(queryString); } + + /** + * Whether there is at least one digit in the query string. + */ + private boolean hasDigitsInQueryString() { + String queryString = getQueryString(); + int length = queryString.length(); + for (int i = 0; i < length; i++) { + if (Character.isDigit(queryString.charAt(i))) { + return true; + } + } + return false; + } } |