From a5d28561ea52b4ba2aaf58331e1f960b8b3360a3 Mon Sep 17 00:00:00 2001
From: dibakarece <dibakar.ece@gmail.com>
Date: Wed, 26 Dec 2018 23:22:27 +0530
Subject: [PATCH] AndroidX migrate

---
 .idea/caches/build_file_checksums.ser         |  Bin 0 -> 591 bytes
 .idea/codeStyles/Project.xml                  |   29 +
 .idea/compiler.xml                            |   22 -
 .idea/copyright/profiles_settings.xml         |    3 -
 .idea/gradle.xml                              |    1 -
 .idea/misc.xml                                |   15 +-
 .idea/vcs.xml                                 |    2 +-
 app/build.gradle                              |   30 +-
 .../ExampleInstrumentedTest.java              |    4 +-
 .../activity/MusicActivity.java               |   34 +-
 .../activity/SplashActivity.java              |    2 +-
 .../adapter/AdapterMusic.java                 |    4 +-
 .../slidinguppanel/SlidingUpPanelLayout.java  | 1413 ---------------
 .../slidinguppanel/ViewDragHelper.java        | 1591 -----------------
 app/src/main/res/layout/activity_music.xml    |    5 +-
 .../layout/include_slidingpanel_childone.xml  |    2 +-
 build.gradle                                  |    2 +-
 dmaudiostreamer/build.gradle                  |    8 +-
 gradle.properties                             |    2 +
 gradle/wrapper/gradle-wrapper.properties      |    4 +-
 20 files changed, 91 insertions(+), 3082 deletions(-)
 create mode 100644 .idea/caches/build_file_checksums.ser
 create mode 100644 .idea/codeStyles/Project.xml
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/copyright/profiles_settings.xml
 delete mode 100644 app/src/main/java/dm/audiostreamerdemo/slidinguppanel/SlidingUpPanelLayout.java
 delete mode 100644 app/src/main/java/dm/audiostreamerdemo/slidinguppanel/ViewDragHelper.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000000000000000000000000000000000000..4695dac1a327eb2d3ef60a51474484ce628de88d
