summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-08-06 17:36:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-06 17:36:07 +0000
commitaf2087d887b82c38a700955dbdfdab448dced8e5 (patch)
tree77cc2994553d5e9ef028c237082fc5d64386a383
parent2b781a09efb3012b019fd7d23864b6389f5e26c5 (diff)
parentb6f2873cc2f0ad74298393043d546fed82d61c6e (diff)
am b6f2873c: am 772e6410: am 70da7606: Merge "Update directory header to not pin the headers and update style" into lmp-dev
* commit 'b6f2873cc2f0ad74298393043d546fed82d61c6e': Update directory header to not pin the headers and update style
-rw-r--r--res/values/dimens.xml2
-rw-r--r--src/com/android/dialer/list/SearchFragment.java9
2 files changed, 10 insertions, 1 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5b8c0df4e..4884bd219 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -110,7 +110,7 @@
<dimen name="search_box_expanded_text_margin_left">26dp</dimen>
<!-- Size of the icon (voice search, close search) in the search box. -->
<dimen name="search_box_icon_size">28dp</dimen>
- <dimen name="search_list_padding_top">8dp</dimen>
+ <dimen name="search_list_padding_top">16dp</dimen>
<dimen name="search_box_elevation">2dp</dimen>
<!-- Padding to the left and right of call log action buttons. -->
diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
index e2cea418f..5cb30b6b9 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -144,6 +144,15 @@ public class SearchFragment extends PhoneNumberPickerFragment {
}
@Override
+ protected void configureAdapter() {
+ super.configureAdapter();
+ final ContactEntryListAdapter adapter = getAdapter();
+ if (adapter != null) {
+ getAdapter().setPinnedPartitionHeadersEnabled(false);
+ }
+ }
+
+ @Override
protected void onItemClick(int position, long id) {
final DialerPhoneNumberListAdapter adapter = (DialerPhoneNumberListAdapter) getAdapter();
final int shortcutType = adapter.getShortcutTypeFromPosition(position);