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/values | |
| 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/values')
| -rw-r--r-- | app/src/main/res/values/styles.xml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c4a53b99..cfe446f3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -59,23 +59,6 @@ <item name="android:paddingLeft">16dip</item> </style> - <style name="DragDropListView"> - <item name="drag_enabled">true</item> - <item name="collapsed_height">1dp</item> - <item name="drag_scroll_start">1.0</item> - <item name="max_drag_scroll_speed">2.0</item> - <item name="float_alpha">0.6</item> - <item name="slide_shuffle_speed">0.3</item> - <item name="track_drag_sort">false</item> - <item name="use_default_controller">true</item> - <item name="drag_handle_id">@id/drag_handle</item> - <item name="sort_enabled">true</item> - <item name="remove_enabled">false</item> - <item name="remove_mode">flingRemove</item> - <item name="drag_start_mode">onLongPress</item> - <item name="float_background_color">@android:color/transparent</item> - </style> - <style name="MainAlbumButton"> <item name="android:drawablePadding">6dip</item> <item name="android:layout_width">fill_parent</item> |