GIT binary patch
literal 591
zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2
zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}<i#MFTj`TnT;dMa8(f)}9Fm!vT3nKt
zTj0aMpIeEdv4nx&Co8cmQNOe#Ge_SyvB0{bfPsNA{q?Ne^+0zCg5>l-a(W(##Th_(
zR`y#54~r#SWM*J;W8likPfT%3OfJbU@?_vF$tX%K&dAS6sVJ~_U;qK0at<IV0L1Ji
z3<8M-1u;n=r$fC}TExH<?X>2z_zyOYkOxc*3?Qo+1X7+D8|=8v%KdZurM)Sc<)T0*
z7N?e!Wagz8!!#B$)G@Gu)NU6weiJiMaQ8~h{EoJ;F4htT9uynk3csZB&E4{F>9f#S
z4rND`x=BFi<m4wO=755>AhoC@Gqt!Bt~l~a3P%Iq!gc+|?P|M^GRTxL$fV>ZmZoIp
z7nc;JCg!FVq51=^(LCt(Z)3@>5Ve3!M^<F-7cXH@b+(ELElw>ej&bpgfjU115vv$h
tUy<#(+0U?v<z)lsj5j}=>Pi>{@u=Rgcf!U?dhgW?3%{Gz)_c6F000)7&dvY;

literal 0
HcmV?d00001

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..30aa626
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 460bdfb..e254907 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,6 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="D:\Android\Android Studio\Installation22\Studio\gradle\gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4a04528..44a4802 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,26 +5,31 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="7">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="6">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3a945f2..130ccd2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
     defaultConfig {
         applicationId "dm.audiostreamerdemo"
         minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 4
-        versionName "1.0.3"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 28
+        versionCode 5
+        versionName "1.0.5"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -19,15 +19,17 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    //compile project(path: ':dmaudiostreamer')
-    compile 'com.github.dibakarece:dmaudiostreamer:v1.0.4'
-    compile'com.nineoldandroids:library:2.4.0'
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.google.code.gson:gson:2.6.2'
-
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(path: ':dmaudiostreamer')
+//    compile 'com.github.dibakarece:dmaudiostreamer:v1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.mediarouter:mediarouter:1.0.0'
+    implementation'com.nineoldandroids:library:2.4.0'
+    implementation 'com.google.code.gson:gson:2.6.2'
+    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    implementation 'com.github.hannesa2:AndroidSlidingUpPanel:3.5.0'
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/app/src/androidTest/java/dm/audiostreamerdemo/ExampleInstrumentedTest.java b/app/src/androidTest/java/dm/audiostreamerdemo/ExampleInstrumentedTest.java
index 9986db3..1331371 100644
--- a/app/src/androidTest/java/dm/audiostreamerdemo/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/dm/audiostreamerdemo/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package dm.audiostreamerdemo;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/app/src/main/java/dm/audiostreamerdemo/activity/MusicActivity.java b/app/src/main/java/dm/audiostreamerdemo/activity/MusicActivity.java
index 239d570..ca37969 100644
--- a/app/src/main/java/dm/audiostreamerdemo/activity/MusicActivity.java
+++ b/app/src/main/java/dm/audiostreamerdemo/activity/MusicActivity.java
@@ -12,8 +12,6 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.media.session.PlaybackStateCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.text.format.DateUtils;
 import android.view.View;
 import android.widget.ImageView;
@@ -28,12 +26,15 @@
 import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
+import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import dm.audiostreamer.AudioStreamingManager;
 import dm.audiostreamer.CurrentSessionCallback;
 import dm.audiostreamer.Logger;
@@ -42,7 +43,6 @@
 import dm.audiostreamerdemo.adapter.AdapterMusic;
 import dm.audiostreamerdemo.network.MusicBrowser;
 import dm.audiostreamerdemo.network.MusicLoaderListener;
-import dm.audiostreamerdemo.slidinguppanel.SlidingUpPanelLayout;
 import dm.audiostreamerdemo.widgets.LineProgress;
 import dm.audiostreamerdemo.widgets.PlayPauseView;
 import dm.audiostreamerdemo.widgets.Slider;
@@ -341,9 +341,9 @@ public void onClick(View v) {
         audioPg.setMax(0);
         audioPg.setOnValueChangedListener(this);
 
-        mLayout.setPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
+        mLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
             @Override
-            public void onPanelSlide(View panel, float slideOffset) {
+            public void onPanelSlide(View view, float slideOffset) {
                 if (slideOffset == 0.0f) {
                     isExpand = false;
                     slideBottomView.setVisibility(View.VISIBLE);
@@ -358,22 +358,22 @@ public void onPanelSlide(View panel, float slideOffset) {
             }
 
             @Override
-            public void onPanelExpanded(View panel) {
-                isExpand = true;
-            }
+            public void onPanelStateChanged(View view, SlidingUpPanelLayout.PanelState panelState, SlidingUpPanelLayout.PanelState panelState1) {
+                switch (panelState) {
+                    case EXPANDED:
+                        isExpand = true;
+                        break;
+                    case COLLAPSED:
+                        isExpand = false;
+                        break;
+                    default:
+                        isExpand = false;
+                        break;
+                }
 
-            @Override
-            public void onPanelCollapsed(View panel) {
-                isExpand = false;
             }
 
-            @Override
-            public void onPanelAnchored(View panel) {
-            }
 
-            @Override
-            public void onPanelHidden(View panel) {
-            }
         });
 
         musicList = (ListView) findViewById(R.id.musicList);
diff --git a/app/src/main/java/dm/audiostreamerdemo/activity/SplashActivity.java b/app/src/main/java/dm/audiostreamerdemo/activity/SplashActivity.java
index 7d6c5a6..6b53b83 100644
--- a/app/src/main/java/dm/audiostreamerdemo/activity/SplashActivity.java
+++ b/app/src/main/java/dm/audiostreamerdemo/activity/SplashActivity.java
@@ -8,9 +8,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AppCompatActivity;
 import dm.audiostreamerdemo.R;
 
 public class SplashActivity extends AppCompatActivity {
diff --git a/app/src/main/java/dm/audiostreamerdemo/adapter/AdapterMusic.java b/app/src/main/java/dm/audiostreamerdemo/adapter/AdapterMusic.java
index fad7b89..8f2c643 100644
--- a/app/src/main/java/dm/audiostreamerdemo/adapter/AdapterMusic.java
+++ b/app/src/main/java/dm/audiostreamerdemo/adapter/AdapterMusic.java
@@ -10,8 +10,6 @@
 import android.graphics.Bitmap;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,6 +31,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import dm.audiostreamer.MediaMetaData;
 import dm.audiostreamerdemo.R;
 
diff --git a/app/src/main/java/dm/audiostreamerdemo/slidinguppanel/SlidingUpPanelLayout.java b/app/src/main/java/dm/audiostreamerdemo/slidinguppanel/SlidingUpPanelLayout.java
deleted file mode 100644
index 6400eb7..0000000
--- a/app/src/main/java/dm/audiostreamerdemo/slidinguppanel/SlidingUpPanelLayout.java
+++ /dev/null
@@ -1,1413 +0,0 @@
-/*
- * This is the source code of DMAudioStreaming for Android v. 1.0.0.
- * You should have received a copy of the license in this archive (see LICENSE).
- * Copyright @Dibakar_Mistry(dibakar.ece@gmail.com), 2017.
- */
-package dm.audiostreamerdemo.slidinguppanel;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewCompat;
-import android.util.AttributeSet;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityEvent;
-
-import dm.audiostreamerdemo.R;
-import com.nineoldandroids.view.animation.AnimatorProxy;
-
-public class SlidingUpPanelLayout extends ViewGroup {
-
-	private static final String TAG = SlidingUpPanelLayout.class.getSimpleName();
-
-	/**
-	 * Default peeking out panel height
-	 */
-	private static final int DEFAULT_PANEL_HEIGHT = 68; // dp;
-
-	/**
-	 * Default anchor point height
-	 */
-	private static final float DEFAULT_ANCHOR_POINT = 1.0f; // In relative %
-
-	/**
-	 * Default initial state for the component
-	 */
-	private static PanelState DEFAULT_SLIDE_STATE = PanelState.COLLAPSED;
-
-	/**
-	 * Default height of the shadow above the peeking out panel
-	 */
-	private static final int DEFAULT_SHADOW_HEIGHT = 4; // dp;
-
-	/**
-	 * If no fade color is given by default it will fade to 80% gray.
-	 */
-	private static final int DEFAULT_FADE_COLOR = 0x99000000;
-
-	/**
-	 * Default Minimum velocity that will be detected as a fling
-	 */
-	private static final int DEFAULT_MIN_FLING_VELOCITY = 400; // dips per
-																// second
-	/**
-	 * Default is set to false because that is how it was written
-	 */
-	private static final boolean DEFAULT_OVERLAY_FLAG = false;
-	/**
-	 * Default is set to true for clip panel for performance reasons
-	 */
-	private static final boolean DEFAULT_CLIP_PANEL_FLAG = true;
-	/**
-	 * Default attributes for layout
-	 */
-	private static final int[] DEFAULT_ATTRS = new int[] { android.R.attr.gravity };
-
-	/**
-	 * Minimum velocity that will be detected as a fling
-	 */
-	private int mMinFlingVelocity = DEFAULT_MIN_FLING_VELOCITY;
-
-	/**
-	 * The fade color used for the panel covered by the slider. 0 = no fading.
-	 */
-	private int mCoveredFadeColor = DEFAULT_FADE_COLOR;
-
-	/**
-	 * Default paralax length of the main view
-	 */
-	private static final int DEFAULT_PARALAX_OFFSET = 0;
-
-	/**
-	 * The paint used to dim the main layout when sliding
-	 */
-	private final Paint mCoveredFadePaint = new Paint();
-
-	/**
-	 * Drawable used to draw the shadow between panes.
-	 */
-	private final Drawable mShadowDrawable;
-
-	/**
-	 * The size of the overhang in pixels.
-	 */
-	private int mPanelHeight = -1;
-
-	/**
-	 * The size of the shadow in pixels.
-	 */
-	private int mShadowHeight = -1;
-
-	/**
-	 * Paralax offset
-	 */
-	private int mParallaxOffset = -1;
-
-	/**
-	 * True if the collapsed panel should be dragged up.
-	 */
-	private boolean mIsSlidingUp;
-
-	/**
-	 * Panel overlays the windows instead of putting it underneath it.
-	 */
-	private boolean mOverlayContent = DEFAULT_OVERLAY_FLAG;
-
-	/**
-	 * The main view is clipped to the main top border
-	 */
-	private boolean mClipPanel = DEFAULT_CLIP_PANEL_FLAG;
-
-	/**
-	 * If provided, the panel can be dragged by only this view. Otherwise, the
-	 * entire panel can be used for dragging.
-	 */
-	private View mDragView;
-
-	/**
-	 * If provided, the panel can be dragged by only this view. Otherwise, the
-	 * entire panel can be used for dragging.
-	 */
-	private int mDragViewResId = -1;
-
-	/**
-	 * The child view that can slide, if any.
-	 */
-	private View mSlideableView;
-
-	/**
-	 * The main view
-	 */
-	private View mMainView;
-
-	/**
-	 * Current state of the slideable view.
-	 */
-	public enum PanelState {
-		EXPANDED, COLLAPSED, ANCHORED, HIDDEN, DRAGGING
-	}
-
-	private PanelState mSlideState = DEFAULT_SLIDE_STATE;
-
-	/**
-	 * If the current slide state is DRAGGING, this will store the last non
-	 * dragging state
-	 */
-	private PanelState mLastNotDraggingSlideState = null;
-
-	/**
-	 * How far the panel is offset from its expanded position. range [0, 1]
-	 * where 0 = collapsed, 1 = expanded.
-	 */
-	private float mSlideOffset;
-
-	/**
-	 * How far in pixels the slideable panel may move.
-	 */
-	private int mSlideRange;
-
-	/**
-	 * A panel view is locked into internal scrolling or another condition that
-	 * is preventing a drag.
-	 */
-	private boolean mIsUnableToDrag;
-
-	/**
-	 * Flag indicating that sliding feature is enabled\disabled
-	 */
-	private boolean mIsTouchEnabled;
-
-	/**
-	 * Flag indicating if a drag view can have its own touch events. If set to
-	 * true, a drag view can scroll horizontally and have its own click
-	 * listener.
-	 *
-	 * Default is set to false.
-	 */
-	private boolean mIsUsingDragViewTouchEvents;
-
-	private float mInitialMotionX;
-	private float mInitialMotionY;
-	private float mAnchorPoint = 1.f;
-
-	private PanelSlideListener mPanelSlideListener;
-
-	private final ViewDragHelper mDragHelper;
-
-	/**
-	 * Stores whether or not the pane was expanded the last time it was
-	 * slideable. If expand/collapse operations are invoked this state is
-	 * modified. Used by instance state save/restore.
-	 */
-	private boolean mFirstLayout = true;
-
-	private final Rect mTmpRect = new Rect();
-
-	/**
-	 * Listener for monitoring events about sliding panes.
-	 */
-	public interface PanelSlideListener {
-		/**
-		 * Called when a sliding pane's position changes.
-		 * 
-		 * @param panel
-		 *            The child view that was moved
-		 * @param slideOffset
-		 *            The new offset of this sliding pane within its range, from
-		 *            0-1
-		 */
-		public void onPanelSlide(View panel, float slideOffset);
-
-		/**
-		 * Called when a sliding panel becomes slid completely collapsed.
-		 * 
-		 * @param panel
-		 *            The child view that was slid to an collapsed position
-		 */
-		public void onPanelCollapsed(View panel);
-
-		/**
-		 * Called when a sliding panel becomes slid completely expanded.
-		 * 
-		 * @param panel
-		 *            The child view that was slid to a expanded position
-		 */
-		public void onPanelExpanded(View panel);
-
-		/**
-		 * Called when a sliding panel becomes anchored.
-		 * 
-		 * @param panel
-		 *            The child view that was slid to a anchored position
-		 */
-		public void onPanelAnchored(View panel);
-
-		/**
-		 * Called when a sliding panel becomes completely hidden.
-		 * 
-		 * @param panel
-		 *            The child view that was slid to a hidden position
-		 */
-		public void onPanelHidden(View panel);
-	}
-
-	/**
-	 * No-op stubs for {@link PanelSlideListener}. If you only want to implement
-	 * a subset of the listener methods you can extend this instead of implement
-	 * the full interface.
-	 */
-	public static class SimplePanelSlideListener implements PanelSlideListener {
-		@Override
-		public void onPanelSlide(View panel, float slideOffset) {
-		}
-
-		@Override
-		public void onPanelCollapsed(View panel) {
-		}
-
-		@Override
-		public void onPanelExpanded(View panel) {
-		}
-
-		@Override
-		public void onPanelAnchored(View panel) {
-		}
-
-		@Override
-		public void onPanelHidden(View panel) {
-		}
-	}
-
-	public SlidingUpPanelLayout(Context context) {
-		this(context, null);
-	}
-
-	public SlidingUpPanelLayout(Context context, AttributeSet attrs) {
-		this(context, attrs, 0);
-	}
-
-	public SlidingUpPanelLayout(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-
-		if (isInEditMode()) {
-			mShadowDrawable = null;
-			mDragHelper = null;
-			return;
-		}
-
-		if (attrs != null) {
-			TypedArray defAttrs = context.obtainStyledAttributes(attrs, DEFAULT_ATTRS);
-
-			if (defAttrs != null) {
-				int gravity = defAttrs.getInt(0, Gravity.NO_GRAVITY);
-				setGravity(gravity);
-			}
-
-			defAttrs.recycle();
-
-			TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.SlidingUpPanelLayout);
-
-			if (ta != null) {
-				mPanelHeight = ta.getDimensionPixelSize(R.styleable.SlidingUpPanelLayout_umanoPanelHeight, -1);
-				mShadowHeight = ta.getDimensionPixelSize(R.styleable.SlidingUpPanelLayout_umanoShadowHeight, -1);
-				mParallaxOffset = ta.getDimensionPixelSize(R.styleable.SlidingUpPanelLayout_umanoParalaxOffset, -1);
-
-				mMinFlingVelocity = ta.getInt(R.styleable.SlidingUpPanelLayout_umanoFlingVelocity, DEFAULT_MIN_FLING_VELOCITY);
-				mCoveredFadeColor = ta.getColor(R.styleable.SlidingUpPanelLayout_umanoFadeColor, DEFAULT_FADE_COLOR);
-
-				mDragViewResId = ta.getResourceId(R.styleable.SlidingUpPanelLayout_umanoDragView, -1);
-
-				mOverlayContent = ta.getBoolean(R.styleable.SlidingUpPanelLayout_umanoOverlay, DEFAULT_OVERLAY_FLAG);
-				mClipPanel = ta.getBoolean(R.styleable.SlidingUpPanelLayout_umanoClipPanel, DEFAULT_CLIP_PANEL_FLAG);
-
-				mAnchorPoint = ta.getFloat(R.styleable.SlidingUpPanelLayout_umanoAnchorPoint, DEFAULT_ANCHOR_POINT);
-
-				mSlideState = PanelState.values()[ta.getInt(R.styleable.SlidingUpPanelLayout_umanoInitialState, DEFAULT_SLIDE_STATE.ordinal())];
-			}
-
-			ta.recycle();
-		}
-
-		final float density = context.getResources().getDisplayMetrics().density;
-		if (mPanelHeight == -1) {
-			mPanelHeight = (int) (DEFAULT_PANEL_HEIGHT * density + 0.5f);
-		}
-		if (mShadowHeight == -1) {
-			mShadowHeight = (int) (DEFAULT_SHADOW_HEIGHT * density + 0.5f);
-		}
-		if (mParallaxOffset == -1) {
-			mParallaxOffset = (int) (DEFAULT_PARALAX_OFFSET * density);
-		}
-		// If the shadow height is zero, don't show the shadow
-		if (mShadowHeight > 0) {
-			if (mIsSlidingUp) {
-				mShadowDrawable = getResources().getDrawable(R.drawable.above_shadow);
-			} else {
-				mShadowDrawable = getResources().getDrawable(R.drawable.below_shadow);
-			}
-
-		} else {
-			mShadowDrawable = null;
-		}
-
-		setWillNotDraw(false);
-
-		mDragHelper = ViewDragHelper.create(this, 0.5f, new DragHelperCallback());
-		mDragHelper.setMinVelocity(mMinFlingVelocity * density);
-
-		mIsTouchEnabled = true;
-	}
-
-	/**
-	 * Set the Drag View after the view is inflated
-	 */
-	@Override
-	protected void onFinishInflate() {
-		super.onFinishInflate();
-		if (mDragViewResId != -1) {
-			setDragView(findViewById(mDragViewResId));
-		}
-	}
-
-	public void setGravity(int gravity) {
-		if (gravity != Gravity.TOP && gravity != Gravity.BOTTOM) {
-			throw new IllegalArgumentException("gravity must be set to either top or bottom");
-		}
-		mIsSlidingUp = gravity == Gravity.BOTTOM;
-		if (!mFirstLayout) {
-			requestLayout();
-		}
-	}
-
-	/**
-	 * Set the color used to fade the pane covered by the sliding pane out when
-	 * the pane will become fully covered in the expanded state.
-	 *
-	 * @param color
-	 *            An ARGB-packed color value
-	 */
-	public void setCoveredFadeColor(int color) {
-		mCoveredFadeColor = color;
-		invalidate();
-	}
-
-	/**
-	 * @return The ARGB-packed color value used to fade the fixed pane
-	 */
-	public int getCoveredFadeColor() {
-		return mCoveredFadeColor;
-	}
-
-	/**
-	 * Set sliding enabled flag
-	 * 
-	 * @param enabled
-	 *            flag value
-	 */
-	public void setTouchEnabled(boolean enabled) {
-		mIsTouchEnabled = enabled;
-	}
-
-	public boolean isTouchEnabled() {
-		return mIsTouchEnabled && mSlideableView != null && mSlideState != PanelState.HIDDEN;
-	}
-
-	/**
-	 * Set the collapsed panel height in pixels
-	 *
-	 * @param val
-	 *            A height in pixels
-	 */
-	public void setPanelHeight(int val) {
-		if (getPanelHeight() == val) {
-			return;
-		}
-
-		mPanelHeight = val;
-		if (!mFirstLayout) {
-			requestLayout();
-		}
-
-		if (getPanelState() == PanelState.COLLAPSED) {
-			smoothToBottom();
-			invalidate();
-			return;
-		}
-	}
-
-	protected void smoothToBottom() {
-		smoothSlideTo(0, 0);
-	}
-
-	/**
-	 * @return The current shadow height
-	 */
-	public int getShadowHeight() {
-		return mShadowHeight;
-	}
-
-	/**
-	 * Set the shadow height
-	 *
-	 * @param val
-	 *            A height in pixels
-	 */
-	public void setShadowHeight(int val) {
-		mShadowHeight = val;
-		if (!mFirstLayout) {
-			invalidate();
-		}
-	}
-
-	/**
-	 * @return The current collapsed panel height
-	 */
-	public int getPanelHeight() {
-		return mPanelHeight;
-	}
-
-	/**
-	 * @return The current paralax offset
-	 */
-	public int getCurrentParalaxOffset() {
-		// Clamp slide offset at zero for parallax computation;
-		int offset = (int) (mParallaxOffset * Math.max(mSlideOffset, 0));
-		return mIsSlidingUp ? -offset : offset;
-	}
-
-	/**
-	 * Set parallax offset for the panel
-	 *
-	 * @param val
-	 *            A height in pixels
-	 */
-	public void setParalaxOffset(int val) {
-		mParallaxOffset = val;
-		if (!mFirstLayout) {
-			requestLayout();
-		}
-	}
-
-	/**
-	 * @return The current minimin fling velocity
-	 */
-	public int getMinFlingVelocity() {
-		return mMinFlingVelocity;
-	}
-
-	/**
-	 * Sets the minimum fling velocity for the panel
-	 *
-	 * @param val
-	 *            the new value
-	 */
-	public void setMinFlingVelocity(int val) {
-		mMinFlingVelocity = val;
-	}
-
-	/**
-	 * Sets the panel slide listener
-	 * 
-	 * @param listener
-	 */
-	public void setPanelSlideListener(PanelSlideListener listener) {
-		mPanelSlideListener = listener;
-	}
-
-	/**
-	 * Set the draggable view portion. Use to null, to allow the whole panel to
-	 * be draggable
-	 *
-	 * @param dragView
-	 *            A view that will be used to drag the panel.
-	 */
-	public void setDragView(View dragView) {
-		if (mDragView != null) {
-			mDragView.setOnClickListener(null);
-		}
-		mDragView = dragView;
-		if (mDragView != null) {
-			mDragView.setClickable(true);
-			mDragView.setFocusable(false);
-			mDragView.setFocusableInTouchMode(false);
-			mDragView.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					if (!isEnabled() || !isTouchEnabled())
-						return;
-					if (mSlideState != PanelState.EXPANDED && mSlideState != PanelState.ANCHORED) {
-						if (mAnchorPoint < 1.0f) {
-							setPanelState(PanelState.ANCHORED);
-						} else {
-							setPanelState(PanelState.EXPANDED);
-						}
-					} else {
-						setPanelState(PanelState.COLLAPSED);
-					}
-				}
-			});
-			;
-		}
-	}
-
-	/**
-	 * Set the draggable view portion. Use to null, to allow the whole panel to
-	 * be draggable
-	 *
-	 * @param dragViewResId
-	 *            The resource ID of the new drag view
-	 */
-	public void setDragView(int dragViewResId) {
-		mDragViewResId = dragViewResId;
-		setDragView(findViewById(dragViewResId));
-	}
-
-	/**
-	 * Set an anchor point where the panel can stop during sliding
-	 *
-	 * @param anchorPoint
-	 *            A value between 0 and 1, determining the position of the
-	 *            anchor point starting from the top of the layout.
-	 */
-	public void setAnchorPoint(float anchorPoint) {
-		if (anchorPoint > 0 && anchorPoint <= 1) {
-			mAnchorPoint = anchorPoint;
-		}
-	}
-
-	/**
-	 * Gets the currently set anchor point
-	 *
-	 * @return the currently set anchor point
-	 */
-	public float getAnchorPoint() {
-		return mAnchorPoint;
-	}
-
-	/**
-	 * Sets whether or not the panel overlays the content
-	 * 
-	 * @param overlayed
-	 */
-	public void setOverlayed(boolean overlayed) {
-		mOverlayContent = overlayed;
-	}
-
-	/**
-	 * Check if the panel is set as an overlay.
-	 */
-	public boolean isOverlayed() {
-		return mOverlayContent;
-	}
-
-	/**
-	 * Sets whether or not the main content is clipped to the top of the panel
-	 * 
-	 * @param overlayed
-	 */
-	public void setClipPanel(boolean clip) {
-		mClipPanel = clip;
-	}
-
-	/**
-	 * Check whether or not the main content is clipped to the top of the panel
-	 */
-	public boolean isClipPanel() {
-		return mClipPanel;
-	}
-
-	void dispatchOnPanelSlide(View panel) {
-		if (mPanelSlideListener != null) {
-			mPanelSlideListener.onPanelSlide(panel, mSlideOffset);
-		}
-	}
-
-	void dispatchOnPanelExpanded(View panel) {
-		if (mPanelSlideListener != null) {
-			mPanelSlideListener.onPanelExpanded(panel);
-		}
-		sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
-	}
-
-	void dispatchOnPanelCollapsed(View panel) {
-		if (mPanelSlideListener != null) {
-			mPanelSlideListener.onPanelCollapsed(panel);
-		}
-		sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
-	}
-
-	void dispatchOnPanelAnchored(View panel) {
-		if (mPanelSlideListener != null) {
-			mPanelSlideListener.onPanelAnchored(panel);
-		}
-		sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
-	}
-
-	void dispatchOnPanelHidden(View panel) {
-		if (mPanelSlideListener != null) {
-			mPanelSlideListener.onPanelHidden(panel);
-		}
-		sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
-	}
-
-	void updateObscuredViewVisibility() {
-		if (getChildCount() == 0) {
-			return;
-		}
-		final int leftBound = getPaddingLeft();
-		final int rightBound = getWidth() - getPaddingRight();
-		final int topBound = getPaddingTop();
-		final int bottomBound = getHeight() - getPaddingBottom();
-		final int left;
-		final int right;
-		final int top;
-		final int bottom;
-		if (mSlideableView != null && hasOpaqueBackground(mSlideableView)) {
-			left = mSlideableView.getLeft();
-			right = mSlideableView.getRight();
-			top = mSlideableView.getTop();
-			bottom = mSlideableView.getBottom();
-		} else {
-			left = right = top = bottom = 0;
-		}
-		View child = getChildAt(0);
-		final int clampedChildLeft = Math.max(leftBound, child.getLeft());
-		final int clampedChildTop = Math.max(topBound, child.getTop());
-		final int clampedChildRight = Math.min(rightBound, child.getRight());
-		final int clampedChildBottom = Math.min(bottomBound, child.getBottom());
-		final int vis;
-		if (clampedChildLeft >= left && clampedChildTop >= top && clampedChildRight <= right && clampedChildBottom <= bottom) {
-			vis = INVISIBLE;
-		} else {
-			vis = VISIBLE;
-		}
-		child.setVisibility(vis);
-	}
-
-	void setAllChildrenVisible() {
-		for (int i = 0, childCount = getChildCount(); i < childCount; i++) {
-			final View child = getChildAt(i);
-			if (child.getVisibility() == INVISIBLE) {
-				child.setVisibility(VISIBLE);
-			}
-		}
-	}
-
-	private static boolean hasOpaqueBackground(View v) {
-		final Drawable bg = v.getBackground();
-		return bg != null && bg.getOpacity() == PixelFormat.OPAQUE;
-	}
-
-	@Override
-	protected void onAttachedToWindow() {
-		super.onAttachedToWindow();
-		mFirstLayout = true;
-	}
-
-	@Override
-	protected void onDetachedFromWindow() {
-		super.onDetachedFromWindow();
-		mFirstLayout = true;
-	}
-
-	@Override
-	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-		final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
-		final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
-		final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
-		final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
-
-		if (widthMode != MeasureSpec.EXACTLY) {
-			throw new IllegalStateException("Width must have an exact value or MATCH_PARENT");
-		} else if (heightMode != MeasureSpec.EXACTLY) {
-			throw new IllegalStateException("Height must have an exact value or MATCH_PARENT");
-		}
-
-		final int childCount = getChildCount();
-
-		if (childCount != 2) {
-			throw new IllegalStateException("Sliding up panel layout must have exactly 2 children!");
-		}
-
-		mMainView = getChildAt(0);
-		mSlideableView = getChildAt(1);
-		if (mDragView == null) {
-			setDragView(mSlideableView);
-		}
-
-		// If the sliding panel is not visible, then put the whole view in the
-		// hidden state
-		if (mSlideableView.getVisibility() != VISIBLE) {
-			mSlideState = PanelState.HIDDEN;
-		}
-
-		int layoutHeight = heightSize - getPaddingTop() - getPaddingBottom();
-		int layoutWidth = widthSize - getPaddingLeft() - getPaddingRight();
-
-		// First pass. Measure based on child LayoutParams width/height.
-		for (int i = 0; i < childCount; i++) {
-			final View child = getChildAt(i);
-			final LayoutParams lp = (LayoutParams) child.getLayoutParams();
-
-			// We always measure the sliding panel in order to know it's height
-			// (needed for show panel)
-			if (child.getVisibility() == GONE && i == 0) {
-				continue;
-			}
-
-			int height = layoutHeight;
-			int width = layoutWidth;
-			if (child == mMainView) {
-				if (!mOverlayContent && mSlideState != PanelState.HIDDEN) {
-					height -= mPanelHeight;
-				}
-
-				width -= lp.leftMargin + lp.rightMargin;
-			} else if (child == mSlideableView) {
-				// The slideable view should be aware of its top margin.
-				// See
-				// https://github.com/umano/AndroidSlidingUpPanel/issues/412.
-				height -= lp.topMargin;
-			}
-
-			int childWidthSpec;
-			if (lp.width == LayoutParams.WRAP_CONTENT) {
-				childWidthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST);
-			} else if (lp.width == LayoutParams.MATCH_PARENT) {
-				childWidthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY);
-			} else {
-				childWidthSpec = MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY);
-			}
-
-			int childHeightSpec;
-			if (lp.height == LayoutParams.WRAP_CONTENT) {
-				childHeightSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST);
-			} else if (lp.height == LayoutParams.MATCH_PARENT) {
-				childHeightSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
-			} else {
-				childHeightSpec = MeasureSpec.makeMeasureSpec(lp.height, MeasureSpec.EXACTLY);
-			}
-
-			child.measure(childWidthSpec, childHeightSpec);
-
-			if (child == mSlideableView) {
-				mSlideRange = mSlideableView.getMeasuredHeight() - mPanelHeight;
-			}
-		}
-
-		setMeasuredDimension(widthSize, heightSize);
-	}
-
-	@Override
-	protected void onLayout(boolean changed, int l, int t, int r, int b) {
-		final int paddingLeft = getPaddingLeft();
-		final int paddingTop = getPaddingTop();
-
-		final int childCount = getChildCount();
-
-		if (mFirstLayout) {
-			switch (mSlideState) {
-			case EXPANDED:
-				mSlideOffset = 1.0f;
-				break;
-			case ANCHORED:
-				mSlideOffset = mAnchorPoint;
-				break;
-			case HIDDEN:
-				int newTop = computePanelTopPosition(0.0f) + (mIsSlidingUp ? +mPanelHeight : -mPanelHeight);
-				mSlideOffset = computeSlideOffset(newTop);
-				break;
-			default:
-				mSlideOffset = 0.f;
-				break;
-			}
-		}
-
-		for (int i = 0; i < childCount; i++) {
-			final View child = getChildAt(i);
-			final LayoutParams lp = (LayoutParams) child.getLayoutParams();
-
-			// Always layout the sliding view on the first layout
-			if (child.getVisibility() == GONE && (i == 0 || mFirstLayout)) {
-				continue;
-			}
-
-			final int childHeight = child.getMeasuredHeight();
-			int childTop = paddingTop;
-
-			if (child == mSlideableView) {
-				childTop = computePanelTopPosition(mSlideOffset);
-			}
-
-			if (!mIsSlidingUp) {
-				if (child == mMainView && !mOverlayContent) {
-					childTop = computePanelTopPosition(mSlideOffset) + mSlideableView.getMeasuredHeight();
-				}
-			}
-			final int childBottom = childTop + childHeight;
-			final int childLeft = paddingLeft + lp.leftMargin;
-			final int childRight = childLeft + child.getMeasuredWidth();
-
-			child.layout(childLeft, childTop, childRight, childBottom);
-		}
-
-		if (mFirstLayout) {
-			updateObscuredViewVisibility();
-		}
-		applyParallaxForCurrentSlideOffset();
-
-		mFirstLayout = false;
-	}
-
-	@Override
-	protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-		super.onSizeChanged(w, h, oldw, oldh);
-		// Recalculate sliding panes and their details
-		if (h != oldh) {
-			mFirstLayout = true;
-		}
-	}
-
-	/**
-	 * Set if the drag view can have its own touch events. If set to true, a
-	 * drag view can scroll horizontally and have its own click listener.
-	 *
-	 * Default is set to false.
-	 */
-	public void setEnableDragViewTouchEvents(boolean enabled) {
-		mIsUsingDragViewTouchEvents = enabled;
-	}
-
-	@Override
-	public boolean onInterceptTouchEvent(MotionEvent ev) {
-		final int action = MotionEventCompat.getActionMasked(ev);
-
-		if (!isEnabled() || !isTouchEnabled() || (mIsUnableToDrag && action != MotionEvent.ACTION_DOWN)) {
-			mDragHelper.cancel();
-			return super.onInterceptTouchEvent(ev);
-		}
-
-		if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) {
-			mDragHelper.cancel();
-			return false;
-		}
-
-		final float x = ev.getX();
-		final float y = ev.getY();
-
-		switch (action) {
-		case MotionEvent.ACTION_DOWN: {
-			mIsUnableToDrag = false;
-			mInitialMotionX = x;
-			mInitialMotionY = y;
-			break;
-		}
-
-		case MotionEvent.ACTION_MOVE: {
-			final float adx = Math.abs(x - mInitialMotionX);
-			final float ady = Math.abs(y - mInitialMotionY);
-			final int dragSlop = mDragHelper.getTouchSlop();
-
-			// Handle any horizontal scrolling on the drag view.
-			if (mIsUsingDragViewTouchEvents && adx > dragSlop && ady < dragSlop) {
-				return super.onInterceptTouchEvent(ev);
-			}
-
-			if ((ady > dragSlop && adx > ady) || !isDragViewUnder((int) mInitialMotionX, (int) mInitialMotionY)) {
-				mDragHelper.cancel();
-				mIsUnableToDrag = true;
-				return false;
-			}
-			break;
-		}
-		}
-
-		return mDragHelper.shouldInterceptTouchEvent(ev);
-	}
-
-	@Override
-	public boolean onTouchEvent(MotionEvent ev) {
-		if (!isEnabled() || !isTouchEnabled()) {
-			return super.onTouchEvent(ev);
-		}
-		mDragHelper.processTouchEvent(ev);
-		return true;
-	}
-
-	private boolean isDragViewUnder(int x, int y) {
-		if (mDragView == null)
-			return false;
-		int[] viewLocation = new int[2];
-		mDragView.getLocationOnScreen(viewLocation);
-		int[] parentLocation = new int[2];
-		this.getLocationOnScreen(parentLocation);
-		int screenX = parentLocation[0] + x;
-		int screenY = parentLocation[1] + y;
-		return screenX >= viewLocation[0] && screenX < viewLocation[0] + mDragView.getWidth() && screenY >= viewLocation[1]
-				&& screenY < viewLocation[1] + mDragView.getHeight();
-	}
-
-	/*
-	 * Computes the top position of the panel based on the slide offset.
-	 */
-	private int computePanelTopPosition(float slideOffset) {
-		int slidingViewHeight = mSlideableView != null ? mSlideableView.getMeasuredHeight() : 0;
-		int slidePixelOffset = (int) (slideOffset * mSlideRange);
-		// Compute the top of the panel if its collapsed
-		return mIsSlidingUp ? getMeasuredHeight() - getPaddingBottom() - mPanelHeight - slidePixelOffset : getPaddingTop() - slidingViewHeight
-				+ mPanelHeight + slidePixelOffset;
-	}
-
-	/*
-	 * Computes the slide offset based on the top position of the panel
-	 */
-	private float computeSlideOffset(int topPosition) {
-		// Compute the panel top position if the panel is collapsed (offset 0)
-		final int topBoundCollapsed = computePanelTopPosition(0);
-
-		// Determine the new slide offset based on the collapsed top position
-		// and the new required
-		// top position
-		return (mIsSlidingUp ? (float) (topBoundCollapsed - topPosition) / mSlideRange : (float) (topPosition - topBoundCollapsed) / mSlideRange);
-	}
-
-	/**
-	 * Returns the current state of the panel as an enum.
-	 * 
-	 * @return the current panel state
-	 */
-	public PanelState getPanelState() {
-		return mSlideState;
-	}
-
-	/**
-	 * Change panel state to the given state with
-	 * 
-	 * @param state
-	 *            - new panel state
-	 */
-	public void setPanelState(PanelState state) {
-		if (state == null || state == PanelState.DRAGGING) {
-			throw new IllegalArgumentException("Panel state cannot be null or DRAGGING.");
-		}
-		if (!isEnabled() || (!mFirstLayout && mSlideableView == null) || state == mSlideState || mSlideState == PanelState.DRAGGING)
-			return;
-
-		if (mFirstLayout) {
-			mSlideState = state;
-		} else {
-			if (mSlideState == PanelState.HIDDEN) {
-				mSlideableView.setVisibility(View.VISIBLE);
-				requestLayout();
-			}
-			switch (state) {
-			case ANCHORED:
-				smoothSlideTo(mAnchorPoint, 0);
-				break;
-			case COLLAPSED:
-				smoothSlideTo(0, 0);
-				break;
-			case EXPANDED:
-				smoothSlideTo(1.0f, 0);
-				break;
-			case HIDDEN:
-				int newTop = computePanelTopPosition(0.0f) + (mIsSlidingUp ? +mPanelHeight : -mPanelHeight);
-				smoothSlideTo(computeSlideOffset(newTop), 0);
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Update the parallax based on the current slide offset.
-	 */
-	@SuppressLint("NewApi")
-	private void applyParallaxForCurrentSlideOffset() {
-		if (mParallaxOffset > 0) {
-			int mainViewOffset = getCurrentParalaxOffset();
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-				mMainView.setTranslationY(mainViewOffset);
-			} else {
-				AnimatorProxy.wrap(mMainView).setTranslationY(mainViewOffset);
-			}
-		}
-	}
-
-	private void onPanelDragged(int newTop) {
-		mLastNotDraggingSlideState = mSlideState;
-		mSlideState = PanelState.DRAGGING;
-		// Recompute the slide offset based on the new top position
-		mSlideOffset = computeSlideOffset(newTop);
-		applyParallaxForCurrentSlideOffset();
-		// Dispatch the slide event
-		dispatchOnPanelSlide(mSlideableView);
-		// If the slide offset is negative, and overlay is not on, we need to
-		// increase the
-		// height of the main content
-		LayoutParams lp = (LayoutParams) mMainView.getLayoutParams();
-		int defaultHeight = getHeight() - getPaddingBottom() - getPaddingTop() - mPanelHeight;
-
-		if (mSlideOffset <= 0 && !mOverlayContent) {
-			// expand the main view
-			lp.height = mIsSlidingUp ? (newTop - getPaddingBottom())
-					: (getHeight() - getPaddingBottom() - mSlideableView.getMeasuredHeight() - newTop);
-			mMainView.requestLayout();
-		} else if (lp.height != defaultHeight && !mOverlayContent) {
-			lp.height = defaultHeight;
-			mMainView.requestLayout();
-		}
-	}
-
-	@Override
-	protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
-		boolean result;
-		final int save = canvas.save(Canvas.CLIP_SAVE_FLAG);
-
-		if (mSlideableView != child) { // if main view
-			// Clip against the slider; no sense drawing what will immediately
-			// be covered,
-			// Unless the panel is set to overlay content
-			canvas.getClipBounds(mTmpRect);
-			if (!mOverlayContent) {
-				if (mIsSlidingUp) {
-					mTmpRect.bottom = Math.min(mTmpRect.bottom, mSlideableView.getTop());
-				} else {
-					mTmpRect.top = Math.max(mTmpRect.top, mSlideableView.getBottom());
-				}
-			}
-			if (mClipPanel) {
-				canvas.clipRect(mTmpRect);
-			}
-
-			result = super.drawChild(canvas, child, drawingTime);
-
-			if (mCoveredFadeColor != 0 && mSlideOffset > 0) {
-				final int baseAlpha = (mCoveredFadeColor & 0xff000000) >>> 24;
-				final int imag = (int) (baseAlpha * mSlideOffset);
-				final int color = imag << 24 | (mCoveredFadeColor & 0xffffff);
-				mCoveredFadePaint.setColor(color);
-				canvas.drawRect(mTmpRect, mCoveredFadePaint);
-			}
-		} else {
-			result = super.drawChild(canvas, child, drawingTime);
-		}
-
-		canvas.restoreToCount(save);
-
-		return result;
-	}
-
-	/**
-	 * Smoothly animate mDraggingPane to the target X position within its range.
-	 *
-	 * @param slideOffset
-	 *            position to animate to
-	 * @param velocity
-	 *            initial velocity in case of fling, or 0.
-	 */
-	boolean smoothSlideTo(float slideOffset, int velocity) {
-		if (!isEnabled()) {
-			// Nothing to do.
-			return false;
-		}
-
-		int panelTop = computePanelTopPosition(slideOffset);
-		if (mDragHelper.smoothSlideViewTo(mSlideableView, mSlideableView.getLeft(), panelTop)) {
-			setAllChildrenVisible();
-			ViewCompat.postInvalidateOnAnimation(this);
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public void computeScroll() {
-		if (mDragHelper != null && mDragHelper.continueSettling(true)) {
-			if (!isEnabled()) {
-				mDragHelper.abort();
-				return;
-			}
-
-			ViewCompat.postInvalidateOnAnimation(this);
-		}
-	}
-
-	@Override
-	public void draw(Canvas c) {
-		super.draw(c);
-
-		// draw the shadow
-		if (mShadowDrawable != null) {
-			final int right = mSlideableView.getRight();
-			final int top;
-			final int bottom;
-			if (mIsSlidingUp) {
-				top = mSlideableView.getTop() - mShadowHeight;
-				bottom = mSlideableView.getTop();
-			} else {
-				top = mSlideableView.getBottom();
-				bottom = mSlideableView.getBottom() + mShadowHeight;
-			}
-			final int left = mSlideableView.getLeft();
-			mShadowDrawable.setBounds(left, top, right, bottom);
-			mShadowDrawable.draw(c);
-		}
-	}
-
-	/**
-	 * Tests scrollability within child views of v given a delta of dx.
-	 *
-	 * @param v
-	 *            View to test for horizontal scrollability
-	 * @param checkV
-	 *            Whether the view v passed should itself be checked for
-	 *            scrollability (true), or just its children (false).
-	 * @param dx
-	 *            Delta scrolled in pixels
-	 * @param x
-	 *            X coordinate of the active touch point
-	 * @param y
-	 *            Y coordinate of the active touch point
-	 * @return true if child views of v can be scrolled by delta of dx.
-	 */
-	protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {
-		if (v instanceof ViewGroup) {
-			final ViewGroup group = (ViewGroup) v;
-			final int scrollX = v.getScrollX();
-			final int scrollY = v.getScrollY();
-			final int count = group.getChildCount();
-			// Count backwards - let topmost views consume scroll distance
-			// first.
-			for (int i = count - 1; i >= 0; i--) {
-				final View child = group.getChildAt(i);
-				if (x + scrollX >= child.getLeft() && x + scrollX < child.getRight() && y + scrollY >= child.getTop()
-						&& y + scrollY < child.getBottom() && canScroll(child, true, dx, x + scrollX - child.getLeft(), y + scrollY - child.getTop())) {
-					return true;
-				}
-			}
-		}
-		return checkV && ViewCompat.canScrollHorizontally(v, -dx);
-	}
-
-	@Override
-	protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
-		return new LayoutParams();
-	}
-
-	@Override
-	protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
-		return p instanceof MarginLayoutParams ? new LayoutParams((MarginLayoutParams) p) : new LayoutParams(p);
-	}
-
-	@Override
-	protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
-		return p instanceof LayoutParams && super.checkLayoutParams(p);
-	}
-
-	@Override
-	public ViewGroup.LayoutParams generateLayoutParams(AttributeSet attrs) {
-		return new LayoutParams(getContext(), attrs);
-	}
-
-	@Override
-	public Parcelable onSaveInstanceState() {
-		Parcelable superState = super.onSaveInstanceState();
-
-		SavedState ss = new SavedState(superState);
-		if (mSlideState != PanelState.DRAGGING) {
-			ss.mSlideState = mSlideState;
-		} else {
-			ss.mSlideState = mLastNotDraggingSlideState;
-		}
-		return ss;
-	}
-
-	@Override
-	public void onRestoreInstanceState(Parcelable state) {
-		SavedState ss = (SavedState) state;
-		super.onRestoreInstanceState(ss.getSuperState());
-		mSlideState = ss.mSlideState;
-	}
-
-	private class DragHelperCallback extends ViewDragHelper.Callback {
-
-		@Override
-		public boolean tryCaptureView(View child, int pointerId) {
-			if (mIsUnableToDrag) {
-				return false;
-			}
-
-			return child == mSlideableView;
-		}
-
-		@Override
-		public void onViewDragStateChanged(int state) {
-			if (mDragHelper.getViewDragState() == ViewDragHelper.STATE_IDLE) {
-				mSlideOffset = computeSlideOffset(mSlideableView.getTop());
-				applyParallaxForCurrentSlideOffset();
-
-				if (mSlideOffset == 1) {
-					if (mSlideState != PanelState.EXPANDED) {
-						updateObscuredViewVisibility();
-						mSlideState = PanelState.EXPANDED;
-						dispatchOnPanelExpanded(mSlideableView);
-					}
-				} else if (mSlideOffset == 0) {
-					if (mSlideState != PanelState.COLLAPSED) {
-						mSlideState = PanelState.COLLAPSED;
-						dispatchOnPanelCollapsed(mSlideableView);
-					}
-				} else if (mSlideOffset < 0) {
-					mSlideState = PanelState.HIDDEN;
-					mSlideableView.setVisibility(View.INVISIBLE);
-					dispatchOnPanelHidden(mSlideableView);
-				} else if (mSlideState != PanelState.ANCHORED) {
-					updateObscuredViewVisibility();
-					mSlideState = PanelState.ANCHORED;
-					dispatchOnPanelAnchored(mSlideableView);
-				}
-			}
-		}
-
-		@Override
-		public void onViewCaptured(View capturedChild, int activePointerId) {
-			setAllChildrenVisible();
-		}
-
-		@Override
-		public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) {
-			onPanelDragged(top);
-			invalidate();
-		}
-
-		@Override
-		public void onViewReleased(View releasedChild, float xvel, float yvel) {
-			int target = 0;
-
-			// direction is always positive if we are sliding in the expanded
-			// direction
-			float direction = mIsSlidingUp ? -yvel : yvel;
-
-			if (direction > 0) {
-				// swipe up -> expand
-				target = computePanelTopPosition(1.0f);
-			} else if (direction < 0) {
-				// swipe down -> collapse
-				target = computePanelTopPosition(0.0f);
-			} else if (mAnchorPoint != 1 && mSlideOffset >= (1.f + mAnchorPoint) / 2) {
-				// zero velocity, and far enough from anchor point => expand to
-				// the top
-				target = computePanelTopPosition(1.0f);
-			} else if (mAnchorPoint == 1 && mSlideOffset >= 0.5f) {
-				// zero velocity, and far enough from anchor point => expand to
-				// the top
-				target = computePanelTopPosition(1.0f);
-			} else if (mAnchorPoint != 1 && mSlideOffset >= mAnchorPoint) {
-				target = computePanelTopPosition(mAnchorPoint);
-			} else if (mAnchorPoint != 1 && mSlideOffset >= mAnchorPoint / 2) {
-				target = computePanelTopPosition(mAnchorPoint);
-			} else {
-				// settle at the bottom
-				target = computePanelTopPosition(0.0f);
-			}
-
-			mDragHelper.settleCapturedViewAt(releasedChild.getLeft(), target);
-			invalidate();
-		}
-
-		@Override
-		public int getViewVerticalDragRange(View child) {
-			return mSlideRange;
-		}
-
-		@Override
-		public int clampViewPositionVertical(View child, int top, int dy) {
-			final int collapsedTop = computePanelTopPosition(0.f);
-			final int expandedTop = computePanelTopPosition(1.0f);
-			if (mIsSlidingUp) {
-				return Math.min(Math.max(top, expandedTop), collapsedTop);
-			} else {
-				return Math.min(Math.max(top, collapsedTop), expandedTop);
-			}
-		}
-	}
-
-	public static class LayoutParams extends MarginLayoutParams {
-		private static final int[] ATTRS = new int[] { android.R.attr.layout_weight };
-
-		public LayoutParams() {
-			super(MATCH_PARENT, MATCH_PARENT);
-		}
-
-		public LayoutParams(int width, int height) {
-			super(width, height);
-		}
-
-		public LayoutParams(ViewGroup.LayoutParams source) {
-			super(source);
-		}
-
-		public LayoutParams(MarginLayoutParams source) {
-			super(source);
-		}
-
-		public LayoutParams(LayoutParams source) {
-			super(source);
-		}
-
-		public LayoutParams(Context c, AttributeSet attrs) {
-			super(c, attrs);
-
-			final TypedArray a = c.obtainStyledAttributes(attrs, ATTRS);
-			a.recycle();
-		}
-
-	}
-
-	static class SavedState extends BaseSavedState {
-		PanelState mSlideState;
-
-		SavedState(Parcelable superState) {
-			super(superState);
-		}
-
-		private SavedState(Parcel in) {
-			super(in);
-			try {
-				mSlideState = Enum.valueOf(PanelState.class, in.readString());
-			} catch (IllegalArgumentException e) {
-				mSlideState = PanelState.COLLAPSED;
-			}
-		}
-
-		@Override
-		public void writeToParcel(Parcel out, int flags) {
-			super.writeToParcel(out, flags);
-			out.writeString(mSlideState.toString());
-		}
-
-		public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
-			@Override
-			public SavedState createFromParcel(Parcel in) {
-				return new SavedState(in);
-			}
-
-			@Override
-			public SavedState[] newArray(int size) {
-				return new SavedState[size];
-			}
-		};
-	}
-}
diff --git a/app/src/main/java/dm/audiostreamerdemo/slidinguppanel/ViewDragHelper.java b/app/src/main/java/dm/audiostreamerdemo/slidinguppanel/ViewDragHelper.java
deleted file mode 100644
index 046c757..0000000
--- a/app/src/main/java/dm/audiostreamerdemo/slidinguppanel/ViewDragHelper.java
+++ /dev/null
@@ -1,1591 +0,0 @@
-/*
- * This is the source code of DMAudioStreaming for Android v. 1.0.0.
- * You should have received a copy of the license in this archive (see LICENSE).
- * Copyright @Dibakar_Mistry(dibakar.ece@gmail.com), 2017.
- */
-
-package dm.audiostreamerdemo.slidinguppanel;
-
-import android.content.Context;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.VelocityTrackerCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ScrollerCompat;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.animation.Interpolator;
-
-import java.util.Arrays;
-
-/**
- * ViewDragHelper is a utility class for writing custom ViewGroups. It offers a
- * number of useful operations and state tracking for allowing a user to drag
- * and reposition views within their parent ViewGroup.
- */
-public class ViewDragHelper {
-	private static final String TAG = "ViewDragHelper";
-
-	/**
-	 * A null/invalid pointer ID.
-	 */
-	public static final int INVALID_POINTER = -1;
-
-	/**
-	 * A view is not currently being dragged or animating as a result of a
-	 * fling/snap.
-	 */
-	public static final int STATE_IDLE = 0;
-
-	/**
-	 * A view is currently being dragged. The position is currently changing as
-	 * a result of user input or simulated user input.
-	 */
-	public static final int STATE_DRAGGING = 1;
-
-	/**
-	 * A view is currently settling into place as a result of a fling or
-	 * predefined non-interactive motion.
-	 */
-	public static final int STATE_SETTLING = 2;
-
-	/**
-	 * Edge flag indicating that the left edge should be affected.
-	 */
-	public static final int EDGE_LEFT = 1 << 0;
-
-	/**
-	 * Edge flag indicating that the right edge should be affected.
-	 */
-	public static final int EDGE_RIGHT = 1 << 1;
-
-	/**
-	 * Edge flag indicating that the top edge should be affected.
-	 */
-	public static final int EDGE_TOP = 1 << 2;
-
-	/**
-	 * Edge flag indicating that the bottom edge should be affected.
-	 */
-	public static final int EDGE_BOTTOM = 1 << 3;
-
-	/**
-	 * Edge flag set indicating all edges should be affected.
-	 */
-	public static final int EDGE_ALL = EDGE_LEFT | EDGE_TOP | EDGE_RIGHT | EDGE_BOTTOM;
-
-	/**
-	 * Indicates that a check should occur along the horizontal axis
-	 */
-	public static final int DIRECTION_HORIZONTAL = 1 << 0;
-
-	/**
-	 * Indicates that a check should occur along the vertical axis
-	 */
-	public static final int DIRECTION_VERTICAL = 1 << 1;
-
-	/**
-	 * Indicates that a check should occur along all axes
-	 */
-	public static final int DIRECTION_ALL = DIRECTION_HORIZONTAL | DIRECTION_VERTICAL;
-
-	private static final int EDGE_SIZE = 20; // dp
-
-	private static final int BASE_SETTLE_DURATION = 256; // ms
-	private static final int MAX_SETTLE_DURATION = 600; // ms
-
-	// Current drag state; idle, dragging or settling
-	private int mDragState;
-
-	// Distance to travel before a drag may begin
-	private int mTouchSlop;
-
-	// Last known position/pointer tracking
-	private int mActivePointerId = INVALID_POINTER;
-	private float[] mInitialMotionX;
-	private float[] mInitialMotionY;
-	private float[] mLastMotionX;
-	private float[] mLastMotionY;
-	private int[] mInitialEdgesTouched;
-	private int[] mEdgeDragsInProgress;
-	private int[] mEdgeDragsLocked;
-	private int mPointersDown;
-
-	private VelocityTracker mVelocityTracker;
-	private float mMaxVelocity;
-	private float mMinVelocity;
-
-	private int mEdgeSize;
-	private int mTrackingEdges;
-
-	private ScrollerCompat mScroller;
-
-	private final Callback mCallback;
-
-	private View mCapturedView;
-	private boolean mReleaseInProgress;
-
-	private final ViewGroup mParentView;
-
-	/**
-	 * A Callback is used as a communication channel with the ViewDragHelper
-	 * back to the parent view using it. <code>on*</code>methods are invoked on
-	 * siginficant events and several accessor methods are expected to provide
-	 * the ViewDragHelper with more information about the state of the parent
-	 * view upon request. The callback also makes decisions governing the range
-	 * and draggability of child views.
-	 */
-	public static abstract class Callback {
-		/**
-		 * Called when the drag state changes. See the <code>STATE_*</code>
-		 * constants for more information.
-		 *
-		 * @param state
-		 *            The new drag state
-		 *
-		 * @see #STATE_IDLE
-		 * @see #STATE_DRAGGING
-		 * @see #STATE_SETTLING
-		 */
-		public void onViewDragStateChanged(int state) {
-		}
-
-		/**
-		 * Called when the captured view's position changes as the result of a
-		 * drag or settle.
-		 *
-		 * @param changedView
-		 *            View whose position changed
-		 * @param left
-		 *            New X coordinate of the left edge of the view
-		 * @param top
-		 *            New Y coordinate of the top edge of the view
-		 * @param dx
-		 *            Change in X position from the last call
-		 * @param dy
-		 *            Change in Y position from the last call
-		 */
-		public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) {
-		}
-
-		/**
-		 * Called when a child view is captured for dragging or settling. The ID
-		 * of the pointer currently dragging the captured view is supplied. If
-		 * activePointerId is identified as {@link #INVALID_POINTER} the capture
-		 * is programmatic instead of pointer-initiated.
-		 *
-		 * @param capturedChild
-		 *            Child view that was captured
-		 * @param activePointerId
-		 *            Pointer id tracking the child capture
-		 */
-		public void onViewCaptured(View capturedChild, int activePointerId) {
-		}
-
-		/**
-		 * Called when the child view is no longer being actively dragged. The
-		 * fling velocity is also supplied, if relevant. The velocity values may
-		 * be clamped to system minimums or maximums.
-		 *
-		 * <p>
-		 * Calling code may decide to fling or otherwise release the view to let
-		 * it settle into place. It should do so using
-		 * {@link #settleCapturedViewAt(int, int)} or
-		 * {@link #flingCapturedView(int, int, int, int)}. If the Callback
-		 * invokes one of these methods, the ViewDragHelper will enter
-		 * {@link #STATE_SETTLING} and the view capture will not fully end until
-		 * it comes to a complete stop. If neither of these methods is invoked
-		 * before <code>onViewReleased</code> returns, the view will stop in
-		 * place and the ViewDragHelper will return to {@link #STATE_IDLE}.
-		 * </p>
-		 *
-		 * @param releasedChild
-		 *            The captured child view now being released
-		 * @param xvel
-		 *            X velocity of the pointer as it left the screen in pixels
-		 *            per second.
-		 * @param yvel
-		 *            Y velocity of the pointer as it left the screen in pixels
-		 *            per second.
-		 */
-		public void onViewReleased(View releasedChild, float xvel, float yvel) {
-		}
-
-		/**
-		 * Called when one of the subscribed edges in the parent view has been
-		 * touched by the user while no child view is currently captured.
-		 *
-		 * @param edgeFlags
-		 *            A combination of edge flags describing the edge(s)
-		 *            currently touched
-		 * @param pointerId
-		 *            ID of the pointer touching the described edge(s)
-		 * @see #EDGE_LEFT
-		 * @see #EDGE_TOP
-		 * @see #EDGE_RIGHT
-		 * @see #EDGE_BOTTOM
-		 */
-		public void onEdgeTouched(int edgeFlags, int pointerId) {
-		}
-
-		/**
-		 * Called when the given edge may become locked. This can happen if an
-		 * edge drag was preliminarily rejected before beginning, but after
-		 * {@link #onEdgeTouched(int, int)} was called. This method should
-		 * return true to lock this edge or false to leave it unlocked. The
-		 * default behavior is to leave edges unlocked.
-		 *
-		 * @param edgeFlags
-		 *            A combination of edge flags describing the edge(s) locked
-		 * @return true to lock the edge, false to leave it unlocked
-		 */
-		public boolean onEdgeLock(int edgeFlags) {
-			return false;
-		}
-
-		/**
-		 * Called when the user has started a deliberate drag away from one of
-		 * the subscribed edges in the parent view while no child view is
-		 * currently captured.
-		 *
-		 * @param edgeFlags
-		 *            A combination of edge flags describing the edge(s) dragged
-		 * @param pointerId
-		 *            ID of the pointer touching the described edge(s)
-		 * @see #EDGE_LEFT
-		 * @see #EDGE_TOP
-		 * @see #EDGE_RIGHT
-		 * @see #EDGE_BOTTOM
-		 */
-		public void onEdgeDragStarted(int edgeFlags, int pointerId) {
-		}
-
-		/**
-		 * Called to determine the Z-order of child views.
-		 *
-		 * @param index
-		 *            the ordered position to query for
-		 * @return index of the view that should be ordered at position
-		 *         <code>index</code>
-		 */
-		public int getOrderedChildIndex(int index) {
-			return index;
-		}
-
-		/**
-		 * Return the magnitude of a draggable child view's horizontal range of
-		 * motion in pixels. This method should return 0 for views that cannot
-		 * move horizontally.
-		 *
-		 * @param child
-		 *            Child view to check
-		 * @return range of horizontal motion in pixels
-		 */
-		public int getViewHorizontalDragRange(View child) {
-			return 0;
-		}
-
-		/**
-		 * Return the magnitude of a draggable child view's vertical range of
-		 * motion in pixels. This method should return 0 for views that cannot
-		 * move vertically.
-		 *
-		 * @param child
-		 *            Child view to check
-		 * @return range of vertical motion in pixels
-		 */
-		public int getViewVerticalDragRange(View child) {
-			return 0;
-		}
-
-		/**
-		 * Called when the user's input indicates that they want to capture the
-		 * given child view with the pointer indicated by pointerId. The
-		 * callback should return true if the user is permitted to drag the
-		 * given view with the indicated pointer.
-		 *
-		 * <p>
-		 * ViewDragHelper may call this method multiple times for the same view
-		 * even if the view is already captured; this indicates that a new
-		 * pointer is trying to take control of the view.
-		 * </p>
-		 *
-		 * <p>
-		 * If this method returns true, a call to
-		 * {@link #onViewCaptured(View, int)} will follow if the
-		 * capture is successful.
-		 * </p>
-		 *
-		 * @param child
-		 *            Child the user is attempting to capture
-		 * @param pointerId
-		 *            ID of the pointer attempting the capture
-		 * @return true if capture should be allowed, false otherwise
-		 */
-		public abstract boolean tryCaptureView(View child, int pointerId);
-
-		/**
-		 * Restrict the motion of the dragged child view along the horizontal
-		 * axis. The default implementation does not allow horizontal motion;
-		 * the extending class must override this method and provide the desired
-		 * clamping.
-		 *
-		 *
-		 * @param child
-		 *            Child view being dragged
-		 * @param left
-		 *            Attempted motion along the X axis
-		 * @param dx
-		 *            Proposed change in position for left
-		 * @return The new clamped position for left
-		 */
-		public int clampViewPositionHorizontal(View child, int left, int dx) {
-			return 0;
-		}
-
-		/**
-		 * Restrict the motion of the dragged child view along the vertical
-		 * axis. The default implementation does not allow vertical motion; the
-		 * extending class must override this method and provide the desired
-		 * clamping.
-		 *
-		 *
-		 * @param child
-		 *            Child view being dragged
-		 * @param top
-		 *            Attempted motion along the Y axis
-		 * @param dy
-		 *            Proposed change in position for top
-		 * @return The new clamped position for top
-		 */
-		public int clampViewPositionVertical(View child, int top, int dy) {
-			return 0;
-		}
-	}
-
-	/**
-	 * Interpolator defining the animation curve for mScroller
-	 */
-	private static final Interpolator sInterpolator = new Interpolator() {
-		public float getInterpolation(float t) {
-			t -= 1.0f;
-			return t * t * t * t * t + 1.0f;
-		}
-	};
-
-	private final Runnable mSetIdleRunnable = new Runnable() {
-		public void run() {
-			setDragState(STATE_IDLE);
-		}
-	};
-
-	/**
-	 * Factory method to create a new ViewDragHelper.
-	 *
-	 * @param forParent
-	 *            Parent view to monitor
-	 * @param cb
-	 *            Callback to provide information and receive events
-	 * @return a new ViewDragHelper instance
-	 */
-	public static ViewDragHelper create(ViewGroup forParent, Callback cb) {
-		return new ViewDragHelper(forParent.getContext(), forParent, cb);
-	}
-
-	/**
-	 * Factory method to create a new ViewDragHelper.
-	 *
-	 * @param forParent
-	 *            Parent view to monitor
-	 * @param sensitivity
-	 *            Multiplier for how sensitive the helper should be about
-	 *            detecting the start of a drag. Larger values are more
-	 *            sensitive. 1.0f is normal.
-	 * @param cb
-	 *            Callback to provide information and receive events
-	 * @return a new ViewDragHelper instance
-	 */
-	public static ViewDragHelper create(ViewGroup forParent, float sensitivity, Callback cb) {
-		final ViewDragHelper helper = create(forParent, cb);
-		helper.mTouchSlop = (int) (helper.mTouchSlop * (1 / sensitivity));
-		return helper;
-	}
-
-	/**
-	 * Apps should use ViewDragHelper.create() to get a new instance. This will
-	 * allow VDH to use internal compatibility implementations for different
-	 * platform versions.
-	 *
-	 * @param context
-	 *            Context to initialize config-dependent params from
-	 * @param forParent
-	 *            Parent view to monitor
-	 */
-	private ViewDragHelper(Context context, ViewGroup forParent, Callback cb) {
-		if (forParent == null) {
-			throw new IllegalArgumentException("Parent view may not be null");
-		}
-		if (cb == null) {
-			throw new IllegalArgumentException("Callback may not be null");
-		}
-
-		mParentView = forParent;
-		mCallback = cb;
-
-		final ViewConfiguration vc = ViewConfiguration.get(context);
-		final float density = context.getResources().getDisplayMetrics().density;
-		mEdgeSize = (int) (EDGE_SIZE * density + 0.5f);
-
-		mTouchSlop = vc.getScaledTouchSlop();
-		mMaxVelocity = vc.getScaledMaximumFlingVelocity();
-		mMinVelocity = vc.getScaledMinimumFlingVelocity();
-		mScroller = ScrollerCompat.create(context, sInterpolator);
-	}
-
-	/**
-	 * Set the minimum velocity that will be detected as having a magnitude
-	 * greater than zero in pixels per second. Callback methods accepting a
-	 * velocity will be clamped appropriately.
-	 *
-	 * @param minVel
-	 *            Minimum velocity to detect
-	 */
-	public void setMinVelocity(float minVel) {
-		mMinVelocity = minVel;
-	}
-
-	/**
-	 * Return the currently configured minimum velocity. Any flings with a
-	 * magnitude less than this value in pixels per second. Callback methods
-	 * accepting a velocity will receive zero as a velocity value if the real
-	 * detected velocity was below this threshold.
-	 *
-	 * @return the minimum velocity that will be detected
-	 */
-	public float getMinVelocity() {
-		return mMinVelocity;
-	}
-
-	/**
-	 * Retrieve the current drag state of this helper. This will return one of
-	 * {@link #STATE_IDLE}, {@link #STATE_DRAGGING} or {@link #STATE_SETTLING}.
-	 * 
-	 * @return The current drag state
-	 */
-	public int getViewDragState() {
-		return mDragState;
-	}
-
-	/**
-	 * Enable edge tracking for the selected edges of the parent view. The
-	 * callback's {@link Callback#onEdgeTouched(int, int)} and
-	 * {@link Callback#onEdgeDragStarted(int, int)} methods will only be invoked
-	 * for edges for which edge tracking has been enabled.
-	 *
-	 * @param edgeFlags
-	 *            Combination of edge flags describing the edges to watch
-	 * @see #EDGE_LEFT
-	 * @see #EDGE_TOP
-	 * @see #EDGE_RIGHT
-	 * @see #EDGE_BOTTOM
-	 */
-	public void setEdgeTrackingEnabled(int edgeFlags) {
-		mTrackingEdges = edgeFlags;
-	}
-
-	/**
-	 * Return the size of an edge. This is the range in pixels along the edges
-	 * of this view that will actively detect edge touches or drags if edge
-	 * tracking is enabled.
-	 *
-	 * @return The size of an edge in pixels
-	 * @see #setEdgeTrackingEnabled(int)
-	 */
-	public int getEdgeSize() {
-		return mEdgeSize;
-	}
-
-	/**
-	 * Capture a specific child view for dragging within the parent. The
-	 * callback will be notified but
-	 * {@link Callback#tryCaptureView(View, int)} will not be asked
-	 * permission to capture this view.
-	 *
-	 * @param childView
-	 *            Child view to capture
-	 * @param activePointerId
-	 *            ID of the pointer that is dragging the captured child view
-	 */
-	public void captureChildView(View childView, int activePointerId) {
-		if (childView.getParent() != mParentView) {
-			throw new IllegalArgumentException("captureChildView: parameter must be a descendant " + "of the ViewDragHelper's tracked parent view ("
-					+ mParentView + ")");
-		}
-
-		mCapturedView = childView;
-		mActivePointerId = activePointerId;
-		mCallback.onViewCaptured(childView, activePointerId);
-		setDragState(STATE_DRAGGING);
-	}
-
-	/**
-	 * @return The currently captured view, or null if no view has been
-	 *         captured.
-	 */
-	public View getCapturedView() {
-		return mCapturedView;
-	}
-
-	/**
-	 * @return The ID of the pointer currently dragging the captured view, or
-	 *         {@link #INVALID_POINTER}.
-	 */
-	public int getActivePointerId() {
-		return mActivePointerId;
-	}
-
-	/**
-	 * @return The minimum distance in pixels that the user must travel to
-	 *         initiate a drag
-	 */
-	public int getTouchSlop() {
-		return mTouchSlop;
-	}
-
-	/**
-	 * The result of a call to this method is equivalent to
-	 * {@link #processTouchEvent(MotionEvent)} receiving an
-	 * ACTION_CANCEL event.
-	 */
-	public void cancel() {
-		mActivePointerId = INVALID_POINTER;
-		clearMotionHistory();
-
-		if (mVelocityTracker != null) {
-			mVelocityTracker.recycle();
-			mVelocityTracker = null;
-		}
-	}
-
-	/**
-	 * {@link #cancel()}, but also abort all motion in progress and snap to the
-	 * end of any animation.
-	 */
-	public void abort() {
-		cancel();
-		if (mDragState == STATE_SETTLING) {
-			final int oldX = mScroller.getCurrX();
-			final int oldY = mScroller.getCurrY();
-			mScroller.abortAnimation();
-			final int newX = mScroller.getCurrX();
-			final int newY = mScroller.getCurrY();
-			mCallback.onViewPositionChanged(mCapturedView, newX, newY, newX - oldX, newY - oldY);
-		}
-		setDragState(STATE_IDLE);
-	}
-
-	/**
-	 * Animate the view <code>child</code> to the given (left, top) position. If
-	 * this method returns true, the caller should invoke
-	 * {@link #continueSettling(boolean)} on each subsequent frame to continue
-	 * the motion until it returns false. If this method returns false there is
-	 * no further work to do to complete the movement.
-	 *
-	 * <p>
-	 * This operation does not count as a capture event, though
-	 * {@link #getCapturedView()} will still report the sliding view while the
-	 * slide is in progress.
-	 * </p>
-	 *
-	 * @param child
-	 *            Child view to capture and animate
-	 * @param finalLeft
-	 *            Final left position of child
-	 * @param finalTop
-	 *            Final top position of child
-	 * @return true if animation should continue through
-	 *         {@link #continueSettling(boolean)} calls
-	 */
-	public boolean smoothSlideViewTo(View child, int finalLeft, int finalTop) {
-		mCapturedView = child;
-		mActivePointerId = INVALID_POINTER;
-
-		return forceSettleCapturedViewAt(finalLeft, finalTop, 0, 0);
-	}
-
-	/**
-	 * Settle the captured view at the given (left, top) position. The
-	 * appropriate velocity from prior motion will be taken into account. If
-	 * this method returns true, the caller should invoke
-	 * {@link #continueSettling(boolean)} on each subsequent frame to continue
-	 * the motion until it returns false. If this method returns false there is
-	 * no further work to do to complete the movement.
-	 *
-	 * @param finalLeft
-	 *            Settled left edge position for the captured view
-	 * @param finalTop
-	 *            Settled top edge position for the captured view
-	 * @return true if animation should continue through
-	 *         {@link #continueSettling(boolean)} calls
-	 */
-	public boolean settleCapturedViewAt(int finalLeft, int finalTop) {
-		if (!mReleaseInProgress) {
-			throw new IllegalStateException("Cannot settleCapturedViewAt outside of a call to " + "Callback#onViewReleased");
-		}
-
-		return forceSettleCapturedViewAt(finalLeft, finalTop, (int) VelocityTrackerCompat.getXVelocity(mVelocityTracker, mActivePointerId),
-				(int) VelocityTrackerCompat.getYVelocity(mVelocityTracker, mActivePointerId));
-	}
-
-	/**
-	 * Settle the captured view at the given (left, top) position.
-	 *
-	 * @param finalLeft
-	 *            Target left position for the captured view
-	 * @param finalTop
-	 *            Target top position for the captured view
-	 * @param xvel
-	 *            Horizontal velocity
-	 * @param yvel
-	 *            Vertical velocity
-	 * @return true if animation should continue through
-	 *         {@link #continueSettling(boolean)} calls
-	 */
-	private boolean forceSettleCapturedViewAt(int finalLeft, int finalTop, int xvel, int yvel) {
-		final int startLeft = mCapturedView.getLeft();
-		final int startTop = mCapturedView.getTop();
-		final int dx = finalLeft - startLeft;
-		final int dy = finalTop - startTop;
-
-		if (dx == 0 && dy == 0) {
-			// Nothing to do. Send callbacks, be done.
-			mScroller.abortAnimation();
-			setDragState(STATE_IDLE);
-			return false;
-		}
-
-		final int duration = computeSettleDuration(mCapturedView, dx, dy, xvel, yvel);
-		mScroller.startScroll(startLeft, startTop, dx, dy, duration);
-
-		setDragState(STATE_SETTLING);
-		return true;
-	}
-
-	private int computeSettleDuration(View child, int dx, int dy, int xvel, int yvel) {
-		xvel = clampMag(xvel, (int) mMinVelocity, (int) mMaxVelocity);
-		yvel = clampMag(yvel, (int) mMinVelocity, (int) mMaxVelocity);
-		final int absDx = Math.abs(dx);
-		final int absDy = Math.abs(dy);
-		final int absXVel = Math.abs(xvel);
-		final int absYVel = Math.abs(yvel);
-		final int addedVel = absXVel + absYVel;
-		final int addedDistance = absDx + absDy;
-
-		final float xweight = xvel != 0 ? (float) absXVel / addedVel : (float) absDx / addedDistance;
-		final float yweight = yvel != 0 ? (float) absYVel / addedVel : (float) absDy / addedDistance;
-
-		int xduration = computeAxisDuration(dx, xvel, mCallback.getViewHorizontalDragRange(child));
-		int yduration = computeAxisDuration(dy, yvel, mCallback.getViewVerticalDragRange(child));
-
-		return (int) (xduration * xweight + yduration * yweight);
-	}
-
-	private int computeAxisDuration(int delta, int velocity, int motionRange) {
-		if (delta == 0) {
-			return 0;
-		}
-
-		final int width = mParentView.getWidth();
-		final int halfWidth = width / 2;
-		final float distanceRatio = Math.min(1f, (float) Math.abs(delta) / width);
-		final float distance = halfWidth + halfWidth * distanceInfluenceForSnapDuration(distanceRatio);
-
-		int duration;
-		velocity = Math.abs(velocity);
-		if (velocity > 0) {
-			duration = 4 * Math.round(1000 * Math.abs(distance / velocity));
-		} else {
-			final float range = (float) Math.abs(delta) / motionRange;
-			duration = (int) ((range + 1) * BASE_SETTLE_DURATION);
-		}
-		return Math.min(duration, MAX_SETTLE_DURATION);
-	}
-
-	/**
-	 * Clamp the magnitude of value for absMin and absMax. If the value is below
-	 * the minimum, it will be clamped to zero. If the value is above the
-	 * maximum, it will be clamped to the maximum.
-	 *
-	 * @param value
-	 *            Value to clamp
-	 * @param absMin
-	 *            Absolute value of the minimum significant value to return
-	 * @param absMax
-	 *            Absolute value of the maximum value to return
-	 * @return The clamped value with the same sign as <code>value</code>
-	 */
-	private int clampMag(int value, int absMin, int absMax) {
-		final int absValue = Math.abs(value);
-		if (absValue < absMin)
-			return 0;
-		if (absValue > absMax)
-			return value > 0 ? absMax : -absMax;
-		return value;
-	}
-
-	/**
-	 * Clamp the magnitude of value for absMin and absMax. If the value is below
-	 * the minimum, it will be clamped to zero. If the value is above the
-	 * maximum, it will be clamped to the maximum.
-	 *
-	 * @param value
-	 *            Value to clamp
-	 * @param absMin
-	 *            Absolute value of the minimum significant value to return
-	 * @param absMax
-	 *            Absolute value of the maximum value to return
-	 * @return The clamped value with the same sign as <code>value</code>
-	 */
-	private float clampMag(float value, float absMin, float absMax) {
-		final float absValue = Math.abs(value);
-		if (absValue < absMin)
-			return 0;
-		if (absValue > absMax)
-			return value > 0 ? absMax : -absMax;
-		return value;
-	}
-
-	private float distanceInfluenceForSnapDuration(float f) {
-		f -= 0.5f; // center the values about 0.
-		f *= 0.3f * Math.PI / 2.0f;
-		return (float) Math.sin(f);
-	}
-
-	/**
-	 * Settle the captured view based on standard free-moving fling behavior.
-	 * The caller should invoke {@link #continueSettling(boolean)} on each
-	 * subsequent frame to continue the motion until it returns false.
-	 *
-	 * @param minLeft
-	 *            Minimum X position for the view's left edge
-	 * @param minTop
-	 *            Minimum Y position for the view's top edge
-	 * @param maxLeft
-	 *            Maximum X position for the view's left edge
-	 * @param maxTop
-	 *            Maximum Y position for the view's top edge
-	 */
-	public void flingCapturedView(int minLeft, int minTop, int maxLeft, int maxTop) {
-		if (!mReleaseInProgress) {
-			throw new IllegalStateException("Cannot flingCapturedView outside of a call to " + "Callback#onViewReleased");
-		}
-
-		mScroller.fling(mCapturedView.getLeft(), mCapturedView.getTop(),
-				(int) VelocityTrackerCompat.getXVelocity(mVelocityTracker, mActivePointerId),
-				(int) VelocityTrackerCompat.getYVelocity(mVelocityTracker, mActivePointerId), minLeft, maxLeft, minTop, maxTop);
-
-		setDragState(STATE_SETTLING);
-	}
-
-	/**
-	 * Move the captured settling view by the appropriate amount for the current
-	 * time. If <code>continueSettling</code> returns true, the caller should
-	 * call it again on the next frame to continue.
-	 *
-	 * @param deferCallbacks
-	 *            true if state callbacks should be deferred via posted message.
-	 *            Set this to true if you are calling this method from
-	 *            {@link View#computeScroll()} or similar methods
-	 *            invoked as part of layout or drawing.
-	 * @return true if settle is still in progress
-	 */
-	public boolean continueSettling(boolean deferCallbacks) {
-		// Make sure, there is a captured view
-		if (mCapturedView == null) {
-			return false;
-		}
-		if (mDragState == STATE_SETTLING) {
-			boolean keepGoing = mScroller.computeScrollOffset();
-			final int x = mScroller.getCurrX();
-			final int y = mScroller.getCurrY();
-			final int dx = x - mCapturedView.getLeft();
-			final int dy = y - mCapturedView.getTop();
-
-			if (dx != 0) {
-				mCapturedView.offsetLeftAndRight(dx);
-			}
-			if (dy != 0) {
-				mCapturedView.offsetTopAndBottom(dy);
-			}
-
-			if (dx != 0 || dy != 0) {
-				mCallback.onViewPositionChanged(mCapturedView, x, y, dx, dy);
-			}
-
-			if (keepGoing && x == mScroller.getFinalX() && y == mScroller.getFinalY()) {
-				// Close enough. The interpolator/scroller might think we're
-				// still moving
-				// but the user sure doesn't.
-				mScroller.abortAnimation();
-				keepGoing = mScroller.isFinished();
-			}
-
-			if (!keepGoing) {
-				if (deferCallbacks) {
-					mParentView.post(mSetIdleRunnable);
-				} else {
-					setDragState(STATE_IDLE);
-				}
-			}
-		}
-
-		return mDragState == STATE_SETTLING;
-	}
-
-	/**
-	 * Like all callback events this must happen on the UI thread, but release
-	 * involves some extra semantics. During a release (mReleaseInProgress) is
-	 * the only time it is valid to call {@link #settleCapturedViewAt(int, int)}
-	 * or {@link #flingCapturedView(int, int, int, int)}.
-	 */
-	private void dispatchViewReleased(float xvel, float yvel) {
-		mReleaseInProgress = true;
-		mCallback.onViewReleased(mCapturedView, xvel, yvel);
-		mReleaseInProgress = false;
-
-		if (mDragState == STATE_DRAGGING) {
-			// onViewReleased didn't call a method that would have changed this.
-			// Go idle.
-			setDragState(STATE_IDLE);
-		}
-	}
-
-	private void clearMotionHistory() {
-		if (mInitialMotionX == null) {
-			return;
-		}
-		Arrays.fill(mInitialMotionX, 0);
-		Arrays.fill(mInitialMotionY, 0);
-		Arrays.fill(mLastMotionX, 0);
-		Arrays.fill(mLastMotionY, 0);
-		Arrays.fill(mInitialEdgesTouched, 0);
-		Arrays.fill(mEdgeDragsInProgress, 0);
-		Arrays.fill(mEdgeDragsLocked, 0);
-		mPointersDown = 0;
-	}
-
-	private void clearMotionHistory(int pointerId) {
-		if (mInitialMotionX == null) {
-			return;
-		}
-		mInitialMotionX[pointerId] = 0;
-		mInitialMotionY[pointerId] = 0;
-		mLastMotionX[pointerId] = 0;
-		mLastMotionY[pointerId] = 0;
-		mInitialEdgesTouched[pointerId] = 0;
-		mEdgeDragsInProgress[pointerId] = 0;
-		mEdgeDragsLocked[pointerId] = 0;
-		mPointersDown &= ~(1 << pointerId);
-	}
-
-	private void ensureMotionHistorySizeForId(int pointerId) {
-		if (mInitialMotionX == null || mInitialMotionX.length <= pointerId) {
-			float[] imx = new float[pointerId + 1];
-			float[] imy = new float[pointerId + 1];
-			float[] lmx = new float[pointerId + 1];
-			float[] lmy = new float[pointerId + 1];
-			int[] iit = new int[pointerId + 1];
-			int[] edip = new int[pointerId + 1];
-			int[] edl = new int[pointerId + 1];
-
-			if (mInitialMotionX != null) {
-				System.arraycopy(mInitialMotionX, 0, imx, 0, mInitialMotionX.length);
-				System.arraycopy(mInitialMotionY, 0, imy, 0, mInitialMotionY.length);
-				System.arraycopy(mLastMotionX, 0, lmx, 0, mLastMotionX.length);
-				System.arraycopy(mLastMotionY, 0, lmy, 0, mLastMotionY.length);
-				System.arraycopy(mInitialEdgesTouched, 0, iit, 0, mInitialEdgesTouched.length);
-				System.arraycopy(mEdgeDragsInProgress, 0, edip, 0, mEdgeDragsInProgress.length);
-				System.arraycopy(mEdgeDragsLocked, 0, edl, 0, mEdgeDragsLocked.length);
-			}
-
-			mInitialMotionX = imx;
-			mInitialMotionY = imy;
-			mLastMotionX = lmx;
-			mLastMotionY = lmy;
-			mInitialEdgesTouched = iit;
-			mEdgeDragsInProgress = edip;
-			mEdgeDragsLocked = edl;
-		}
-	}
-
-	private void saveInitialMotion(float x, float y, int pointerId) {
-		ensureMotionHistorySizeForId(pointerId);
-		mInitialMotionX[pointerId] = mLastMotionX[pointerId] = x;
-		mInitialMotionY[pointerId] = mLastMotionY[pointerId] = y;
-		mInitialEdgesTouched[pointerId] = getEdgesTouched((int) x, (int) y);
-		mPointersDown |= 1 << pointerId;
-	}
-
-	private void saveLastMotion(MotionEvent ev) {
-		final int pointerCount = MotionEventCompat.getPointerCount(ev);
-		for (int i = 0; i < pointerCount; i++) {
-			final int pointerId = MotionEventCompat.getPointerId(ev, i);
-			final float x = MotionEventCompat.getX(ev, i);
-			final float y = MotionEventCompat.getY(ev, i);
-			if (mLastMotionX != null && mLastMotionY != null) {
-				mLastMotionX[pointerId] = x;
-				mLastMotionY[pointerId] = y;
-			}
-		}
-	}
-
-	/**
-	 * Check if the given pointer ID represents a pointer that is currently down
-	 * (to the best of the ViewDragHelper's knowledge).
-	 *
-	 * <p>
-	 * The state used to report this information is populated by the methods
-	 * {@link #shouldInterceptTouchEvent(MotionEvent)} or
-	 * {@link #processTouchEvent(MotionEvent)}. If one of these
-	 * methods has not been called for all relevant MotionEvents to track, the
-	 * information reported by this method may be stale or incorrect.
-	 * </p>
-	 *
-	 * @param pointerId
-	 *            pointer ID to check; corresponds to IDs provided by
-	 *            MotionEvent
-	 * @return true if the pointer with the given ID is still down
-	 */
-	public boolean isPointerDown(int pointerId) {
-		return (mPointersDown & 1 << pointerId) != 0;
-	}
-
-	void setDragState(int state) {
-		if (mDragState != state) {
-			mDragState = state;
-			mCallback.onViewDragStateChanged(state);
-			if (state == STATE_IDLE) {
-				mCapturedView = null;
-			}
-		}
-	}
-
-	/**
-	 * Attempt to capture the view with the given pointer ID. The callback will
-	 * be involved. This will put us into the "dragging" state. If we've already
-	 * captured this view with this pointer this method will immediately return
-	 * true without consulting the callback.
-	 *
-	 * @param toCapture
-	 *            View to capture
-	 * @param pointerId
-	 *            Pointer to capture with
-	 * @return true if capture was successful
-	 */
-	boolean tryCaptureViewForDrag(View toCapture, int pointerId) {
-		if (toCapture == mCapturedView && mActivePointerId == pointerId) {
-			// Already done!
-			return true;
-		}
-		if (toCapture != null && mCallback.tryCaptureView(toCapture, pointerId)) {
-			mActivePointerId = pointerId;
-			captureChildView(toCapture, pointerId);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Tests scrollability within child views of v given a delta of dx.
-	 *
-	 * @param v
-	 *            View to test for horizontal scrollability
-	 * @param checkV
-	 *            Whether the view v passed should itself be checked for
-	 *            scrollability (true), or just its children (false).
-	 * @param dx
-	 *            Delta scrolled in pixels along the X axis
-	 * @param dy
-	 *            Delta scrolled in pixels along the Y axis
-	 * @param x
-	 *            X coordinate of the active touch point
-	 * @param y
-	 *            Y coordinate of the active touch point
-	 * @return true if child views of v can be scrolled by delta of dx.
-	 */
-	protected boolean canScroll(View v, boolean checkV, int dx, int dy, int x, int y) {
-		if (v instanceof ViewGroup) {
-			final ViewGroup group = (ViewGroup) v;
-			final int scrollX = v.getScrollX();
-			final int scrollY = v.getScrollY();
-			final int count = group.getChildCount();
-			// Count backwards - let topmost views consume scroll distance
-			// first.
-			for (int i = count - 1; i >= 0; i--) {
-				// TODO: Add versioned support here for transformed views.
-				// This will not work for transformed views in Honeycomb+
-				final View child = group.getChildAt(i);
-				if (x + scrollX >= child.getLeft() && x + scrollX < child.getRight() && y + scrollY >= child.getTop()
-						&& y + scrollY < child.getBottom()
-						&& canScroll(child, true, dx, dy, x + scrollX - child.getLeft(), y + scrollY - child.getTop())) {
-					return true;
-				}
-			}
-		}
-
-		return checkV && (ViewCompat.canScrollHorizontally(v, -dx) || ViewCompat.canScrollVertically(v, -dy));
-	}
-
-	/**
-	 * Check if this event as provided to the parent view's
-	 * onInterceptTouchEvent should cause the parent to intercept the touch
-	 * event stream.
-	 *
-	 * @param ev
-	 *            MotionEvent provided to onInterceptTouchEvent
-	 * @return true if the parent view should return true from
-	 *         onInterceptTouchEvent
-	 */
-	public boolean shouldInterceptTouchEvent(MotionEvent ev) {
-		final int action = MotionEventCompat.getActionMasked(ev);
-		final int actionIndex = MotionEventCompat.getActionIndex(ev);
-
-		if (action == MotionEvent.ACTION_DOWN) {
-			// Reset things for a new event stream, just in case we didn't get
-			// the whole previous stream.
-			cancel();
-		}
-
-		if (mVelocityTracker == null) {
-			mVelocityTracker = VelocityTracker.obtain();
-		}
-		mVelocityTracker.addMovement(ev);
-
-		switch (action) {
-		case MotionEvent.ACTION_DOWN: {
-			final float x = ev.getX();
-			final float y = ev.getY();
-			final int pointerId = MotionEventCompat.getPointerId(ev, 0);
-			saveInitialMotion(x, y, pointerId);
-
-			final View toCapture = findTopChildUnder((int) x, (int) y);
-
-			// Catch a settling view if possible.
-			if (toCapture == mCapturedView && mDragState == STATE_SETTLING) {
-				tryCaptureViewForDrag(toCapture, pointerId);
-			}
-
-			final int edgesTouched = mInitialEdgesTouched[pointerId];
-			if ((edgesTouched & mTrackingEdges) != 0) {
-				mCallback.onEdgeTouched(edgesTouched & mTrackingEdges, pointerId);
-			}
-			break;
-		}
-
-		case MotionEventCompat.ACTION_POINTER_DOWN: {
-			final int pointerId = MotionEventCompat.getPointerId(ev, actionIndex);
-			final float x = MotionEventCompat.getX(ev, actionIndex);
-			final float y = MotionEventCompat.getY(ev, actionIndex);
-
-			saveInitialMotion(x, y, pointerId);
-
-			// A ViewDragHelper can only manipulate one view at a time.
-			if (mDragState == STATE_IDLE) {
-				final int edgesTouched = mInitialEdgesTouched[pointerId];
-				if ((edgesTouched & mTrackingEdges) != 0) {
-					mCallback.onEdgeTouched(edgesTouched & mTrackingEdges, pointerId);
-				}
-			} else if (mDragState == STATE_SETTLING) {
-				// Catch a settling view if possible.
-				final View toCapture = findTopChildUnder((int) x, (int) y);
-				if (toCapture == mCapturedView) {
-					tryCaptureViewForDrag(toCapture, pointerId);
-				}
-			}
-			break;
-		}
-
-		case MotionEvent.ACTION_MOVE: {
-			// First to cross a touch slop over a draggable view wins. Also
-			// report edge drags.
-			final int pointerCount = MotionEventCompat.getPointerCount(ev);
-			for (int i = 0; i < pointerCount && mInitialMotionX != null && mInitialMotionY != null; i++) {
-				final int pointerId = MotionEventCompat.getPointerId(ev, i);
-				if (pointerId >= mInitialMotionX.length || pointerId >= mInitialMotionY.length) {
-					continue;
-				}
-				final float x = MotionEventCompat.getX(ev, i);
-				final float y = MotionEventCompat.getY(ev, i);
-				final float dx = x - mInitialMotionX[pointerId];
-				final float dy = y - mInitialMotionY[pointerId];
-
-				reportNewEdgeDrags(dx, dy, pointerId);
-				if (mDragState == STATE_DRAGGING) {
-					// Callback might have started an edge drag
-					break;
-				}
-
-				final View toCapture = findTopChildUnder((int) mInitialMotionX[pointerId], (int) mInitialMotionY[pointerId]);
-				if (toCapture != null && checkTouchSlop(toCapture, dx, dy) && tryCaptureViewForDrag(toCapture, pointerId)) {
-					break;
-				}
-			}
-			saveLastMotion(ev);
-			break;
-		}
-
-		case MotionEventCompat.ACTION_POINTER_UP: {
-			final int pointerId = MotionEventCompat.getPointerId(ev, actionIndex);
-			clearMotionHistory(pointerId);
-			break;
-		}
-
-		case MotionEvent.ACTION_UP:
-		case MotionEvent.ACTION_CANCEL: {
-			cancel();
-			break;
-		}
-		}
-
-		return mDragState == STATE_DRAGGING;
-	}
-
-	/**
-	 * Process a touch event received by the parent view. This method will
-	 * dispatch callback events as needed before returning. The parent view's
-	 * onTouchEvent implementation should call this.
-	 *
-	 * @param ev
-	 *            The touch event received by the parent view
-	 */
-	public void processTouchEvent(MotionEvent ev) {
-		final int action = MotionEventCompat.getActionMasked(ev);
-		final int actionIndex = MotionEventCompat.getActionIndex(ev);
-
-		if (action == MotionEvent.ACTION_DOWN) {
-			// Reset things for a new event stream, just in case we didn't get
-			// the whole previous stream.
-			cancel();
-		}
-
-		if (mVelocityTracker == null) {
-			mVelocityTracker = VelocityTracker.obtain();
-		}
-		mVelocityTracker.addMovement(ev);
-
-		switch (action) {
-		case MotionEvent.ACTION_DOWN: {
-			final float x = ev.getX();
-			final float y = ev.getY();
-			final int pointerId = MotionEventCompat.getPointerId(ev, 0);
-			final View toCapture = findTopChildUnder((int) x, (int) y);
-
-			saveInitialMotion(x, y, pointerId);
-
-			// Since the parent is already directly processing this touch event,
-			// there is no reason to delay for a slop before dragging.
-			// Start immediately if possible.
-			tryCaptureViewForDrag(toCapture, pointerId);
-
-			final int edgesTouched = mInitialEdgesTouched[pointerId];
-			if ((edgesTouched & mTrackingEdges) != 0) {
-				mCallback.onEdgeTouched(edgesTouched & mTrackingEdges, pointerId);
-			}
-			break;
-		}
-
-		case MotionEventCompat.ACTION_POINTER_DOWN: {
-			final int pointerId = MotionEventCompat.getPointerId(ev, actionIndex);
-			final float x = MotionEventCompat.getX(ev, actionIndex);
-			final float y = MotionEventCompat.getY(ev, actionIndex);
-
-			saveInitialMotion(x, y, pointerId);
-
-			// A ViewDragHelper can only manipulate one view at a time.
-			if (mDragState == STATE_IDLE) {
-				// If we're idle we can do anything! Treat it like a normal down
-				// event.
-
-				final View toCapture = findTopChildUnder((int) x, (int) y);
-				tryCaptureViewForDrag(toCapture, pointerId);
-
-				final int edgesTouched = mInitialEdgesTouched[pointerId];
-				if ((edgesTouched & mTrackingEdges) != 0) {
-					mCallback.onEdgeTouched(edgesTouched & mTrackingEdges, pointerId);
-				}
-			} else if (isCapturedViewUnder((int) x, (int) y)) {
-				// We're still tracking a captured view. If the same view is
-				// under this
-				// point, we'll swap to controlling it with this pointer
-				// instead.
-				// (This will still work if we're "catching" a settling view.)
-
-				tryCaptureViewForDrag(mCapturedView, pointerId);
-			}
-			break;
-		}
-
-		case MotionEvent.ACTION_MOVE: {
-			if (mDragState == STATE_DRAGGING) {
-				final int index = MotionEventCompat.findPointerIndex(ev, mActivePointerId);
-				final float x = MotionEventCompat.getX(ev, index);
-				final float y = MotionEventCompat.getY(ev, index);
-				final int idx = (int) (x - mLastMotionX[mActivePointerId]);
-				final int idy = (int) (y - mLastMotionY[mActivePointerId]);
-
-				dragTo(mCapturedView.getLeft() + idx, mCapturedView.getTop() + idy, idx, idy);
-
-				saveLastMotion(ev);
-			} else {
-				// Check to see if any pointer is now over a draggable view.
-				final int pointerCount = MotionEventCompat.getPointerCount(ev);
-				for (int i = 0; i < pointerCount; i++) {
-					final int pointerId = MotionEventCompat.getPointerId(ev, i);
-					final float x = MotionEventCompat.getX(ev, i);
-					final float y = MotionEventCompat.getY(ev, i);
-					final float dx = x - mInitialMotionX[pointerId];
-					final float dy = y - mInitialMotionY[pointerId];
-
-					reportNewEdgeDrags(dx, dy, pointerId);
-					if (mDragState == STATE_DRAGGING) {
-						// Callback might have started an edge drag.
-						break;
-					}
-
-					final View toCapture = findTopChildUnder((int) x, (int) y);
-					if (checkTouchSlop(toCapture, dx, dy) && tryCaptureViewForDrag(toCapture, pointerId)) {
-						break;
-					}
-				}
-				saveLastMotion(ev);
-			}
-			break;
-		}
-
-		case MotionEventCompat.ACTION_POINTER_UP: {
-			final int pointerId = MotionEventCompat.getPointerId(ev, actionIndex);
-			if (mDragState == STATE_DRAGGING && pointerId == mActivePointerId) {
-				// Try to find another pointer that's still holding on to the
-				// captured view.
-				int newActivePointer = INVALID_POINTER;
-				final int pointerCount = MotionEventCompat.getPointerCount(ev);
-				for (int i = 0; i < pointerCount; i++) {
-					final int id = MotionEventCompat.getPointerId(ev, i);
-					if (id == mActivePointerId) {
-						// This one's going away, skip.
-						continue;
-					}
-
-					final float x = MotionEventCompat.getX(ev, i);
-					final float y = MotionEventCompat.getY(ev, i);
-					if (findTopChildUnder((int) x, (int) y) == mCapturedView && tryCaptureViewForDrag(mCapturedView, id)) {
-						newActivePointer = mActivePointerId;
-						break;
-					}
-				}
-
-				if (newActivePointer == INVALID_POINTER) {
-					// We didn't find another pointer still touching the view,
-					// release it.
-					releaseViewForPointerUp();
-				}
-			}
-			clearMotionHistory(pointerId);
-			break;
-		}
-
-		case MotionEvent.ACTION_UP: {
-			if (mDragState == STATE_DRAGGING) {
-				releaseViewForPointerUp();
-			}
-			cancel();
-			break;
-		}
-
-		case MotionEvent.ACTION_CANCEL: {
-			if (mDragState == STATE_DRAGGING) {
-				dispatchViewReleased(0, 0);
-			}
-			cancel();
-			break;
-		}
-		}
-	}
-
-	private void reportNewEdgeDrags(float dx, float dy, int pointerId) {
-		int dragsStarted = 0;
-		if (checkNewEdgeDrag(dx, dy, pointerId, EDGE_LEFT)) {
-			dragsStarted |= EDGE_LEFT;
-		}
-		if (checkNewEdgeDrag(dy, dx, pointerId, EDGE_TOP)) {
-			dragsStarted |= EDGE_TOP;
-		}
-		if (checkNewEdgeDrag(dx, dy, pointerId, EDGE_RIGHT)) {
-			dragsStarted |= EDGE_RIGHT;
-		}
-		if (checkNewEdgeDrag(dy, dx, pointerId, EDGE_BOTTOM)) {
-			dragsStarted |= EDGE_BOTTOM;
-		}
-
-		if (dragsStarted != 0) {
-			mEdgeDragsInProgress[pointerId] |= dragsStarted;
-			mCallback.onEdgeDragStarted(dragsStarted, pointerId);
-		}
-	}
-
-	private boolean checkNewEdgeDrag(float delta, float odelta, int pointerId, int edge) {
-		final float absDelta = Math.abs(delta);
-		final float absODelta = Math.abs(odelta);
-
-		if ((mInitialEdgesTouched[pointerId] & edge) != edge || (mTrackingEdges & edge) == 0 || (mEdgeDragsLocked[pointerId] & edge) == edge
-				|| (mEdgeDragsInProgress[pointerId] & edge) == edge || (absDelta <= mTouchSlop && absODelta <= mTouchSlop)) {
-			return false;
-		}
-		if (absDelta < absODelta * 0.5f && mCallback.onEdgeLock(edge)) {
-			mEdgeDragsLocked[pointerId] |= edge;
-			return false;
-		}
-		return (mEdgeDragsInProgress[pointerId] & edge) == 0 && absDelta > mTouchSlop;
-	}
-
-	/**
-	 * Check if we've crossed a reasonable touch slop for the given child view.
-	 * If the child cannot be dragged along the horizontal or vertical axis,
-	 * motion along that axis will not count toward the slop check.
-	 *
-	 * @param child
-	 *            Child to check
-	 * @param dx
-	 *            Motion since initial position along X axis
-	 * @param dy
-	 *            Motion since initial position along Y axis
-	 * @return true if the touch slop has been crossed
-	 */
-	private boolean checkTouchSlop(View child, float dx, float dy) {
-		if (child == null) {
-			return false;
-		}
-		final boolean checkHorizontal = mCallback.getViewHorizontalDragRange(child) > 0;
-		final boolean checkVertical = mCallback.getViewVerticalDragRange(child) > 0;
-
-		if (checkHorizontal && checkVertical) {
-			return dx * dx + dy * dy > mTouchSlop * mTouchSlop;
-		} else if (checkHorizontal) {
-			return Math.abs(dx) > mTouchSlop;
-		} else if (checkVertical) {
-			return Math.abs(dy) > mTouchSlop;
-		}
-		return false;
-	}
-
-	/**
-	 * Check if any pointer tracked in the current gesture has crossed the
-	 * required slop threshold.
-	 *
-	 * <p>
-	 * This depends on internal state populated by
-	 * {@link #shouldInterceptTouchEvent(MotionEvent)} or
-	 * {@link #processTouchEvent(MotionEvent)}. You should only
-	 * rely on the results of this method after all currently available touch
-	 * data has been provided to one of these two methods.
-	 * </p>
-	 *
-	 * @param directions
-	 *            Combination of direction flags, see
-	 *            {@link #DIRECTION_HORIZONTAL}, {@link #DIRECTION_VERTICAL},
-	 *            {@link #DIRECTION_ALL}
-	 * @return true if the slop threshold has been crossed, false otherwise
-	 */
-	public boolean checkTouchSlop(int directions) {
-		final int count = mInitialMotionX.length;
-		for (int i = 0; i < count; i++) {
-			if (checkTouchSlop(directions, i)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check if the specified pointer tracked in the current gesture has crossed
-	 * the required slop threshold.
-	 *
-	 * <p>
-	 * This depends on internal state populated by
-	 * {@link #shouldInterceptTouchEvent(MotionEvent)} or
-	 * {@link #processTouchEvent(MotionEvent)}. You should only
-	 * rely on the results of this method after all currently available touch
-	 * data has been provided to one of these two methods.
-	 * </p>
-	 *
-	 * @param directions
-	 *            Combination of direction flags, see
-	 *            {@link #DIRECTION_HORIZONTAL}, {@link #DIRECTION_VERTICAL},
-	 *            {@link #DIRECTION_ALL}
-	 * @param pointerId
-	 *            ID of the pointer to slop check as specified by MotionEvent
-	 * @return true if the slop threshold has been crossed, false otherwise
-	 */
-	public boolean checkTouchSlop(int directions, int pointerId) {
-		if (!isPointerDown(pointerId)) {
-			return false;
-		}
-
-		final boolean checkHorizontal = (directions & DIRECTION_HORIZONTAL) == DIRECTION_HORIZONTAL;
-		final boolean checkVertical = (directions & DIRECTION_VERTICAL) == DIRECTION_VERTICAL;
-
-		final float dx = mLastMotionX[pointerId] - mInitialMotionX[pointerId];
-		final float dy = mLastMotionY[pointerId] - mInitialMotionY[pointerId];
-
-		if (checkHorizontal && checkVertical) {
-			return dx * dx + dy * dy > mTouchSlop * mTouchSlop;
-		} else if (checkHorizontal) {
-			return Math.abs(dx) > mTouchSlop;
-		} else if (checkVertical) {
-			return Math.abs(dy) > mTouchSlop;
-		}
-		return false;
-	}
-
-	/**
-	 * Check if any of the edges specified were initially touched in the
-	 * currently active gesture. If there is no currently active gesture this
-	 * method will return false.
-	 *
-	 * @param edges
-	 *            Edges to check for an initial edge touch. See
-	 *            {@link #EDGE_LEFT}, {@link #EDGE_TOP}, {@link #EDGE_RIGHT},
-	 *            {@link #EDGE_BOTTOM} and {@link #EDGE_ALL}
-	 * @return true if any of the edges specified were initially touched in the
-	 *         current gesture
-	 */
-	public boolean isEdgeTouched(int edges) {
-		final int count = mInitialEdgesTouched.length;
-		for (int i = 0; i < count; i++) {
-			if (isEdgeTouched(edges, i)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check if any of the edges specified were initially touched by the pointer
-	 * with the specified ID. If there is no currently active gesture or if
-	 * there is no pointer with the given ID currently down this method will
-	 * return false.
-	 *
-	 * @param edges
-	 *            Edges to check for an initial edge touch. See
-	 *            {@link #EDGE_LEFT}, {@link #EDGE_TOP}, {@link #EDGE_RIGHT},
-	 *            {@link #EDGE_BOTTOM} and {@link #EDGE_ALL}
-	 * @return true if any of the edges specified were initially touched in the
-	 *         current gesture
-	 */
-	public boolean isEdgeTouched(int edges, int pointerId) {
-		return isPointerDown(pointerId) && (mInitialEdgesTouched[pointerId] & edges) != 0;
-	}
-
-	private void releaseViewForPointerUp() {
-		mVelocityTracker.computeCurrentVelocity(1000, mMaxVelocity);
-		final float xvel = clampMag(VelocityTrackerCompat.getXVelocity(mVelocityTracker, mActivePointerId), mMinVelocity, mMaxVelocity);
-		final float yvel = clampMag(VelocityTrackerCompat.getYVelocity(mVelocityTracker, mActivePointerId), mMinVelocity, mMaxVelocity);
-		dispatchViewReleased(xvel, yvel);
-	}
-
-	private void dragTo(int left, int top, int dx, int dy) {
-		int clampedX = left;
-		int clampedY = top;
-		final int oldLeft = mCapturedView.getLeft();
-		final int oldTop = mCapturedView.getTop();
-		if (dx != 0) {
-			clampedX = mCallback.clampViewPositionHorizontal(mCapturedView, left, dx);
-			mCapturedView.offsetLeftAndRight(clampedX - oldLeft);
-		}
-		if (dy != 0) {
-			clampedY = mCallback.clampViewPositionVertical(mCapturedView, top, dy);
-			mCapturedView.offsetTopAndBottom(clampedY - oldTop);
-		}
-
-		if (dx != 0 || dy != 0) {
-			final int clampedDx = clampedX - oldLeft;
-			final int clampedDy = clampedY - oldTop;
-			mCallback.onViewPositionChanged(mCapturedView, clampedX, clampedY, clampedDx, clampedDy);
-		}
-	}
-
-	/**
-	 * Determine if the currently captured view is under the given point in the
-	 * parent view's coordinate system. If there is no captured view this method
-	 * will return false.
-	 *
-	 * @param x
-	 *            X position to test in the parent's coordinate system
-	 * @param y
-	 *            Y position to test in the parent's coordinate system
-	 * @return true if the captured view is under the given point, false
-	 *         otherwise
-	 */
-	public boolean isCapturedViewUnder(int x, int y) {
-		return isViewUnder(mCapturedView, x, y);
-	}
-
-	/**
-	 * Determine if the supplied view is under the given point in the parent
-	 * view's coordinate system.
-	 *
-	 * @param view
-	 *            Child view of the parent to hit test
-	 * @param x
-	 *            X position to test in the parent's coordinate system
-	 * @param y
-	 *            Y position to test in the parent's coordinate system
-	 * @return true if the supplied view is under the given point, false
-	 *         otherwise
-	 */
-	public boolean isViewUnder(View view, int x, int y) {
-		if (view == null) {
-			return false;
-		}
-		return x >= view.getLeft() && x < view.getRight() && y >= view.getTop() && y < view.getBottom();
-	}
-
-	/**
-	 * Find the topmost child under the given point within the parent view's
-	 * coordinate system. The child order is determined using
-	 * {@link Callback#getOrderedChildIndex(int)}.
-	 *
-	 * @param x
-	 *            X position to test in the parent's coordinate system
-	 * @param y
-	 *            Y position to test in the parent's coordinate system
-	 * @return The topmost child view under (x, y) or null if none found.
-	 */
-	public View findTopChildUnder(int x, int y) {
-		final int childCount = mParentView.getChildCount();
-		for (int i = childCount - 1; i >= 0; i--) {
-			final View child = mParentView.getChildAt(mCallback.getOrderedChildIndex(i));
-			if (x >= child.getLeft() && x < child.getRight() && y >= child.getTop() && y < child.getBottom()) {
-				return child;
-			}
-		}
-		return null;
-	}
-
-	private int getEdgesTouched(int x, int y) {
-		int result = 0;
-
-		if (x < mParentView.getLeft() + mEdgeSize)
-			result |= EDGE_LEFT;
-		if (y < mParentView.getTop() + mEdgeSize)
-			result |= EDGE_TOP;
-		if (x > mParentView.getRight() - mEdgeSize)
-			result |= EDGE_RIGHT;
-		if (y > mParentView.getBottom() - mEdgeSize)
-			result |= EDGE_BOTTOM;
-
-		return result;
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_music.xml b/app/src/main/res/layout/activity_music.xml
index a9ffc84..4bb74e5 100644
--- a/app/src/main/res/layout/activity_music.xml
+++ b/app/src/main/res/layout/activity_music.xml
@@ -5,7 +5,8 @@
     android:background="@color/md_white_1000"
     android:orientation="vertical">
 
-    <dm.audiostreamerdemo.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
+    <com.sothree.slidinguppanel.SlidingUpPanelLayout
+        xmlns:sothree="http://schemas.android.com/apk/res-auto"
         android:id="@+id/sliding_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -31,6 +32,6 @@
             layout="@layout/include_slidingpanel_childtwo"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
-    </dm.audiostreamerdemo.slidinguppanel.SlidingUpPanelLayout>
+    </com.sothree.slidinguppanel.SlidingUpPanelLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_slidingpanel_childone.xml b/app/src/main/res/layout/include_slidingpanel_childone.xml
index 8c3d86e..6e64c24 100644
--- a/app/src/main/res/layout/include_slidingpanel_childone.xml
+++ b/app/src/main/res/layout/include_slidingpanel_childone.xml
@@ -10,7 +10,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+        <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
diff --git a/build.gradle b/build.gradle
index d1e8dc3..68a252a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/dmaudiostreamer/build.gradle b/dmaudiostreamer/build.gradle
index 612260f..c84e597 100644
--- a/dmaudiostreamer/build.gradle
+++ b/dmaudiostreamer/build.gradle
@@ -6,10 +6,10 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 2
-        versionName "1.0.2"
+        versionCode 5
+        versionName "1.0.5"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -30,6 +30,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.mediarouter:mediarouter:1.0.0'
-    api 'com.android.support:support-v4:28.0.0'
+//    api 'com.android.support:support-v4:28.0.0'
     implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
 }
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..9e6fce1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0a480bf..1d08bae 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jan 09 21:55:34 IST 2018
+#Wed Dec 26 10:34:34 IST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip