From 7fc4ab60caab97dcaa7c931ff5495148642fa646 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Tue, 11 Dec 2012 03:49:43 +0000
Subject: [PATCH] Reproductor y controles hechos

---
 AndroidManifest.xml                                                     |   8 +++-----
 VitamioBundle/bin/classes/io/vov/vitamio/R$drawable.class               | Bin 1094 -> 0 bytes
 VitamioBundle/bin/classes/io/vov/vitamio/R$id.class                     | Bin 683 -> 0 bytes
 VitamioBundle/bin/classes/io/vov/vitamio/R$layout.class                 | Bin 442 -> 0 bytes
 VitamioBundle/bin/classes/io/vov/vitamio/R$raw.class                    | Bin 424 -> 0 bytes
 VitamioBundle/bin/classes/io/vov/vitamio/R$string.class                 | Bin 848 -> 0 bytes
 VitamioBundle/bin/classes/io/vov/vitamio/R$style.class                  | Bin 502 -> 0 bytes
 VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$1.class | Bin 1211 -> 0 bytes
 VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$2.class | Bin 831 -> 0 bytes
 VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$3.class | Bin 2942 -> 0 bytes
 VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController.class   | Bin 11632 -> 0 bytes
 VitamioBundle/bin/io.vov.vitamio.activity.initactivity.jar              | Bin 36757 -> 0 bytes
 VitamioBundle/lint.xml                                                  |   3 +++
 VitamioBundle/project.properties                                        |   2 +-
 VitamioBundle/res/drawable-hdpi/mediacontroller_ff_left.png             | Bin 0 -> 865 bytes
 VitamioBundle/res/drawable-hdpi/mediacontroller_ff_right.png            | Bin 0 -> 860 bytes
 VitamioBundle/res/layout/mediacontroller.xml                            |  54 ++++++++++++++++++++++++++++++++++++++----------------
 VitamioBundle/src/io/vov/vitamio/widget/MediaController.java            |  56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 gen/com/upc/pbe/upcnews/R.java                                          | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------
 res/layout/activity_video.xml                                           |  29 +++++++++++++++++++----------
 res/values/styles.xml                                                   |   1 +
 src/com/upc/pbe/upcnews/HLS.java                                        |  56 ++++++++++++++++++++++++++++++++++++++------------------
 src/com/upc/pbe/upcnews/MainActivity.java                               |  12 ++++++------
 src/com/upc/pbe/upcnews/VideoActivity.java                              |  66 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 24 files changed, 352 insertions(+), 175 deletions(-)
 create mode 100644 VitamioBundle/lint.xml
 create mode 100644 VitamioBundle/res/drawable-hdpi/mediacontroller_ff_left.png
 create mode 100644 VitamioBundle/res/drawable-hdpi/mediacontroller_ff_right.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 283272a..a065888 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -10,8 +10,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-    <uses-feature android:name="android.hardware.wifi" />
-
     <application
         android:name=".UpcApp"
         android:icon="@drawable/ic_launcher"
@@ -32,11 +30,11 @@
         </activity>
         <activity android:name=".Help" >
         </activity>
-        <activity android:name=".Directoris" >
+        <activity android:name=".Directoris" >
         </activity>
-        <activity android:name=".VideoActivity" >
+        <activity android:name=".VideoActivity" android:theme="@style/FullScreen" android:configChanges="orientation">
         </activity>
-                <activity
+        <activity
             android:name="io.vov.vitamio.activity.InitActivity"
             android:launchMode="singleTop"
             android:theme="@android:style/Theme.NoTitleBar"
