summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2016-12-05 18:23:53 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-12-05 18:23:57 +0000
commit8c917322a7c1b59799629b7d19c4f072d0180ddc (patch)
tree4a17c6a6f1d3e694c863cbd73ea073ac40cf4fd1
parent9120012566607a1085d5c0c95de2777cac75cca8 (diff)
parent6b04f111006604348e7650fe1d7e63c2e590f7ff (diff)
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
-rw-r--r--core/res/res/layout/date_picker_material.xml16
1 files changed, 11 insertions, 5 deletions
diff --git a/core/res/res/layout/date_picker_material.xml b/core/res/res/layout/date_picker_material.xml
index 763f2a416bfb..dd8a45d26172 100644
--- a/core/res/res/layout/date_picker_material.xml
+++ b/core/res/res/layout/date_picker_material.xml
@@ -25,10 +25,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
- <include
- layout="@layout/date_picker_view_animator_material"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1" />
+ <ScrollView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fadeScrollbars="false"
+ android:scrollIndicators="top|bottom">
+ <include
+ layout="@layout/date_picker_view_animator_material"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" />
+ </ScrollView>
</LinearLayout>