diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-05-12 23:36:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-12 23:36:45 +0000 |
| commit | 350a670e7e580ebcb14b1ef8e0dd7b53d0ca912d (patch) | |
| tree | 18e4d4345ed6ffa8f81a7fca160ab70b6956ed56 /res | |
| parent | 757981a0ab530d7ae7fbd83679b5aea86d02746d (diff) | |
| parent | bd180af7f0b73b0dd79a7117fb0c14370ef4d12e (diff) | |
Merge "Use new nested scrolling APIs"
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/call_log_fragment.xml | 2 | ||||
| -rw-r--r-- | res/layout/phone_favorites_fragment.xml | 3 | ||||
| -rw-r--r-- | res/layout/show_all_contacts_fragment.xml | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml index 23c7b143c..b4714a333 100644 --- a/res/layout/call_log_fragment.xml +++ b/res/layout/call_log_fragment.xml @@ -67,7 +67,7 @@ android:fadingEdge="none" android:scrollbarStyle="outsideOverlay" android:divider="@null" - /> + android:nestedScrollingEnabled="true" /> <TextView android:id="@android:id/empty" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/res/layout/phone_favorites_fragment.xml b/res/layout/phone_favorites_fragment.xml index 76e5e9838..0b657df05 100644 --- a/res/layout/phone_favorites_fragment.xml +++ b/res/layout/phone_favorites_fragment.xml @@ -39,7 +39,8 @@ android:numColumns="@integer/contact_tile_column_count_in_favorites" android:clipToPadding="false" android:fadingEdge="none" - android:divider="@null" /> + android:divider="@null" + android:nestedScrollingEnabled="true" /> </FrameLayout> <include diff --git a/res/layout/show_all_contacts_fragment.xml b/res/layout/show_all_contacts_fragment.xml index ddc99e84b..6b89847a1 100644 --- a/res/layout/show_all_contacts_fragment.xml +++ b/res/layout/show_all_contacts_fragment.xml @@ -43,7 +43,8 @@ android:layout_marginStart="?attr/contact_browser_list_padding_left" android:layout_marginEnd="?attr/contact_browser_list_padding_right" android:fastScrollEnabled="true" - android:fadingEdge="none"/> + android:fadingEdge="none" + android:nestedScrollingEnabled="true" /> </FrameLayout> </LinearLayout> |