diff --git a/VitamioBundle/bin/classes/io/vov/vitamio/R$drawable.class b/VitamioBundle/bin/classes/io/vov/vitamio/R$drawable.class
index 738d696..879caa1 100644
Binary files a/VitamioBundle/bin/classes/io/vov/vitamio/R$drawable.class and b/VitamioBundle/bin/classes/io/vov/vitamio/R$drawable.class differ
diff --git a/VitamioBundle/bin/classes/io/vov/vitamio/R$id.class b/VitamioBundle/bin/classes/io/vov/vitamio/R$id.class
index 017cdea..c2b9759 100644
Binary files a/VitamioBundle/bin/classes/io/vov/vitamio/R$id.class and b/VitamioBundle/bin/classes/io/vov/vitamio/R$id.class differ
diff --git a/VitamioBundle/bin/classes/io/vov/vitamio/R$layout.class b/VitamioBundle/bin/classes/io/vov/vitamio/R$layout.class
index 4bd1073..c5547ed 100644
Binary files a/VitamioBundle/bin/classes/io/vov/vitamio/R$layout.class and b/VitamioBundle/bin/classes/io/vov/vitamio/R$layout.class differ
diff --git a/VitamioBundle/bin/classes/io/vov/vitamio/R$raw.class b/VitamioBundle/bin/classes/io/vov/vitamio/R$raw.class
index 14d7425..9fca723 100644
Binary files a/VitamioBundle/bin/classes/io/vov/vitamio/R$raw.class and b/VitamioBundle/bin/classes/io/vov/vitamio/R$raw.class differ
diff --git a/VitamioBundle/bin/classes/io/vov/vitamio/R$string.class b/VitamioBundle/bin/classes/io/vov/vitamio/R$string.class
index 92fe851..2624c46 100644
Binary files a/VitamioBundle/bin/classes/io/vov/vitamio/R$string.class and b/VitamioBundle/bin/classes/io/vov/vitamio/R$string.class differ
diff --git a/VitamioBundle/bin/classes/io/vov/vitamio/R$style.class b/VitamioBundle/bin/classes/io/vov/vitamio/R$style.class
index 3360818..112d37b 100644
Binary files a/VitamioBundle/bin/classes/io/vov/vitamio/R$style.class and b/VitamioBundle/bin/classes/io/vov/vitamio/R$style.class differ
diff --git a/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$1.class b/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$1.class
index 66d5f2b..a6597d2 100644
Binary files a/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$1.class and b/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$1.class differ
diff --git a/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$2.class b/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$2.class
index 673e1b6..b20ed30 100644
Binary files a/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$2.class and b/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$2.class differ
diff --git a/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$3.class b/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$3.class
index d273923..577e4b4 100644
Binary files a/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$3.class and b/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController$3.class differ
diff --git a/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController.class b/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController.class
index 0e1a0eb..cf4ec19 100644
Binary files a/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController.class and b/VitamioBundle/bin/classes/io/vov/vitamio/widget/MediaController.class differ
diff --git a/VitamioBundle/bin/io.vov.vitamio.activity.initactivity.jar b/VitamioBundle/bin/io.vov.vitamio.activity.initactivity.jar
index dd68a5e..ca8f285 100644
Binary files a/VitamioBundle/bin/io.vov.vitamio.activity.initactivity.jar and b/VitamioBundle/bin/io.vov.vitamio.activity.initactivity.jar differ
diff --git a/VitamioBundle/lint.xml b/VitamioBundle/lint.xml
new file mode 100644
index 0000000..ee0eead
--- /dev/null
+++ b/VitamioBundle/lint.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>
\ No newline at end of file
diff --git a/VitamioBundle/project.properties b/VitamioBundle/project.properties
index 36f1594..03d0617 100644
--- a/VitamioBundle/project.properties
+++ b/VitamioBundle/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-15
+target=android-10
 android.library=true
diff --git a/VitamioBundle/res/drawable-hdpi/mediacontroller_ff_left.png b/VitamioBundle/res/drawable-hdpi/mediacontroller_ff_left.png
new file mode 100644
index 0000000..389f03f
Binary files /dev/null and b/VitamioBundle/res/drawable-hdpi/mediacontroller_ff_left.png differ
diff --git a/VitamioBundle/res/drawable-hdpi/mediacontroller_ff_right.png b/VitamioBundle/res/drawable-hdpi/mediacontroller_ff_right.png
new file mode 100644
index 0000000..2473406
Binary files /dev/null and b/VitamioBundle/res/drawable-hdpi/mediacontroller_ff_right.png differ
diff --git a/VitamioBundle/res/layout/mediacontroller.xml b/VitamioBundle/res/layout/mediacontroller.xml
index 4a4afa0..4761eab 100644
--- a/VitamioBundle/res/layout/mediacontroller.xml
+++ b/VitamioBundle/res/layout/mediacontroller.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="74dip"
+    android:layout_height="80dip"
     android:layout_alignParentBottom="true"
     android:layout_marginBottom="0.0dip"
     android:layout_marginLeft="0.0dip"
@@ -9,27 +9,13 @@
     android:background="@drawable/mediacontroller_bg"
     android:orientation="horizontal" >
 
