[Android] Move SlidingPaneLayout to com.android.widget

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May 23 18:32:03 2015 +0200| [c553076701882232b49b23438714d53f7dfda044] | committer: Jean-Baptiste Kempf

Move SlidingPaneLayout to com.android.widget

It's mostly not our code.

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=c553076701882232b49b23438714d53f7dfda044
---

 vlc-android/res/layout/main.xml                                    |    4 ++--
 vlc-android/res/layout/secondary.xml                               |    4 ++--
 .../videolan/vlc => com/android}/widget/SlidingPaneLayout.java     |    2 +-
 .../src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java     |    2 +-
 vlc-android/src/org/videolan/vlc/widget/ContentLinearLayout.java   |    2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/vlc-android/res/layout/main.xml b/vlc-android/res/layout/main.xml
index 219d270..67310d2 100644
--- a/vlc-android/res/layout/main.xml
+++ b/vlc-android/res/layout/main.xml
@@ -15,7 +15,7 @@
         android:nextFocusDown="@+id/ml_menu_search"
         android:nextFocusForward="@+id/ml_menu_search">
 
-        <org.videolan.vlc.widget.SlidingPaneLayout
+        <com.android.widget.SlidingPaneLayout
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:vlc="http://schemas.android.com/apk/res-auto"
             android:id="@+id/pane"
@@ -77,7 +77,7 @@
                 android:id="@+id/audio_player"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent" />
-        </org.videolan.vlc.widget.SlidingPaneLayout>
+        </com.android.widget.SlidingPaneLayout>
 
         <!-- The navigation drawer -->
         <ListView
diff --git a/vlc-android/res/layout/secondary.xml b/vlc-android/res/layout/secondary.xml
index 6711464..462c232 100644
--- a/vlc-android/res/layout/secondary.xml
+++ b/vlc-android/res/layout/secondary.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <org.videolan.vlc.widget.SlidingPaneLayout
+    <com.android.widget.SlidingPaneLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:vlc="http://schemas.android.com/apk/res-auto"
         android:id="@+id/pane"
@@ -40,7 +40,7 @@
             android:id="@+id/audio_player"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent" />
-    </org.videolan.vlc.widget.SlidingPaneLayout>
+    </com.android.widget.SlidingPaneLayout>
 
     <include layout="@layout/toolbar"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/vlc-android/src/org/videolan/vlc/widget/SlidingPaneLayout.java b/vlc-android/src/com/android/widget/SlidingPaneLayout.java
similarity index 99%
rename from vlc-android/src/org/videolan/vlc/widget/SlidingPaneLayout.java
rename to vlc-android/src/com/android/widget/SlidingPaneLayout.java
index 0cfb095..19e8084 100644
--- a/vlc-android/src/org/videolan/vlc/widget/SlidingPaneLayout.java
+++ b/vlc-android/src/com/android/widget/SlidingPaneLayout.java
@@ -1,4 +1,4 @@
-package org.videolan.vlc.widget;
+package com.android.widget;
 
 /*
  * Copyright (C) 2012 The Android Open Source Project
diff --git a/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java b/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
index e68f635..4c83892 100644
--- a/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
@@ -44,7 +44,7 @@ import org.videolan.vlc.audio.AudioServiceController;
 import org.videolan.vlc.gui.audio.AudioPlayer;
 import org.videolan.vlc.util.Util;
 import org.videolan.vlc.widget.HackyDrawerLayout;
-import org.videolan.vlc.widget.SlidingPaneLayout;
+import com.android.widget.SlidingPaneLayout;
 
 public class AudioPlayerContainerActivity extends AppCompatActivity {
 
diff --git a/vlc-android/src/org/videolan/vlc/widget/ContentLinearLayout.java b/vlc-android/src/org/videolan/vlc/widget/ContentLinearLayout.java
index 0c945c7..2c7b88d 100644
--- a/vlc-android/src/org/videolan/vlc/widget/ContentLinearLayout.java
+++ b/vlc-android/src/org/videolan/vlc/widget/ContentLinearLayout.java
@@ -24,6 +24,8 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.LinearLayout;
 
+import com.android.widget.SlidingPaneLayout;
+
 
 /**
  * This class extends the linear layout class and override its onInterceptTouchEvent