From 3fb38375282be6f8b2da212b0afbb99ecec57f71 Mon Sep 17 00:00:00 2001 From: Xiao Bao Clark Date: Sun, 9 Aug 2015 11:22:57 +1000 Subject: [PATCH 01/11] Removed extra "xmlns:android". This fixes a lint error --- res/layout/filebrowser_content.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/res/layout/filebrowser_content.xml b/res/layout/filebrowser_content.xml index f12e7b5d..a5bb9db3 100644 --- a/res/layout/filebrowser_content.xml +++ b/res/layout/filebrowser_content.xml @@ -52,7 +52,6 @@ THE SOFTWARE. /> Date: Sun, 9 Aug 2015 11:33:40 +1000 Subject: [PATCH 02/11] Explicitly set a LinearLayout to "horizontal". This fixes a lint error --- .../music_bottom_playback_bg.9.png | Bin 223 -> 335 bytes res/layout/library_content.xml | 1 + 2 files changed, 1 insertion(+) diff --git a/res/drawable-hdpi/music_bottom_playback_bg.9.png b/res/drawable-hdpi/music_bottom_playback_bg.9.png index 45ab1c002428c09840f6fca455acff295763b64e..afe8bfc047231b06505c38ff27d5383961386ab3 100644 GIT binary patch delta 319 zcmcc5c%Es3WIY=L1H+ShkCrkpFp7D)IEGZ*dV4oI>kxy8>%|K%#hgPv1tgiwYF93h zIrrhq;s^P^12x{>WB&@;9Z|oVT5SzC1|($K#J2E5-lR?Qfq_ z@bFOU|NI}j)+xHSx$h_ts)?L7K}avgg2nE9u?MHPU$g&Zk)T8M8$aBBD;9L9_40%3 zuT7VyEq<N+Jl|~gNnh^)z4*} HQ$iB}k(QS@ delta 206 zcmX@lbf0m8WIYQ51B2gnEj=K$%+tj&B;(%O*&79$0z_EeTkf~}ZLnEHSbC$ev;g;o zo<`n0bCrU^_xvs@)i=xjH+e8le!{fVUVG<#iSLgsPl{Ig>`7D2KPH=(|8(gm*L@RC z*6;h8_pUMcp7QqtUr*kZIryfw$lTq)y6NWcCwYAdWh|SOXSmBAe8Z83BKRGqG`vnr vZim&+iU(87Pab?9@a+87#d*( From fbacc48b3ecb351dd150e3a8c59ab68d91c13987 Mon Sep 17 00:00:00 2001 From: Xiao Bao Clark Date: Sun, 9 Aug 2015 11:34:33 +1000 Subject: [PATCH 03/11] Removed unused layout "library_controls". This fixes a lint error --- res/layout/library_controls.xml | 70 --------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 res/layout/library_controls.xml diff --git a/res/layout/library_controls.xml b/res/layout/library_controls.xml deleted file mode 100644 index 5533bd94..00000000 --- a/res/layout/library_controls.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - From 70954bc5b9bc487fdb5aab60de5a6e17ef6a836a Mon Sep 17 00:00:00 2001 From: Xiao Bao Clark Date: Sun, 9 Aug 2015 12:02:13 +1000 Subject: [PATCH 04/11] Added height and width attributes to library_row and library_row_expandable. This fixes an inspection error --- res/layout/library_row.xml | 2 ++ res/layout/library_row_expandable.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/res/layout/library_row.xml b/res/layout/library_row.xml index 88855ebb..fa6cafc1 100644 --- a/res/layout/library_row.xml +++ b/res/layout/library_row.xml @@ -22,6 +22,8 @@ THE SOFTWARE. --> Date: Sun, 9 Aug 2015 12:27:24 +1000 Subject: [PATCH 05/11] Fixed various errors in JavaDoc references. --- .../android/vanilla/FullPlaybackActivity.java | 2 +- .../android/vanilla/NewPlaylistDialog.java | 1 - .../android/vanilla/Playlist.java | 2 +- .../android/dslv/DragSortController.java | 12 ++++----- .../android/dslv/DragSortCursorAdapter.java | 5 ++-- .../mobeta/android/dslv/DragSortListView.java | 9 +++---- .../dslv/ResourceDragSortCursorAdapter.java | 5 ++-- .../dslv/SimpleDragSortCursorAdapter.java | 26 ++++++++++--------- 8 files changed, 30 insertions(+), 32 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java index 614c5ebe..9d795228 100644 --- a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java +++ b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java @@ -647,7 +647,7 @@ public class FullPlaybackActivity extends PlaybackActivity */ private static final int MSG_UPDATE_POSITION = 17; /** - * Calls {@link #seekToProgress()}. + * Calls {@link PlaybackService#seekToProgress(int)}. */ private static final int MSG_SEEK_TO_PROGRESS = 18; diff --git a/src/ch/blinkenlights/android/vanilla/NewPlaylistDialog.java b/src/ch/blinkenlights/android/vanilla/NewPlaylistDialog.java index 8d4c8340..40e4fb62 100644 --- a/src/ch/blinkenlights/android/vanilla/NewPlaylistDialog.java +++ b/src/ch/blinkenlights/android/vanilla/NewPlaylistDialog.java @@ -77,7 +77,6 @@ public class NewPlaylistDialog extends Dialog implements TextWatcher, View.OnCli * disabled when the EditText contains this text. * @param actionText A string resource describing the default positive * action (e.g. "Create"). - * @param intent An optional intent to store with the dialog. */ public NewPlaylistDialog(Context context, String initialText, int actionText, PlaylistTask playlistTask) { diff --git a/src/ch/blinkenlights/android/vanilla/Playlist.java b/src/ch/blinkenlights/android/vanilla/Playlist.java index 04f307d0..31398d54 100644 --- a/src/ch/blinkenlights/android/vanilla/Playlist.java +++ b/src/ch/blinkenlights/android/vanilla/Playlist.java @@ -200,7 +200,7 @@ public class Playlist { * Copy content from one playlist to another * * @param resolver A ContentResolver to use. - * @param sourceid The Media.Audio.Playlists id of the source playlist + * @param sourceId The Media.Audio.Playlists id of the source playlist * @param destinationId The Media.Audio.Playlists id of the destination playlist */ private static void _copyToPlaylist(ContentResolver resolver, long sourceId, long destinationId) { diff --git a/src/com/mobeta/android/dslv/DragSortController.java b/src/com/mobeta/android/dslv/DragSortController.java index 665889ea..c1ab6e7b 100644 --- a/src/com/mobeta/android/dslv/DragSortController.java +++ b/src/com/mobeta/android/dslv/DragSortController.java @@ -15,8 +15,8 @@ import android.widget.AdapterView; * creation. * * An instance of this class is meant to be passed to the methods - * {@link DragSortListView#setTouchListener()} and - * {@link DragSortListView#setFloatViewManager()} of your + * {@link DragSortListView#setOnTouchListener(View.OnTouchListener)} and + * {@link DragSortListView#setFloatViewManager(DragSortListView.FloatViewManager)} of your * {@link DragSortListView} instance. */ public class DragSortController extends SimpleFloatViewManager implements View.OnTouchListener, GestureDetector.OnGestureListener { @@ -82,7 +82,7 @@ public class DragSortController extends SimpleFloatViewManager implements View.O private int mPositionX; /** - * Calls {@link #DragSortController(DragSortListView, int)} with a + * Calls {@link #DragSortController(DragSortListView, int, int, int)} with a * 0 drag handle id, FLING_RIGHT_REMOVE remove mode, * and ON_DOWN drag init. By default, sorting is enabled, and * removal is disabled. @@ -130,7 +130,7 @@ public class DragSortController extends SimpleFloatViewManager implements View.O /** * Set how a drag is initiated. Needs to be one of - * {@link ON_DOWN}, {@link ON_DRAG}, or {@link ON_LONG_PRESS}. + * {@link #ON_DOWN}, {@link #ON_DRAG}, or {@link #ON_LONG_PRESS}. * * @param mode The drag init mode. */ @@ -154,9 +154,7 @@ public class DragSortController extends SimpleFloatViewManager implements View.O } /** - * One of {@link CLICK_REMOVE}, {@link FLING_RIGHT_REMOVE}, - * {@link FLING_LEFT_REMOVE}, - * {@link SLIDE_RIGHT_REMOVE}, or {@link SLIDE_LEFT_REMOVE}. + * One of {@link #CLICK_REMOVE}, {@link #FLING_REMOVE} */ public void setRemoveMode(int mode) { mRemoveMode = mode; diff --git a/src/com/mobeta/android/dslv/DragSortCursorAdapter.java b/src/com/mobeta/android/dslv/DragSortCursorAdapter.java index 52413bbc..b718d7c8 100644 --- a/src/com/mobeta/android/dslv/DragSortCursorAdapter.java +++ b/src/com/mobeta/android/dslv/DragSortCursorAdapter.java @@ -8,6 +8,7 @@ import android.util.SparseIntArray; import android.view.View; import android.view.ViewGroup; import android.widget.CursorAdapter; +import android.widget.ListAdapter; /** @@ -107,7 +108,7 @@ public abstract class DragSortCursorAdapter extends CursorAdapter implements Dra /** * On drop, this updates the mapping between Cursor positions * and ListView positions. The Cursor is unchanged. Retrieve - * the current mapping with {@link getCursorPositions()}. + * the current mapping with {@link #getCursorPositions()}. * * @see DragSortListView.DropListener#drop(int, int) */ @@ -135,7 +136,7 @@ public abstract class DragSortCursorAdapter extends CursorAdapter implements Dra /** * On remove, this updates the mapping between Cursor positions * and ListView positions. The Cursor is unchanged. Retrieve - * the current mapping with {@link getCursorPositions()}. + * the current mapping with {@link #getCursorPositions()}. * * @see DragSortListView.RemoveListener#remove(int) */ diff --git a/src/com/mobeta/android/dslv/DragSortListView.java b/src/com/mobeta/android/dslv/DragSortListView.java index c3ff125d..00c2a020 100644 --- a/src/com/mobeta/android/dslv/DragSortListView.java +++ b/src/com/mobeta/android/dslv/DragSortListView.java @@ -630,7 +630,7 @@ public class DragSortListView extends ListView { * a heavily wrapped ListAdapter (DragSortListView wraps the * input ListAdapter {\emph and} ListView wraps the wrapped one). * - * @return The ListAdapter set as the argument of {@link setAdapter()} + * @return The ListAdapter set as the argument of {@link #setAdapter(ListAdapter)} */ public ListAdapter getInputAdapter() { if (mAdapterWrapper == null) { @@ -903,8 +903,6 @@ public class DragSortListView extends ListView { * * @param position * @param top - * @param height Height of item at position. If -1, this function - * calculates this height. * * @return Shuffle line between position-1 and position (for * the given view of the list; that is, for when top of item at @@ -1468,7 +1466,7 @@ public class DragSortListView extends ListView { } /** - * Cancel a drag. Calls {@link #stopDrag(boolean, boolean)} with + * Cancel a drag. Calls {@link DragScroller#stopScrolling(boolean)} with * true as the first argument. */ public void cancelDrag() { @@ -2455,7 +2453,6 @@ public class DragSortListView extends ListView { * and the offset provided in {@link DragSortListView#startDrag}. * @param touch The current touch location (relative to DSLV * top-left). - * @param pendingScroll */ public void onDragFloatView(View floatView, Point location, Point touch); @@ -2482,7 +2479,7 @@ public class DragSortListView extends ListView { * Allows for easy toggling between a DragSortListView * and a regular old ListView. If enabled, items are * draggable, where the drag init mode determines how - * items are lifted (see {@link setDragInitMode(int)}). + * items are lifted (see {@link DragSortController#setDragInitMode(int)}). * If disabled, items cannot be dragged. * * @param enabled Set true to enable list diff --git a/src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java b/src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java index f2d08107..13baa7da 100644 --- a/src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java +++ b/src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java @@ -21,6 +21,7 @@ import android.database.Cursor; import android.view.View; import android.view.ViewGroup; import android.view.LayoutInflater; +import android.widget.CursorAdapter; // taken from v4 rev. 10 ResourceCursorAdapter.java @@ -61,7 +62,7 @@ public abstract class ResourceDragSortCursorAdapter extends DragSortCursorAdapte /** * Constructor with default behavior as per * {@link CursorAdapter#CursorAdapter(Context, Cursor, boolean)}; it is recommended - * you not use this, but instead {@link #ResourceCursorAdapter(Context, int, Cursor, int)}. + * you not use this, but instead {@link #ResourceDragSortCursorAdapter(Context, int, Cursor, int)}. * When using this constructor, {@link #FLAG_REGISTER_CONTENT_OBSERVER} * will always be set. * @@ -100,7 +101,7 @@ public abstract class ResourceDragSortCursorAdapter extends DragSortCursorAdapte /** * Inflates view(s) from the specified XML file. * - * @see android.widget.CursorAdapter#newView(android.content.Context, + * @see CursorAdapter#newView(android.content.Context, * android.database.Cursor, ViewGroup) */ @Override diff --git a/src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java b/src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java index 7a76ea9d..00505793 100644 --- a/src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java +++ b/src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java @@ -22,6 +22,8 @@ import android.net.Uri; import android.view.View; import android.widget.TextView; import android.widget.ImageView; +import android.widget.CursorAdapter; +import android.widget.SimpleCursorAdapter; // taken from sdk/sources/android-16/android/widget/SimpleCursorAdapter.java @@ -128,10 +130,10 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * * @throws IllegalStateException if binding cannot occur * - * @see android.widget.CursorAdapter#bindView(android.view.View, + * @see CursorAdapter#bindView(android.view.View, * android.content.Context, android.database.Cursor) * @see #getViewBinder() - * @see #setViewBinder(android.widget.SimpleCursorAdapter.ViewBinder) + * @see #setViewBinder(ViewBinder) * @see #setViewImage(ImageView, String) * @see #setViewText(TextView, String) */ @@ -175,7 +177,7 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * @return a ViewBinder or null if the binder does not exist * * @see #bindView(android.view.View, android.content.Context, android.database.Cursor) - * @see #setViewBinder(android.widget.SimpleCursorAdapter.ViewBinder) + * @see #setViewBinder(ViewBinder) */ public ViewBinder getViewBinder() { return mViewBinder; @@ -238,9 +240,9 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * * @return a valid index in the current Cursor or -1 * - * @see android.widget.CursorAdapter#convertToString(android.database.Cursor) + * @see CursorAdapter#convertToString(android.database.Cursor) * @see #setStringConversionColumn(int) - * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter) + * @see #setCursorToStringConverter(CursorToStringConverter) * @see #getCursorToStringConverter() */ public int getStringConversionColumn() { @@ -256,9 +258,9 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * @param stringConversionColumn a valid index in the current Cursor or -1 to use the default * conversion mechanism * - * @see android.widget.CursorAdapter#convertToString(android.database.Cursor) + * @see CursorAdapter#convertToString(android.database.Cursor) * @see #getStringConversionColumn() - * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter) + * @see #setCursorToStringConverter(CursorToStringConverter) * @see #getCursorToStringConverter() */ public void setStringConversionColumn(int stringConversionColumn) { @@ -272,10 +274,10 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * @return null if the converter does not exist or an instance of * {@link android.widget.SimpleCursorAdapter.CursorToStringConverter} * - * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter) + * @see #setCursorToStringConverter(CursorToStringConverter) * @see #getStringConversionColumn() * @see #setStringConversionColumn(int) - * @see android.widget.CursorAdapter#convertToString(android.database.Cursor) + * @see CursorAdapter#convertToString(android.database.Cursor) */ public CursorToStringConverter getCursorToStringConverter() { return mCursorToStringConverter; @@ -288,10 +290,10 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * @param cursorToStringConverter the Cursor to String converter, or * null to remove the converter * - * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter) + * @see #setCursorToStringConverter(CursorToStringConverter) * @see #getStringConversionColumn() * @see #setStringConversionColumn(int) - * @see android.widget.CursorAdapter#convertToString(android.database.Cursor) + * @see CursorAdapter#convertToString(android.database.Cursor) */ public void setCursorToStringConverter(CursorToStringConverter cursorToStringConverter) { mCursorToStringConverter = cursorToStringConverter; @@ -405,7 +407,7 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * This class can be used by external clients of SimpleCursorAdapter * to define how the Cursor should be converted to a String. * - * @see android.widget.CursorAdapter#convertToString(android.database.Cursor) + * @see CursorAdapter#convertToString(android.database.Cursor) */ public static interface CursorToStringConverter { /** From be43b4501d58a610d16388cf5ddfb993ecf2a320 Mon Sep 17 00:00:00 2001 From: Xiao Bao Clark Date: Sun, 9 Aug 2015 12:30:57 +1000 Subject: [PATCH 06/11] Reverted change to 9patch image --- .../music_bottom_playback_bg.9.png | Bin 335 -> 223 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable-hdpi/music_bottom_playback_bg.9.png b/res/drawable-hdpi/music_bottom_playback_bg.9.png index afe8bfc047231b06505c38ff27d5383961386ab3..45ab1c002428c09840f6fca455acff295763b64e 100644 GIT binary patch delta 206 zcmX@lbf0m8WIYQ51B2gnEj=K$%+tj&B;(%O*&79$0z_EeTkf~}ZLnEHSbC$ev;g;o zo<`n0bCrU^_xvs@)i=xjH+e8le!{fVUVG<#iSLgsPl{Ig>`7D2KPH=(|8(gm*L@RC z*6;h8_pUMcp7QqtUr*kZIryfw$lTq)y6NWcCwYAdWh|SOXSmBAe8Z83BKRGqG`vnr vZim&+iU(87Pab?9@a+87#d*(kxy8>%|K%#hgPv1tgiwYF93h zIrrhq;s^P^12x{>WB&@;9Z|oVT5SzC1|($K#J2E5-lR?Qfq_ z@bFOU|NI}j)+xHSx$h_ts)?L7K}avgg2nE9u?MHPU$g&Zk)T8M8$aBBD;9L9_40%3 zuT7VyEq<N+Jl|~gNnh^)z4*} HQ$iB}k(QS@ From b9ad4c8a80988aaeb0ba61396740cb41c630a27c Mon Sep 17 00:00:00 2001 From: Xiao Bao Clark Date: Sat, 22 Aug 2015 07:48:43 +1000 Subject: [PATCH 07/11] Reverted changes to DSLV to keep consistency with upstream DSLV source --- .../android/dslv/DragSortController.java | 12 +++++---- .../android/dslv/DragSortCursorAdapter.java | 5 ++-- .../mobeta/android/dslv/DragSortListView.java | 9 ++++--- .../dslv/ResourceDragSortCursorAdapter.java | 5 ++-- .../dslv/SimpleDragSortCursorAdapter.java | 26 +++++++++---------- 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/com/mobeta/android/dslv/DragSortController.java b/src/com/mobeta/android/dslv/DragSortController.java index c1ab6e7b..665889ea 100644 --- a/src/com/mobeta/android/dslv/DragSortController.java +++ b/src/com/mobeta/android/dslv/DragSortController.java @@ -15,8 +15,8 @@ import android.widget.AdapterView; * creation. * * An instance of this class is meant to be passed to the methods - * {@link DragSortListView#setOnTouchListener(View.OnTouchListener)} and - * {@link DragSortListView#setFloatViewManager(DragSortListView.FloatViewManager)} of your + * {@link DragSortListView#setTouchListener()} and + * {@link DragSortListView#setFloatViewManager()} of your * {@link DragSortListView} instance. */ public class DragSortController extends SimpleFloatViewManager implements View.OnTouchListener, GestureDetector.OnGestureListener { @@ -82,7 +82,7 @@ public class DragSortController extends SimpleFloatViewManager implements View.O private int mPositionX; /** - * Calls {@link #DragSortController(DragSortListView, int, int, int)} with a + * Calls {@link #DragSortController(DragSortListView, int)} with a * 0 drag handle id, FLING_RIGHT_REMOVE remove mode, * and ON_DOWN drag init. By default, sorting is enabled, and * removal is disabled. @@ -130,7 +130,7 @@ public class DragSortController extends SimpleFloatViewManager implements View.O /** * Set how a drag is initiated. Needs to be one of - * {@link #ON_DOWN}, {@link #ON_DRAG}, or {@link #ON_LONG_PRESS}. + * {@link ON_DOWN}, {@link ON_DRAG}, or {@link ON_LONG_PRESS}. * * @param mode The drag init mode. */ @@ -154,7 +154,9 @@ public class DragSortController extends SimpleFloatViewManager implements View.O } /** - * One of {@link #CLICK_REMOVE}, {@link #FLING_REMOVE} + * One of {@link CLICK_REMOVE}, {@link FLING_RIGHT_REMOVE}, + * {@link FLING_LEFT_REMOVE}, + * {@link SLIDE_RIGHT_REMOVE}, or {@link SLIDE_LEFT_REMOVE}. */ public void setRemoveMode(int mode) { mRemoveMode = mode; diff --git a/src/com/mobeta/android/dslv/DragSortCursorAdapter.java b/src/com/mobeta/android/dslv/DragSortCursorAdapter.java index b718d7c8..52413bbc 100644 --- a/src/com/mobeta/android/dslv/DragSortCursorAdapter.java +++ b/src/com/mobeta/android/dslv/DragSortCursorAdapter.java @@ -8,7 +8,6 @@ import android.util.SparseIntArray; import android.view.View; import android.view.ViewGroup; import android.widget.CursorAdapter; -import android.widget.ListAdapter; /** @@ -108,7 +107,7 @@ public abstract class DragSortCursorAdapter extends CursorAdapter implements Dra /** * On drop, this updates the mapping between Cursor positions * and ListView positions. The Cursor is unchanged. Retrieve - * the current mapping with {@link #getCursorPositions()}. + * the current mapping with {@link getCursorPositions()}. * * @see DragSortListView.DropListener#drop(int, int) */ @@ -136,7 +135,7 @@ public abstract class DragSortCursorAdapter extends CursorAdapter implements Dra /** * On remove, this updates the mapping between Cursor positions * and ListView positions. The Cursor is unchanged. Retrieve - * the current mapping with {@link #getCursorPositions()}. + * the current mapping with {@link getCursorPositions()}. * * @see DragSortListView.RemoveListener#remove(int) */ diff --git a/src/com/mobeta/android/dslv/DragSortListView.java b/src/com/mobeta/android/dslv/DragSortListView.java index 00c2a020..c3ff125d 100644 --- a/src/com/mobeta/android/dslv/DragSortListView.java +++ b/src/com/mobeta/android/dslv/DragSortListView.java @@ -630,7 +630,7 @@ public class DragSortListView extends ListView { * a heavily wrapped ListAdapter (DragSortListView wraps the * input ListAdapter {\emph and} ListView wraps the wrapped one). * - * @return The ListAdapter set as the argument of {@link #setAdapter(ListAdapter)} + * @return The ListAdapter set as the argument of {@link setAdapter()} */ public ListAdapter getInputAdapter() { if (mAdapterWrapper == null) { @@ -903,6 +903,8 @@ public class DragSortListView extends ListView { * * @param position * @param top + * @param height Height of item at position. If -1, this function + * calculates this height. * * @return Shuffle line between position-1 and position (for * the given view of the list; that is, for when top of item at @@ -1466,7 +1468,7 @@ public class DragSortListView extends ListView { } /** - * Cancel a drag. Calls {@link DragScroller#stopScrolling(boolean)} with + * Cancel a drag. Calls {@link #stopDrag(boolean, boolean)} with * true as the first argument. */ public void cancelDrag() { @@ -2453,6 +2455,7 @@ public class DragSortListView extends ListView { * and the offset provided in {@link DragSortListView#startDrag}. * @param touch The current touch location (relative to DSLV * top-left). + * @param pendingScroll */ public void onDragFloatView(View floatView, Point location, Point touch); @@ -2479,7 +2482,7 @@ public class DragSortListView extends ListView { * Allows for easy toggling between a DragSortListView * and a regular old ListView. If enabled, items are * draggable, where the drag init mode determines how - * items are lifted (see {@link DragSortController#setDragInitMode(int)}). + * items are lifted (see {@link setDragInitMode(int)}). * If disabled, items cannot be dragged. * * @param enabled Set true to enable list diff --git a/src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java b/src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java index 13baa7da..f2d08107 100644 --- a/src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java +++ b/src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java @@ -21,7 +21,6 @@ import android.database.Cursor; import android.view.View; import android.view.ViewGroup; import android.view.LayoutInflater; -import android.widget.CursorAdapter; // taken from v4 rev. 10 ResourceCursorAdapter.java @@ -62,7 +61,7 @@ public abstract class ResourceDragSortCursorAdapter extends DragSortCursorAdapte /** * Constructor with default behavior as per * {@link CursorAdapter#CursorAdapter(Context, Cursor, boolean)}; it is recommended - * you not use this, but instead {@link #ResourceDragSortCursorAdapter(Context, int, Cursor, int)}. + * you not use this, but instead {@link #ResourceCursorAdapter(Context, int, Cursor, int)}. * When using this constructor, {@link #FLAG_REGISTER_CONTENT_OBSERVER} * will always be set. * @@ -101,7 +100,7 @@ public abstract class ResourceDragSortCursorAdapter extends DragSortCursorAdapte /** * Inflates view(s) from the specified XML file. * - * @see CursorAdapter#newView(android.content.Context, + * @see android.widget.CursorAdapter#newView(android.content.Context, * android.database.Cursor, ViewGroup) */ @Override diff --git a/src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java b/src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java index 00505793..7a76ea9d 100644 --- a/src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java +++ b/src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java @@ -22,8 +22,6 @@ import android.net.Uri; import android.view.View; import android.widget.TextView; import android.widget.ImageView; -import android.widget.CursorAdapter; -import android.widget.SimpleCursorAdapter; // taken from sdk/sources/android-16/android/widget/SimpleCursorAdapter.java @@ -130,10 +128,10 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * * @throws IllegalStateException if binding cannot occur * - * @see CursorAdapter#bindView(android.view.View, + * @see android.widget.CursorAdapter#bindView(android.view.View, * android.content.Context, android.database.Cursor) * @see #getViewBinder() - * @see #setViewBinder(ViewBinder) + * @see #setViewBinder(android.widget.SimpleCursorAdapter.ViewBinder) * @see #setViewImage(ImageView, String) * @see #setViewText(TextView, String) */ @@ -177,7 +175,7 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * @return a ViewBinder or null if the binder does not exist * * @see #bindView(android.view.View, android.content.Context, android.database.Cursor) - * @see #setViewBinder(ViewBinder) + * @see #setViewBinder(android.widget.SimpleCursorAdapter.ViewBinder) */ public ViewBinder getViewBinder() { return mViewBinder; @@ -240,9 +238,9 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * * @return a valid index in the current Cursor or -1 * - * @see CursorAdapter#convertToString(android.database.Cursor) + * @see android.widget.CursorAdapter#convertToString(android.database.Cursor) * @see #setStringConversionColumn(int) - * @see #setCursorToStringConverter(CursorToStringConverter) + * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter) * @see #getCursorToStringConverter() */ public int getStringConversionColumn() { @@ -258,9 +256,9 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * @param stringConversionColumn a valid index in the current Cursor or -1 to use the default * conversion mechanism * - * @see CursorAdapter#convertToString(android.database.Cursor) + * @see android.widget.CursorAdapter#convertToString(android.database.Cursor) * @see #getStringConversionColumn() - * @see #setCursorToStringConverter(CursorToStringConverter) + * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter) * @see #getCursorToStringConverter() */ public void setStringConversionColumn(int stringConversionColumn) { @@ -274,10 +272,10 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * @return null if the converter does not exist or an instance of * {@link android.widget.SimpleCursorAdapter.CursorToStringConverter} * - * @see #setCursorToStringConverter(CursorToStringConverter) + * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter) * @see #getStringConversionColumn() * @see #setStringConversionColumn(int) - * @see CursorAdapter#convertToString(android.database.Cursor) + * @see android.widget.CursorAdapter#convertToString(android.database.Cursor) */ public CursorToStringConverter getCursorToStringConverter() { return mCursorToStringConverter; @@ -290,10 +288,10 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * @param cursorToStringConverter the Cursor to String converter, or * null to remove the converter * - * @see #setCursorToStringConverter(CursorToStringConverter) + * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter) * @see #getStringConversionColumn() * @see #setStringConversionColumn(int) - * @see CursorAdapter#convertToString(android.database.Cursor) + * @see android.widget.CursorAdapter#convertToString(android.database.Cursor) */ public void setCursorToStringConverter(CursorToStringConverter cursorToStringConverter) { mCursorToStringConverter = cursorToStringConverter; @@ -407,7 +405,7 @@ public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter { * This class can be used by external clients of SimpleCursorAdapter * to define how the Cursor should be converted to a String. * - * @see CursorAdapter#convertToString(android.database.Cursor) + * @see android.widget.CursorAdapter#convertToString(android.database.Cursor) */ public static interface CursorToStringConverter { /** From abe07ec61d8015215afa19c63b980d977229bd71 Mon Sep 17 00:00:00 2001 From: Xiao Bao Clark Date: Sat, 22 Aug 2015 08:30:57 +1000 Subject: [PATCH 08/11] Added width and height to actionbar_controls layout. This fixes a lint error --- res/layout/actionbar_controls.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/res/layout/actionbar_controls.xml b/res/layout/actionbar_controls.xml index c239e2d3..421634b7 100644 --- a/res/layout/actionbar_controls.xml +++ b/res/layout/actionbar_controls.xml @@ -23,6 +23,8 @@ THE SOFTWARE. Date: Sat, 22 Aug 2015 08:31:26 +1000 Subject: [PATCH 09/11] Fixed two JavaDoc params references --- src/ch/blinkenlights/android/vanilla/CoverCache.java | 2 +- src/ch/blinkenlights/android/vanilla/LazyCoverView.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/CoverCache.java b/src/ch/blinkenlights/android/vanilla/CoverCache.java index 4776b3a4..9defb52c 100644 --- a/src/ch/blinkenlights/android/vanilla/CoverCache.java +++ b/src/ch/blinkenlights/android/vanilla/CoverCache.java @@ -175,7 +175,7 @@ public class CoverCache { * Creates a new in-memory LRU cache * * @param context the application context - * @param int the lru cache size in bytes + * @param size the lru cache size in bytes */ public BitmapLruCache(Context context, int size) { super(size); diff --git a/src/ch/blinkenlights/android/vanilla/LazyCoverView.java b/src/ch/blinkenlights/android/vanilla/LazyCoverView.java index 5c112edd..70f6dabf 100644 --- a/src/ch/blinkenlights/android/vanilla/LazyCoverView.java +++ b/src/ch/blinkenlights/android/vanilla/LazyCoverView.java @@ -191,7 +191,7 @@ public class LazyCoverView extends ImageView * Updates the view with a cached bitmap * A fallback image will be used on cache miss * - * @param payload The cover message containing the cache key and view to use + * @param key The cover message containing the cache key and view to use */ public boolean drawFromCache(CoverCache.CoverKey key, boolean fadeIn) { boolean cacheHit = true; From 522a58b0683dd62bb6bbf93b5c52ba17ab94bf7a Mon Sep 17 00:00:00 2001 From: Xiao Bao Clark Date: Sat, 22 Aug 2015 09:33:08 +1000 Subject: [PATCH 10/11] Suppressed lint for call to setSelectionFromTop as it is in error. Added explanatory comments to that effect --- .../android/vanilla/ShowQueueActivity.java | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java b/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java index d13207a3..b6039198 100644 --- a/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java +++ b/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java @@ -19,8 +19,9 @@ package ch.blinkenlights.android.vanilla; import java.util.ArrayList; -import android.app.Activity; +import android.annotation.SuppressLint; import android.content.DialogInterface; +import android.os.Build; import android.os.Bundle; import android.os.Message; import android.view.View; @@ -29,7 +30,6 @@ import android.view.MenuItem; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemLongClickListener; -import android.widget.ListView; import com.mobeta.android.dslv.DragSortListView; public class ShowQueueActivity extends PlaybackActivity @@ -41,7 +41,7 @@ public class ShowQueueActivity extends PlaybackActivity private ShowQueueAdapter listAdapter; private PlaybackService mService; - @Override + @Override public void onCreate(Bundle savedInstanceState) { ThemeHelper.setTheme(this, R.style.BackActionBar); super.onCreate(savedInstanceState); @@ -84,7 +84,7 @@ public class ShowQueueActivity extends PlaybackActivity /** * Called after the user selected an action from the ActionBar - * + * * @param item The selected menu item */ @Override @@ -208,12 +208,25 @@ public class ShowQueueActivity extends PlaybackActivity listAdapter.add(mService.getSongByQueuePosition(i)); } - if (scroll == true) - mListView.setSelectionFromTop(spos, 0); /* scroll to currently playing song */ + if(scroll) + scrollToCurrentSong(spos); } }); } - - + + /** + * Scrolls to the current song
+ * We suppress the new api lint check as lint thinks + * {@link android.widget.AbsListView#setSelectionFromTop(int, int)} was only added in + * {@link Build.VERSION_CODES#JELLY_BEAN}, but it was actually added in API + * level 1
+ * + * Android reference: AbsListView.setSelectionFromTop() + * @param currentSongPosition The position in {@link #mListView} of the current song + */ + @SuppressLint("NewApi") + private void scrollToCurrentSong(int currentSongPosition){ + mListView.setSelectionFromTop(currentSongPosition, 0); /* scroll to currently playing song */ + } } From d413384f90295a67068309df81845689c6e3bd56 Mon Sep 17 00:00:00 2001 From: Xiao Bao Clark Date: Sat, 22 Aug 2015 09:34:06 +1000 Subject: [PATCH 11/11] Added TargetApi to setNextMediaPlayer per #185. This fixes a lint error --- src/ch/blinkenlights/android/vanilla/VanillaMediaPlayer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ch/blinkenlights/android/vanilla/VanillaMediaPlayer.java b/src/ch/blinkenlights/android/vanilla/VanillaMediaPlayer.java index dce062dd..9cbb291a 100644 --- a/src/ch/blinkenlights/android/vanilla/VanillaMediaPlayer.java +++ b/src/ch/blinkenlights/android/vanilla/VanillaMediaPlayer.java @@ -18,10 +18,13 @@ package ch.blinkenlights.android.vanilla; +import android.annotation.TargetApi; import android.content.Context; import android.content.Intent; import android.media.MediaPlayer; import android.media.audiofx.AudioEffect; +import android.os.Build; + import java.io.IOException; public class VanillaMediaPlayer extends MediaPlayer { @@ -74,6 +77,7 @@ public class VanillaMediaPlayer extends MediaPlayer { /** * Sets the next media player data source */ + @TargetApi(Build.VERSION_CODES.JELLY_BEAN) public void setNextMediaPlayer(VanillaMediaPlayer next) { super.setNextMediaPlayer(next); mHasNextMediaPlayer = (next != null);