-    <ImageButton
-        android:id="@+id/mediacontroller_play_pause"
-        android:layout_width="54.6dip"
-        android:layout_height="32dip"
-        android:layout_alignParentRight="true"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="7.0dip"
-        android:background="#00000000"
-        android:contentDescription="@string/mediacontroller_play_pause"
-        android:gravity="center"
-        android:src="@drawable/mediacontroller_pause_button" />
-
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="2dip"
         android:layout_marginLeft="7.0dip"
         android:layout_marginRight="7.0dip"
-        android:layout_marginTop="2dip"
-        android:layout_toLeftOf="@+id/mediacontroller_play_pause" >
+        android:layout_marginTop="2dip" >
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -69,6 +55,42 @@
             android:layout_alignParentBottom="true"
             android:ellipsize="marquee"
             android:singleLine="true" />
+
     </RelativeLayout>
 
+    <ImageButton
+        android:id="@+id/mediacontroller_play_pause"
+        android:layout_width="54.6dip"
+        android:layout_height="32dip"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:background="#00000000"
+        android:contentDescription="@string/mediacontroller_play_pause"
+        android:gravity="center"
+        android:src="@drawable/mediacontroller_pause_button" />
+
+    <ImageButton
+        android:id="@+id/ImageButton01"
+        android:layout_width="54.6dip"
+        android:layout_height="32dip"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="20dp"
+        android:layout_toLeftOf="@+id/mediacontroller_play_pause"
+        android:background="#00000000"
+        android:gravity="center"
+        android:scaleType="fitCenter"
+        android:src="@drawable/mediacontroller_ff_left" />
+
+    <ImageButton
+        android:id="@+id/ImageButton02"
+        android:layout_width="54.6dip"
+        android:layout_height="32dip"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="14dp"
+        android:layout_toRightOf="@+id/mediacontroller_play_pause"
+        android:background="#00000000"
+        android:gravity="center"
+        android:scaleType="fitCenter"
+        android:src="@drawable/mediacontroller_ff_right" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/VitamioBundle/src/io/vov/vitamio/widget/MediaController.java b/VitamioBundle/src/io/vov/vitamio/widget/MediaController.java
index 3d2e1f9..a695f03 100644
--- a/VitamioBundle/src/io/vov/vitamio/widget/MediaController.java
+++ b/VitamioBundle/src/io/vov/vitamio/widget/MediaController.java
@@ -89,6 +89,9 @@ public class MediaController extends FrameLayout {
 	private static final int SHOW_PROGRESS = 2;
 	private boolean mFromXml = false;
 	private ImageButton mPauseButton;
+	private ImageButton mFFLeftButton;
+	private ImageButton mFFRightButton;
+
 
 	private AudioManager mAM;
 
@@ -156,10 +159,21 @@ public class MediaController extends FrameLayout {
 
 	private void initControllerView(View v) {
 		mPauseButton = (ImageButton) v.findViewById(R.id.mediacontroller_play_pause);
+		mFFLeftButton = (ImageButton) v.findViewById(R.id.ImageButton01);
+		mFFRightButton = (ImageButton) v.findViewById(R.id.ImageButton02);
 		if (mPauseButton != null) {
 			mPauseButton.requestFocus();
 			mPauseButton.setOnClickListener(mPauseListener);
 		}
+		if (mFFLeftButton != null) {
+			mFFLeftButton.requestFocus();
+			mFFLeftButton.setOnClickListener(mFFLeftListener);
+		}
+		if (mFFRightButton != null) {
+			mFFRightButton.requestFocus();
+			mFFRightButton.setOnClickListener(mFFRightListener);
+		}
+		
 
 		mProgress = (ProgressBar) v.findViewById(R.id.mediacontroller_seekbar);
 		if (mProgress != null) {
@@ -196,6 +210,8 @@ public class MediaController extends FrameLayout {
 	public void show() {
 		show(sDefaultTimeout);
 	}
+	
+	
 
 	/**
 	 * Set the content of the file_name TextView
@@ -258,6 +274,10 @@ public class MediaController extends FrameLayout {
 		if (!mShowing && mAnchor != null && mAnchor.getWindowToken() != null) {
 			if (mPauseButton != null)
 				mPauseButton.requestFocus();
+			if (mFFLeftButton != null)
+				mFFLeftButton.requestFocus();
+			if (mFFRightButton != null)
+				mFFRightButton.requestFocus();
 			disableUnsupportedButtons();
 
 			if (mFromXml) {
@@ -409,13 +429,40 @@ public class MediaController extends FrameLayout {
 		return super.dispatchKeyEvent(event);
 	}
 
+	public void setOnFFLeftListener(View.OnClickListener ocl)
+	{
+		mFFLeftListener = ocl;
+		if (mFFLeftButton != null) {
+			mFFLeftButton.requestFocus();
+			mFFLeftButton.setOnClickListener(mFFLeftListener);
+		}
+	}
+	public void setOnFFRightListener(View.OnClickListener ocl)
+	{
+		mFFRightListener = ocl;		
+		if (mFFRightButton != null) {
+			mFFRightButton.requestFocus();
+			mFFRightButton.setOnClickListener(mFFRightListener);
+		}
+	}
+	
 	private View.OnClickListener mPauseListener = new View.OnClickListener() {
 		public void onClick(View v) {
 			doPauseResume();
 			show(sDefaultTimeout);
 		}
 	};
+	private View.OnClickListener mFFLeftListener = new View.OnClickListener() {
+		public void onClick(View v) {
 
+		}
+	};
+	private View.OnClickListener mFFRightListener = new View.OnClickListener() {
+		public void onClick(View v) {
+
+		}
+	};
+	
 	private void updatePausePlay() {
 		if (mRoot == null || mPauseButton == null)
 			return;
@@ -480,8 +527,13 @@ public class MediaController extends FrameLayout {
 	public void setEnabled(boolean enabled) {
 		if (mPauseButton != null)
 			mPauseButton.setEnabled(enabled);
-		if (mProgress != null)
-			mProgress.setEnabled(enabled);
+		if (mPauseButton != null)
+			mPauseButton.setEnabled(enabled);
+		if (mFFLeftButton != null)
+			mFFLeftButton.setEnabled(enabled);
+		if (mFFRightButton != null)
+			mFFRightButton.setEnabled(enabled);
+
 		disableUnsupportedButtons();
 		super.setEnabled(enabled);
 	}
diff --git a/gen/com/upc/pbe/upcnews/R.java b/gen/com/upc/pbe/upcnews/R.java
index bf3549b..9bf560c 100644
--- a/gen/com/upc/pbe/upcnews/R.java
+++ b/gen/com/upc/pbe/upcnews/R.java
@@ -1,103 +1,137 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.upc.pbe.upcnews;
-
-public final class R {
-    public static final class array {
-        public static final int qualityNames=0x7f080000;
-        public static final int qualityValues=0x7f080001;
-    }
-    public static final class attr {
-    }
-    public static final class color {
-        public static final int Black=0x7f050002;
-        public static final int Blue=0x7f050004;
-        public static final int BlueAndroid=0x7f050005;
-        public static final int Gay=0x7f050007;
-        public static final int Gray=0x7f05000a;
-        public static final int Green=0x7f050009;
-        public static final int Orange=0x7f050003;
-        public static final int Red=0x7f050008;
-        public static final int White=0x7f050006;
-        public static final int Whyte_POwaH=0x7f050001;
-        public static final int backgroundmain=0x7f050000;
-    }
-    public static final class dimen {
-        public static final int TitleSize=0x7f060000;
-        public static final int lesize=0x7f060001;
-    }
-    public static final class drawable {
-        public static final int ic_action_search=0x7f020000;
-        public static final int ic_launcher=0x7f020001;
-        public static final int ic_ledarklogo=0x7f020002;
-        public static final int ic_menu_name=0x7f020003;
-        public static final int ic_startbutton=0x7f020004;
-        public static final int selectedonlist=0x7f020005;
-        public static final int selectedonlist2=0x7f020006;
-        public static final int startbuttontoggle=0x7f020007;
-    }
-    public static final class id {
-        public static final int LinearLayout1=0x7f0b0001;
-        public static final int RelativeLayout1=0x7f0b0006;
-        public static final int button=0x7f0b0007;
-        public static final int itemhelp=0x7f0b000d;
-        public static final int itemprefs=0x7f0b000c;
-        public static final int listView1=0x7f0b0003;
-        public static final int menu_settings=0x7f0b000b;
-        public static final int rowTextView=0x7f0b000a;
-        public static final int textView1=0x7f0b0004;
-        public static final int textView2=0x7f0b0005;
-        public static final int textViewTitle=0x7f0b0002;
-        public static final int textViewUrl=0x7f0b0009;
-        public static final int textViewXml=0x7f0b0008;
-        public static final int videoView1=0x7f0b0000;
-    }
-    public static final class layout {
-        public static final int activity_video=0x7f030000;
-        public static final int dirs=0x7f030001;
-        public static final int help=0x7f030002;
-        public static final int main_activity=0x7f030003;
-        public static final int rowlayout=0x7f030004;
-    }
-    public static final class menu {
-        public static final int activity_main=0x7f0a0000;
-        public static final int activity_video=0x7f0a0001;
-        public static final int menu=0x7f0a0002;
-    }
-    public static final class string {
-        public static final int app_name=0x7f070000;
-        public static final int button=0x7f07000c;
-        public static final int button1=0x7f07000d;
-        public static final int defaultQuality=0x7f070015;
-        public static final int defaultURL=0x7f070012;
-        public static final int desc=0x7f070009;
-        public static final int descarregar=0x7f070003;
-        public static final int dir=0x7f07000a;
-        public static final int directoris=0x7f07000b;
-        public static final int help=0x7f070008;
-        public static final int helpText=0x7f070011;
-        public static final int hint=0x7f070004;
-        public static final int menu_settings=0x7f070001;
-        public static final int prefs=0x7f070007;
-        public static final int qual=0x7f070013;
-        public static final int qual_hint=0x7f070014;
-        public static final int startbuttondescription=0x7f07000f;
-        public static final int title=0x7f07000e;
-        public static final int title_activity_main=0x7f070002;
-        public static final int title_activity_video=0x7f070010;
-        public static final int url=0x7f070005;
-        public static final int urlhint=0x7f070006;
-    }
-    public static final class style {
-        public static final int AppTheme=0x7f090000;
-        public static final int leBoldText=0x7f090001;
-    }
-    public static final class xml {
-        public static final int prefs=0x7f040000;
-    }
-}
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.upc.pbe.upcnews;
+
+public final class R {
+    public static final class array {
+        public static final int qualityNames=0x7f0a0000;
+        public static final int qualityValues=0x7f0a0001;
+    }
+    public static final class attr {
+    }
+    public static final class color {
+        public static final int Black=0x7f080002;
+        public static final int Blue=0x7f080004;
+        public static final int BlueAndroid=0x7f080005;
+        public static final int Gay=0x7f080007;
+        public static final int Gray=0x7f08000a;
+        public static final int Green=0x7f080009;
+        public static final int Orange=0x7f080003;
+        public static final int Red=0x7f080008;
+        public static final int White=0x7f080006;
+        public static final int Whyte_POwaH=0x7f080001;
+        public static final int backgroundmain=0x7f080000;
+    }
+    public static final class dimen {
+        public static final int TitleSize=0x7f090000;
+        public static final int lesize=0x7f090001;
+    }
+    public static final class drawable {
+        public static final int ic_action_search=0x7f020000;
+        public static final int ic_launcher=0x7f020001;
+        public static final int ic_ledarklogo=0x7f020002;
+        public static final int ic_menu_name=0x7f020003;
+        public static final int ic_startbutton=0x7f020004;
+        public static final int mediacontroller_bg=0x7f020005;
+        public static final int mediacontroller_ff_left=0x7f020006;
+        public static final int mediacontroller_ff_right=0x7f020007;
+        public static final int mediacontroller_pause01=0x7f020008;
+        public static final int mediacontroller_pause02=0x7f020009;
+        public static final int mediacontroller_pause_button=0x7f02000a;
+        public static final int mediacontroller_play01=0x7f02000b;
+        public static final int mediacontroller_play02=0x7f02000c;
+        public static final int mediacontroller_play_button=0x7f02000d;
+        public static final int mediacontroller_seekbar=0x7f02000e;
+        public static final int mediacontroller_seekbar01=0x7f02000f;
+        public static final int mediacontroller_seekbar02=0x7f020010;
+        public static final int mediacontroller_seekbar_thumb=0x7f020011;
+        public static final int selectedonlist=0x7f020012;
+        public static final int selectedonlist2=0x7f020013;
+        public static final int startbuttontoggle=0x7f020014;
+    }
+    public static final class id {
+        public static final int ImageButton01=0x7f0c000f;
+        public static final int ImageButton02=0x7f0c0010;
+        public static final int LinearLayout1=0x7f0c0001;
+        public static final int RelativeLayout1=0x7f0c0006;
+        public static final int VideoView1=0x7f0c0000;
+        public static final int button=0x7f0c0007;
+        public static final int itemhelp=0x7f0c0014;
+        public static final int itemprefs=0x7f0c0013;
+        public static final int listView1=0x7f0c0003;
+        public static final int mediacontroller_file_name=0x7f0c000d;
+        public static final int mediacontroller_play_pause=0x7f0c000e;
+        public static final int mediacontroller_seekbar=0x7f0c000c;
+        public static final int mediacontroller_time_current=0x7f0c000a;
+        public static final int mediacontroller_time_total=0x7f0c000b;
+        public static final int menu_settings=0x7f0c0012;
+        public static final int rowTextView=0x7f0c0011;
+        public static final int textView1=0x7f0c0004;
+        public static final int textView2=0x7f0c0005;
+        public static final int textViewTitle=0x7f0c0002;
+        public static final int textViewUrl=0x7f0c0009;
+        public static final int textViewXml=0x7f0c0008;
+    }
+    public static final class layout {
+        public static final int activity_video=0x7f030000;
+        public static final int dirs=0x7f030001;
+        public static final int help=0x7f030002;
+        public static final int main_activity=0x7f030003;
+        public static final int mediacontroller=0x7f030004;
+        public static final int rowlayout=0x7f030005;
+    }
+    public static final class menu {
+        public static final int activity_main=0x7f0b0000;
+        public static final int activity_video=0x7f0b0001;
+        public static final int menu=0x7f0b0002;
+    }
+    public static final class raw {
+        public static final int libarm=0x7f050000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f060007;
+        public static final int button=0x7f060013;
+        public static final int button1=0x7f060014;
+        public static final int defaultQuality=0x7f06001c;
+        public static final int defaultURL=0x7f060019;
+        public static final int desc=0x7f060010;
+        public static final int descarregar=0x7f06000a;
+        public static final int dir=0x7f060011;
+        public static final int directoris=0x7f060012;
+        public static final int help=0x7f06000f;
+        public static final int helpText=0x7f060018;
+        public static final int hint=0x7f06000b;
+        public static final int mediacontroller_play_pause=0x7f060006;
+        public static final int menu_settings=0x7f060008;
+        public static final int prefs=0x7f06000e;
+        public static final int qual=0x7f06001a;
+        public static final int qual_hint=0x7f06001b;
+        public static final int startbuttondescription=0x7f060016;
+        public static final int title=0x7f060015;
+        public static final int title_activity_main=0x7f060009;
+        public static final int title_activity_video=0x7f060017;
+        public static final int url=0x7f06000c;
+        public static final int urlhint=0x7f06000d;
+        public static final int vitamio_init_decoders=0x7f060001;
+        public static final int vitamio_name=0x7f060000;
+        public static final int vitamio_videoview_error_button=0x7f060005;
+        public static final int vitamio_videoview_error_text_invalid_progressive_playback=0x7f060003;
+        public static final int vitamio_videoview_error_text_unknown=0x7f060004;
+        public static final int vitamio_videoview_error_title=0x7f060002;
+    }
+    public static final class style {
+        public static final int AppTheme=0x7f070002;
+        public static final int FullScreen=0x7f070003;
+        public static final int MediaController_SeekBar=0x7f070000;
+        public static final int MediaController_Text=0x7f070001;
+        public static final int leBoldText=0x7f070004;
+    }
+    public static final class xml {
+        public static final int prefs=0x7f040000;
+    }
+}
diff --git a/res/layout/activity_video.xml b/res/layout/activity_video.xml
index d604eb2..9d97094 100644
--- a/res/layout/activity_video.xml
+++ b/res/layout/activity_video.xml
@@ -1,13 +1,22 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:background="@color/Black"
+    android:orientation="vertical" >
 
-    <io.vov.vitamio.widget.VideoView
-        android:id="@+id/videoView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true" />
+    <io.vov.vitamio.widget.CenterLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/Black"
+        android:orientation="vertical" >
 
-</RelativeLayout>
+        <io.vov.vitamio.widget.VideoView
+            android:id="@+id/VideoView1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true" />
+    </io.vov.vitamio.widget.CenterLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b0d6d1c..4616b25 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,6 +1,7 @@
 <resources>
 
     <style name="AppTheme" parent="android:Theme.Light.NoTitleBar" />
+    <style name="FullScreen" parent="android:Theme.NoTitleBar.Fullscreen" />
     <style name="leBoldText">
         <item name="android:textStyle">bold</item>
 
diff --git a/src/com/upc/pbe/upcnews/HLS.java b/src/com/upc/pbe/upcnews/HLS.java
index 676fec2..1567262 100644
--- a/src/com/upc/pbe/upcnews/HLS.java
+++ b/src/com/upc/pbe/upcnews/HLS.java
@@ -7,9 +7,9 @@ import android.net.TrafficStats;
 import android.util.Log;
 
 //Gestor del protocol HTTP Live Streaming
-public class HLS 
+public class HLS
 {
-	
+
 	private static final String TAG = "HLS";
 	private ArrayList<ParentList> videos;
 	private ArrayList<Segment> segments;
@@ -22,11 +22,13 @@ public class HLS
 	private Descarrega d;
 	private BandwidthMeasurer bm;
 
-	public HLS(ArrayList<ParentList> parsed, String localFolder) {
-		//Neteja el directori i inicialitza les variables
+	public HLS(ArrayList<ParentList> parsed, String localFolder)
+	{
+		// Neteja el directori i inicialitza les variables
 		File dir = new File(localFolder);
 		String[] files = dir.list();
-		for (int i = 0; i < files.length; i++) {
+		for (int i = 0; i < files.length; i++)
+		{
 			File deleteme = new File(dir, files[i]);
 			Log.d(TAG, "Esborrat " + files[i].toString());
 			deleteme.delete();
@@ -40,19 +42,24 @@ public class HLS
 		d = new Descarrega();
 	}
 
-	public void loadVideo() {
-		//Carrega la seguent qualitat i, a partir d'aixo, el seguent segment
+	public void loadVideo()
+	{
+		// Carrega la qualitat i, a partir d'aixo, el seguent segment
 		qualities = videos.get(currentVideo++).getLists();
 		segments = qualities.get(currentQuality).getSegments();
-		if (currentVideo == videos.size()) {
+		if (currentVideo == videos.size())
+		{
 			endReached = true;
 		}
 	}
 
-	public String next() throws IOException {
-		//Determina la seguent qualitat a partir de la velocitat
-		if(currentSegment == segments.size()) {
-			if(endReached) {
+	public String next() throws IOException
+	{
+		// Determina la seguent qualitat a partir de la velocitat
+		if (currentSegment == segments.size())
+		{
+			if (endReached)
+			{
 				return null;
 			}
 			loadVideo();
@@ -61,15 +68,28 @@ public class HLS
 		Log.d(TAG, seg.getName() + " " + seg.getURL());
 		long startTime = System.currentTimeMillis();
 		long segmentBytes = TrafficStats.getTotalRxBytes();
-		d.descarregarguardar(seg.getURL(),localFolder);
-		double bps = bm.Measure(segmentBytes,startTime);
-		Log.d(TAG, "Velocitat actual (KB/s): " + (bps/8e3));
-		if((bps < qualities.get(currentQuality).getQuality()) && (bps != -1)) {
+		d.descarregarguardar(seg.getURL(), localFolder);
+		double bps = bm.Measure(segmentBytes, startTime);
+		Log.d(TAG, "Velocitat actual (KB/s): " + (bps / 8e3));
+		if ((bps < qualities.get(currentQuality).getQuality()) && (bps != -1))
+		{
 			currentQuality++;
 		}
-		return localFolder + seg.getURL().substring(seg.getURL().lastIndexOf("/")+1, seg.getURL().length());
+		return localFolder
+				+ seg.getURL().substring(seg.getURL().lastIndexOf("/") + 1, seg.getURL().length());
 	}
-	
+
+	public String previous() throws IOException
+	{
+		Segment seg = null;
+		if (--currentSegment > 0)
+		{
+			--currentSegment;
+		}
+		seg = segments.get(currentSegment++);
+		return localFolder + seg.getURL().substring(seg.getURL().lastIndexOf("/") + 1, seg.getURL().length());
+	}
+
 	public void setDefQuality(int q)
 	{
 		currentQuality = q;
diff --git a/src/com/upc/pbe/upcnews/MainActivity.java b/src/com/upc/pbe/upcnews/MainActivity.java
index 075dad6..45925ce 100644
--- a/src/com/upc/pbe/upcnews/MainActivity.java
+++ b/src/com/upc/pbe/upcnews/MainActivity.java
@@ -101,12 +101,12 @@ public class MainActivity extends Activity implements OnClickListener {
 	}
 	/*
 	 * COSAS POR HACER
-	 * Añadir gif Imanol bailando
-	 * Que cojones pasa con los codecs -- Imanol
-	 * Descarga en segundo plano (Mejora dificil)
-	 * Lentitud descarga -- Todos (este miercoles)
-	 * Poner la defaultURL al server de PBE
-	 * Que cada uno documente minimamente su codigo
+	 * (RELEASE-CRITICAL) Lentitud descarga -- Todos (este miercoles)
+	 * (RELEASE-CRITICAL) Hacer que funcione el proyecto en un dispositivo diferente a la tablet (Caray! debería!!)
+	 * (SEVERE) Crash preferences (Me sigue saliendo O.o)
+	 * (NORMAL) Poner la defaultURL al server de PBE	
+	 * (WISHLIST) Descarga en segundo plano (Mejora dificil)
+	 * (WISHLIST) A�adir gif Imanol bailando (Easter eggs? váis en serio? XDDDDDDDDDDDD)
 	 * Borrar esta puta mierda
 	 */
 }
\ No newline at end of file
diff --git a/src/com/upc/pbe/upcnews/VideoActivity.java b/src/com/upc/pbe/upcnews/VideoActivity.java
index d3a9d20..1995677 100644
--- a/src/com/upc/pbe/upcnews/VideoActivity.java
+++ b/src/com/upc/pbe/upcnews/VideoActivity.java
@@ -1,14 +1,16 @@
 package com.upc.pbe.upcnews;
 
+import io.vov.vitamio.MediaPlayer;
+import io.vov.vitamio.widget.MediaController;
+import io.vov.vitamio.widget.VideoView;
+
 import java.io.IOException;
 
-import io.vov.vitamio.widget.VideoView;
 import android.app.Activity;
-import io.vov.vitamio.MediaPlayer;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Menu;
-import io.vov.vitamio.widget.MediaController;
+import android.view.View;
 import android.widget.Toast;
 
 //Tercera activitat principal, executa la reproduccio del video sencer
@@ -16,7 +18,8 @@ public class VideoActivity extends Activity {
 	
 	private final static String TAG = "VideoActivity";
 	private VideoView video;
-	private HLS h;
+	private HLS h = null;
+
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -28,18 +31,36 @@ public class VideoActivity extends Activity {
 			return;
 		}
 		setContentView(R.layout.activity_video);
-		video = (VideoView) findViewById(R.id.videoView1);
+		video = (VideoView) findViewById(R.id.VideoView1);
 		//Creem un listener associat al fi de l'activitat (el fi de cada ts)
+		io.vov.vitamio.widget.MediaController mc = new MediaController(this);
 		video.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
 		    public void onCompletion(MediaPlayer mp) {
 		    	//Al acabar cada ts, reproduit el seguent
 		        playNext();
 		    } 
 		});
+		mc.setOnFFLeftListener(new View.OnClickListener() {
+			public void onClick(View v) {
+				Log.d(TAG, "FFLEFT");
+				video.stopPlayback();
+				playPrevious();
+			}
+		});
+		mc.setOnFFRightListener(new View.OnClickListener() {
+			public void onClick(View v) {
+				Log.d(TAG, "FFRIGHT");
+				video.stopPlayback();
+				playNext();
+			}
+		});
+		video.setVideoQuality(MediaPlayer.VIDEOQUALITY_HIGH);
 		//Creem un gestor HLS, carreguem el video i iniciem la reproduccio
 		h = ((UpcApp)getApplication()).getHLS();
 		h.setDefQuality(((UpcApp)getApplication()).getQuality());
 		h.loadVideo();
+		video.stopPlayback();
+		video.setMediaController(mc);
 		playNext();
 	}
 	
@@ -48,12 +69,10 @@ public class VideoActivity extends Activity {
 			super.finish();
 			return;
 		}
-		Log.d(TAG,url);
-		video.setVideoPath(url);
-		video.setVideoQuality(MediaPlayer.VIDEOQUALITY_HIGH);
-		video.setMediaController(new MediaController(this));
-		/*video.start();
-		video.requestFocus();*/
+		Log.d(TAG,"A reproduir: " + url);
+		video.setVideoPath("file://" + url);
+		video.start();
+		video.requestFocus();
 	}
 	
 	public void playNext() {
@@ -67,11 +86,30 @@ public class VideoActivity extends Activity {
 			return;
 		}
 	}
-
+	public void playPrevious() {
+		try {
+			String prev = h.previous();
+			play(prev);
+		}
+		catch(IOException e) {
+			Toast.makeText(this, "No s'ha trobat el segment", Toast.LENGTH_LONG).show();
+			super.finish();
+			return;
+		}
+	}
+	
 	@Override
+	public void onConfigurationChanged(Configuration newConfig) {
+		if (video != null)
+			video.setVideoLayout(VideoView.VIDEO_LAYOUT_SCALE, 0);
+		super.onConfigurationChanged(newConfig);
+	}
+
+	// Que coño es esto gueyes???
+	/*@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		//Determina el funcionament al apretar la tecla d'opcions
 		getMenuInflater().inflate(R.menu.activity_video, menu);
 		return true;
-	}
+	}*/
 }
\ No newline at end of file
--
libgit2 0.22.2