diff options
author | Scott Jackson <daneren2005@gmail.com> | 2015-06-09 17:46:37 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2015-06-09 17:46:37 -0700 |
commit | 9d4876f4874d034177c4f012932ca936d85e40ac (patch) | |
tree | 05a4db08bf5f8471d42dd2a1a8ba352d16b447b7 /app/src/main/res/layout/create_user.xml | |
parent | 6caaca0cecd9f4f60f695a68c72eb662b4a45b34 (diff) | |
parent | 9f8e9b89bb2d564bcaf00309b38ed9c4d970aeb9 (diff) | |
download | dsub-9d4876f4874d034177c4f012932ca936d85e40ac.tar.gz dsub-9d4876f4874d034177c4f012932ca936d85e40ac.tar.bz2 dsub-9d4876f4874d034177c4f012932ca936d85e40ac.zip |
Merge branch 'SlideUpPanel2' into NavigationView
Conflicts:
app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
Diffstat (limited to 'app/src/main/res/layout/create_user.xml')
-rw-r--r-- | app/src/main/res/layout/create_user.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/src/main/res/layout/create_user.xml b/app/src/main/res/layout/create_user.xml index eac6e5cb..e2f6c4eb 100644 --- a/app/src/main/res/layout/create_user.xml +++ b/app/src/main/res/layout/create_user.xml @@ -67,11 +67,10 @@ android:layout_marginLeft="4dp" /> </LinearLayout> - <ListView + <android.support.v7.widget.RecyclerView android:id="@+id/settings_list" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1.0" - android:fastScrollEnabled="true"/> - + android:scrollbars="vertical"/> </LinearLayout>
\ No newline at end of file |