From d6448c8b2e06f8c984d3227760a5f5b4ff5d34dd Mon Sep 17 00:00:00 2001
From: Xavi Artigas <xartigas@fluendo.com>
Date: Tue, 6 Nov 2012 13:19:27 +0100
Subject: [PATCH] Major revamp of the file chooser dialog to: Remove unused
 code/layout/strings, remember last visited folder, add a cancel button and
 beautify a bit the dialogs.

---
 .../android-tutorial-5/res/drawable-ldpi/file.png  | Bin 571 -> 1102 bytes
 .../res/drawable-ldpi/folder.png                   | Bin 392 -> 1552 bytes
 .../res/layout/file_dialog_main.xml                | 103 +++++++-----------
 .../res/layout/file_dialog_row.xml                 |  28 +++--
 .../android-tutorial-5/res/values/strings.xml      |  12 +--
 .../gst_sdk_tutorials/tutorial_5/Tutorial5.java    |  14 +--
 .../src/com/lamerman/FileDialog.java               | 120 ++-------------------
 .../src/com/lamerman/SelectionMode.java            |  34 ------
 8 files changed, 77 insertions(+), 234 deletions(-)
 delete mode 100644 gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/SelectionMode.java

diff --git a/gst-sdk/tutorials/android-tutorial-5/res/drawable-ldpi/file.png b/gst-sdk/tutorials/android-tutorial-5/res/drawable-ldpi/file.png
index fa45699efc5b2eff4c30ae18ef1ceb55e0970580..6a64f0e329b069e341bcfdef3f4f3a7087a15de4 100644
GIT binary patch
literal 1102
zcmV-U1hM;xP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000CPNkl<ZScS!w
z-%le|6vw~k+&i~Jfr?vJLX6<*F1pZl)nxw(c=iwQofmxJKj2@`_(J>-_5mMw*hJDw
z0&5^;N>sM6X%X8_#*HqtNax4#ftIucXn_*H$;o8WJNJC<Idi^K5)u5L(s#MJ<2Vdp
z9Kc6J^eHnxiK6H}5q&i^H5J_&AeYMxiO9#y{E&zq6VZfH>VejJ#ImfR;o;%_SS+TE
zF>H*1F$SLJNvTx251?`-!1newi^#Z$JR+h`lu{GS{2?=sX|3P0ENgINWW=^COWC#!
zV+@$NBeZSX1R&KBKt$}p!NFWInT*@E4Xu0AE!(!i%wGU_0RWdGr&6gJ5%~iH13gO)
z09tDh(bMMrl{Kr^>y@5mZjohKkGcW~g5cF%02pJ&x&jEpa4U+Uo&(sn{jTFUx+8#y
zY<ixD<Ktt5Vc0W(SS%JJq7Q)1K9H+cs}VDEy<Ue>3e0>K&3huc7C>VZCjq?f1du19
zw_58VB0>~JZIvLRvp5f=l)4nm7z3r$mjHge5+IdI`GrE^6*E6;P1-6EfruasL-@Ym
z2G?4#^VQQ@e-3nK#V?8IS*MTIMW+qJ5J3>Mtr3yt^+C4)zjv{wYp`Z3nfV={!xR93
z@B6=X<MG!KGsCv+crKT-FWs4lEFy}}&dwf*NYqORB7$XE2_hQPM5F;&0QwqXH^Klw
zCX<P|uKV}s=;*y(nUaXWvaCJ;lMEmU;0b_-0Nw|1uK}U}P_0(`r&6hSN~xYCZ;F|T
zh$dJ>Dgep=2tWuR0w9eb5&5@JDE!&WFJc1#%>0xAKtzfFJe;2Tyuy4wU+Bd<&@`zq
z3=xJQlv0mdcYO`u@B#?R=kvwe{&`hO!F64fN+l?zpp*)H-~a9mKtv({djRTaA5Sh6
z3J1RLU)%FrMMS7ps}K<+5(yj~9eq1FIr)8CT}9*sKpv;>K{K1)-`_7E9v%j_X@iI$
z9*+Y6YPH%6-}k=(E-)eyIl^f>s1aN)m;drS@6AmCm>I?xB$G)PV_XsWdVG95xDcQL
z@diM#@jF+m)x(2>gYtDIL2He8JdQ*nfhdZQ&1QEN7Z-n+pP!%U@9*C~TX)$8B2pou
zJ^&*CYQ<u)td#ofs)WWEXszM<KFa0tq2oACCX-1oEiFCY-rn8_!>~R#H`o4Lhl3Pw
z>WF%0XJ@aq1xhIxV_;bpeBVc@RC?<;j+0KOGwbW?t6N)J8=mL=F+Dwvg@uL7D|J<N
z5fLKV12DF>wzdTTi9`ZH5WscaS}vFSb#-<1=X5%~lFep+@jS0MGc(iSOxFNtKm<fo
z+}+*XTV7tyZftD4Tv=K9X>)UP-F4mF#`xY?)UCm2tp}A-{U;|U<=Z5@F~D8vKiAK;
UGu;qazW@LL07*qoM6N<$f-N=p8~^|S

literal 571
zcmV-B0>u4^P)<h;3K|Lk000e1NJLTq000gE000mO1^@s6CX`M(00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m_e01m_fl`9S#00007bV*G`2ipP(
z6)p&@)Vd=800Fy6L_t(2&y|zSZW=KZM$f(D!TeMmB7_hW*rY<RfL)#<eOev?i6xtC
z*#sdJAl)DeX@l+QV#pAhs!}ak^1|mHeV=7{e0)r2vl;)hMxzmCHk)yO|BctzUx+9o
zAR<V1K>mP?F^tD!48U%;!w1jv^LGldA*3mB9P?wpr&KN@B9w|ns?};X5Hj%OPQ-Cc
ztJOqRQ4vIyMx&A0AqTF&Gz3(Y#bUvyN(DryR4N<~2duTIDktYKQADfNx`0WNaB_~X
zx3{P&a<<lLwaos`c4Z7_<9fZuT8sA{MDWfLLZDPCadUG+`J6WgopZ#60$<u~RD>vs
zP}L8Xt9G+;9M)RaPfs}Kh@uE<ZGI_)K$@ngD&21P0>0&Fx7%4pk-r+#G`%){P7*>0
ztX3-ug#xOIF@_KVhr<D5Ocp1OX*Qb|@aM}5)>=B9PHueL-h1}@J)6yj5CW6Qgu!5N
zDW_O0GM~>$k_7KP<#IVUE|*L0?(UdQr!*Q3`u)CSp!WdudcEAFs`*nKkH;Ju4u>Kl
znXz84lZNo2dJ(}|%XYiHf&gSbpQjHG5C8l|gTa7)zc25H{swM&r%yy_r9J=v002ov
JPDHLkV1fwz@1_6%

diff --git a/gst-sdk/tutorials/android-tutorial-5/res/drawable-ldpi/folder.png b/gst-sdk/tutorials/android-tutorial-5/res/drawable-ldpi/folder.png
index 0108ed934bd0986a6960a8d5042083f51625bd88..d54f034e872c3857d6115856b3d40c7f5859df8b 100644
GIT binary patch
literal 1552
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
CtJm)U

literal 392
zcmeAS@N?(olHy`uVBq!ia0vp^0w6XA8<1SE`<)7qVk{1FcVbv~PUa<$!<OXj?!xdN
z1Q+aGJ{c&&S>O>_%)r2R1cVu<YV%101=&kHeO=jaGjWPoGgXz{mjjx@;pyTSqH%ue
zBtyT$4g#+CZ#<5@{hCFxvx!U7RYj^#ppUUO<5EHE97ZlHDJ?w*=|W}~Pv_Q*2@WDR
z)cW>@xF{@H@b_wl+yB4uJtn0`UzWc8skr*kn+pcFI$P?O+&`RhXZ`fEK|6N*O}Y8d
zeCGLn<4ERvtKVHOtS>MA^f#EP!RJ}|zr~Rc&D;M@RM-)6(Piq-i!(I1K3)D^Q1-cl
zFXq&vL|379!CULn9|UbFnRe&c43{Q`(_tEOUE9x1SniZ|h{2b~IsL*WgA}tx9)}q^
zmh15BddhQ+%T<i+g^kNzN7KH_l}h(+ZD3j*cH^3a?Tz5LY{d_}4hrG@eUs9~!lz#e
hm3?ylQ_tj=Q}nkBI^KM9*%lPE44$rjF6*2UngGpppxgie

diff --git a/gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_main.xml b/gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_main.xml
index c803522..3e33d06 100644
--- a/gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_main.xml
+++ b/gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_main.xml
@@ -1,66 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:id="@+id/relativeLayout01"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-
-	<LinearLayout android:id="@+id/fdLinearLayoutList"
-		android:orientation="vertical" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:layout_alignParentBottom="true">
-
-		<LinearLayout android:id="@+id/fdLinearLayoutSelect"
-			android:orientation="vertical" android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true" android:paddingLeft="10dp"
-			android:paddingRight="10dp" android:paddingBottom="5dp">
-
-			<LinearLayout android:orientation="horizontal"
-				android:layout_width="fill_parent" android:layout_height="fill_parent">
-				<Button android:id="@+id/fdButtonNew" android:layout_height="wrap_content"
-					android:layout_width="0dip" android:layout_weight=".3"
-					android:text="@string/nnew"></Button>
-				<Button android:id="@+id/fdButtonSelect" android:layout_height="wrap_content"
-					android:layout_width="0dip" android:layout_weight=".7"
-					android:text="@string/select"></Button>
-			</LinearLayout>
-		</LinearLayout>
-
-		<LinearLayout android:id="@+id/fdLinearLayoutCreate"
-			android:orientation="vertical" android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true" android:paddingLeft="10dp"
-			android:paddingRight="10dp" android:paddingBottom="5dp">
-			<TextView android:id="@+id/textViewFilename" android:text="@string/file_name"
-				android:layout_width="fill_parent" android:layout_height="wrap_content" />
-			<EditText android:text="" android:id="@+id/fdEditTextFile"
-				android:layout_width="fill_parent" android:layout_height="wrap_content"></EditText>
-
-			<LinearLayout android:orientation="horizontal"
-				android:layout_width="fill_parent" android:layout_height="fill_parent">
-				<Button android:id="@+id/fdButtonCancel" android:layout_height="wrap_content"
-					android:layout_width="0dip" android:layout_weight=".3"
-					android:text="@string/cancel"></Button>
-				<Button android:id="@+id/fdButtonCreate" android:layout_height="wrap_content"
-					android:layout_width="0dip" android:layout_weight=".7"
-					android:text="@string/create"></Button>
-			</LinearLayout>
-		</LinearLayout>
-
-	</LinearLayout>
-
-	<LinearLayout android:orientation="vertical"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
-		android:layout_above="@+id/fdLinearLayoutList">
-		<TextView android:id="@+id/path" android:layout_width="fill_parent"
-			android:layout_height="wrap_content" />
-		<ListView android:id="@android:id/list" android:layout_width="fill_parent"
-			android:layout_height="fill_parent" />
-		<TextView android:id="@android:id/empty"
-			android:layout_width="fill_parent" android:layout_height="fill_parent"
-			android:text="@string/no_data" />
-	</LinearLayout>
-
-
-
-
-</RelativeLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_above="@+id/fdLinearLayoutList"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/path"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/fdButtonCancel"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight=".3"
+            android:text="@string/button_cancel" />
+
+        <Button
+            android:id="@+id/fdButtonSelect"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight=".7"
+            android:text="@string/button_select" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_row.xml b/gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_row.xml
index 18c8c62..6e52625 100644
--- a/gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_row.xml
+++ b/gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_row.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent">
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <ImageView
+        android:id="@+id/fdrowimage"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_alignParentLeft="true"
+        android:contentDescription="@string/icon" />
 
-	<ImageView android:layout_alignParentLeft="true" android:id="@+id/fdrowimage"
-		android:layout_height="35dp" android:layout_width="wrap_content"
-		android:paddingRight="5dp" android:paddingLeft="3dp"></ImageView>
-	<TextView android:text="@+id/fdrowtext" android:layout_width="wrap_content"
-		android:id="@+id/fdrowtext" android:layout_toRightOf="@+id/fdrowimage"
-		android:layout_alignTop="@+id/fdrowimage" android:layout_alignBottom="@+id/fdrowimage"
-		android:gravity="center_vertical" android:layout_height="35dp"
-		android:textSize="23dp"></TextView> 
+    <TextView
+        android:id="@+id/fdrowtext"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_alignBottom="@+id/fdrowimage"
+        android:layout_alignTop="@+id/fdrowimage"
+        android:layout_toRightOf="@+id/fdrowimage"
+        android:gravity="center_vertical"
+        android:textSize="23dp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/gst-sdk/tutorials/android-tutorial-5/res/values/strings.xml b/gst-sdk/tutorials/android-tutorial-5/res/values/strings.xml
index 6907077..272fafa 100755
--- a/gst-sdk/tutorials/android-tutorial-5/res/values/strings.xml
+++ b/gst-sdk/tutorials/android-tutorial-5/res/values/strings.xml
@@ -4,13 +4,9 @@
     <string name="button_play">Play</string>
     <string name="button_stop">Stop</string>
     <string name="button_select">Select</string>
-    <string name="filechooser_name">Android tutorial 5</string>
+    <string name="button_cancel">Cancel</string>
+    <string name="filechooser_name">Select a file</string>
     <string name="location">Location</string>
-    <string name="cant_read_folder">folder can\'t be read!</string>
-    <string name="nnew">New</string>
-    <string name="select">Select</string>
-    <string name="file_name">File name:</string>
-    <string name="cancel">Cancel</string>
-    <string name="create">Save</string>
-    <string name="no_data">No Data</string>
+    <string name="cant_read_folder">folder cannot be read</string>
+    <string name="icon">Icon</string>
 </resources>
diff --git a/gst-sdk/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java b/gst-sdk/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java
index 621e246..9243e34 100644
--- a/gst-sdk/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java
+++ b/gst-sdk/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java
@@ -1,19 +1,17 @@
 package com.gst_sdk_tutorials.tutorial_5;
 
+import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
 
-import com.lamerman.FileDialog;
-import com.lamerman.SelectionMode;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.PowerManager;
+import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
@@ -25,6 +23,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.gstreamer.GStreamer;
+import com.lamerman.FileDialog;
 
 public class Tutorial5 extends Activity implements SurfaceHolder.Callback, OnSeekBarChangeListener {
     private native void nativeInit();     // Initialize native code, build pipeline, etc
@@ -48,6 +47,7 @@ public class Tutorial5 extends Activity implements SurfaceHolder.Callback, OnSee
     private final String defaultMediaUri = "http://docs.gstreamer.com/media/sintel_trailer-368p.ogv";
 
     static private final int PICK_FILE_CODE = 1;
+    private String last_folder;
 
     private PowerManager.WakeLock wake_lock;
 
@@ -68,6 +68,7 @@ public class Tutorial5 extends Activity implements SurfaceHolder.Callback, OnSee
 
         setContentView(R.layout.main);
 
+        last_folder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES).getAbsolutePath();
 
         PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
         wake_lock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, "Android Aurena");
@@ -95,8 +96,7 @@ public class Tutorial5 extends Activity implements SurfaceHolder.Callback, OnSee
         select.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 Intent i = new Intent(getBaseContext(), FileDialog.class);
-                i.putExtra(FileDialog.START_PATH, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES).getAbsolutePath());
-                i.putExtra(FileDialog.SELECTION_MODE, SelectionMode.MODE_OPEN);
+                i.putExtra(FileDialog.START_PATH, last_folder);
                 startActivityForResult(i, PICK_FILE_CODE);
             }
         });
@@ -299,6 +299,8 @@ public class Tutorial5 extends Activity implements SurfaceHolder.Callback, OnSee
         if (resultCode == RESULT_OK && requestCode == PICK_FILE_CODE) {
             mediaUri = "file://" + data.getStringExtra(FileDialog.RESULT_PATH);
             position = 0;
+            last_folder = new File (data.getStringExtra(FileDialog.RESULT_PATH)).getParent();
+            Log.i("GStreamer", "Setting last_folder to " + last_folder);
             setMediaUri();
         }
     }
diff --git a/gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/FileDialog.java b/gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/FileDialog.java
index 6f3a953..96ff132 100644
--- a/gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/FileDialog.java
+++ b/gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/FileDialog.java
@@ -1,4 +1,4 @@
-// From http://code.google.com/p/android-file-dialog/
+// Based on http://code.google.com/p/android-file-dialog/
 //
 // Copyright (c) 2011, 2012, Alexander Ponomarev <alexander.ponomarev.1@gmail.com>
 // All rights reserved.
@@ -33,8 +33,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.TreeMap;
 
-import com.gst_sdk_tutorials.tutorial_5.R;
-
 import android.app.AlertDialog;
 import android.app.ListActivity;
 import android.content.DialogInterface;
@@ -42,14 +40,13 @@ import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
+import com.gst_sdk_tutorials.tutorial_5.R;
+
 /**
  * Activity para escolha de arquivos/diretorios.
  * 
@@ -89,39 +86,18 @@ public class FileDialog extends ListActivity {
 	 */
 	public static final String RESULT_PATH = "RESULT_PATH";
 
-	/**
-	 * Parametro de entrada da Activity: tipo de selecao: pode criar novos paths
-	 * ou nao. Padrao: nao permite.
-	 * 
-	 * @see {@link SelectionMode}
-	 */
-	public static final String SELECTION_MODE = "SELECTION_MODE";
-
-	/**
-	 * Parametro de entrada da Activity: se e permitido escolher diretorios.
-	 * Padrao: falso.
-	 */
-	public static final String CAN_SELECT_DIR = "CAN_SELECT_DIR";
 
 	private List<String> path = null;
 	private TextView myPath;
-	private EditText mFileName;
 	private ArrayList<HashMap<String, Object>> mList;
 
 	private Button selectButton;
 
-	private LinearLayout layoutSelect;
-	private LinearLayout layoutCreate;
-	private InputMethodManager inputManager;
 	private String parentPath;
 	private String currentPath = ROOT;
 
-	private int selectionMode = SelectionMode.MODE_CREATE;
-
 	private String[] formatFilter = null;
 
-	private boolean canSelectDir = false;
-
 	private File selectedFile;
 	private HashMap<String, Integer> lastPositions = new HashMap<String, Integer>();
 
@@ -136,9 +112,6 @@ public class FileDialog extends ListActivity {
 
 		setContentView(R.layout.file_dialog_main);
 		myPath = (TextView) findViewById(R.id.path);
-		mFileName = (EditText) findViewById(R.id.fdEditTextFile);
-
-		inputManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
 
 		selectButton = (Button) findViewById(R.id.fdButtonSelect);
 		selectButton.setEnabled(false);
@@ -153,58 +126,20 @@ public class FileDialog extends ListActivity {
 			}
 		});
 
-		final Button newButton = (Button) findViewById(R.id.fdButtonNew);
-		newButton.setOnClickListener(new OnClickListener() {
-
-			public void onClick(View v) {
-				setCreateVisible(v);
-
-				mFileName.setText("");
-				mFileName.requestFocus();
-			}
-		});
-
-		selectionMode = getIntent().getIntExtra(SELECTION_MODE, SelectionMode.MODE_CREATE);
-
 		formatFilter = getIntent().getStringArrayExtra(FORMAT_FILTER);
 
-		canSelectDir = getIntent().getBooleanExtra(CAN_SELECT_DIR, false);
-
-		if (selectionMode == SelectionMode.MODE_OPEN) {
-			newButton.setEnabled(false);
-		}
-
-		layoutSelect = (LinearLayout) findViewById(R.id.fdLinearLayoutSelect);
-		layoutCreate = (LinearLayout) findViewById(R.id.fdLinearLayoutCreate);
-		layoutCreate.setVisibility(View.GONE);
-
 		final Button cancelButton = (Button) findViewById(R.id.fdButtonCancel);
 		cancelButton.setOnClickListener(new OnClickListener() {
 
 			public void onClick(View v) {
-				setSelectVisible(v);
+			    setResult(RESULT_CANCELED);
+			    finish();
 			}
 
 		});
-		final Button createButton = (Button) findViewById(R.id.fdButtonCreate);
-		createButton.setOnClickListener(new OnClickListener() {
-
-			public void onClick(View v) {
-				if (mFileName.getText().length() > 0) {
-					getIntent().putExtra(RESULT_PATH, currentPath + "/" + mFileName.getText());
-					setResult(RESULT_OK, getIntent());
-					finish();
-				}
-			}
-		});
 
 		String startPath = getIntent().getStringExtra(START_PATH);
 		startPath = startPath != null ? startPath : ROOT;
-		if (canSelectDir) {
-			File file = new File(startPath);
-			selectedFile = file;
-			selectButton.setEnabled(true);
-		}
 		getDir(startPath);
 
 		ListView lv = (ListView) findViewById (android.R.id.list);
@@ -334,20 +269,13 @@ public class FileDialog extends ListActivity {
 
 		File file = new File(path.get(position));
 
-		setSelectVisible(v);
-
 		if (file.isDirectory()) {
 			selectButton.setEnabled(false);
 			if (file.canRead()) {
 				lastPositions.put(currentPath, position);
 				getDir(path.get(position));
-				if (canSelectDir) {
-					selectedFile = file;
-					v.setSelected(true);
-					selectButton.setEnabled(true);
-				}
 			} else {
-				new AlertDialog.Builder(this).setIcon(R.drawable.gst_sdk_icon)
+				new AlertDialog.Builder(this).setIcon(android.R.drawable.stat_sys_warning)
 						.setTitle("[" + file.getName() + "] " + getText(R.string.cant_read_folder))
 						.setPositiveButton("OK", new DialogInterface.OnClickListener() {
 
@@ -368,15 +296,10 @@ public class FileDialog extends ListActivity {
 		if ((keyCode == KeyEvent.KEYCODE_BACK)) {
 			selectButton.setEnabled(false);
 
-			if (layoutCreate.getVisibility() == View.VISIBLE) {
-				layoutCreate.setVisibility(View.GONE);
-				layoutSelect.setVisibility(View.VISIBLE);
+			if (!currentPath.equals(ROOT)) {
+				getDir(parentPath);
 			} else {
-				if (!currentPath.equals(ROOT)) {
-					getDir(parentPath);
-				} else {
-					return super.onKeyDown(keyCode, event);
-				}
+				return super.onKeyDown(keyCode, event);
 			}
 
 			return true;
@@ -385,29 +308,4 @@ public class FileDialog extends ListActivity {
 		}
 	}
 
-	/**
-	 * Define se o botao de CREATE e visivel.
-	 * 
-	 * @param v
-	 */
-	private void setCreateVisible(View v) {
-		layoutCreate.setVisibility(View.VISIBLE);
-		layoutSelect.setVisibility(View.GONE);
-
-		inputManager.hideSoftInputFromWindow(v.getWindowToken(), 0);
-		selectButton.setEnabled(false);
-	}
-
-	/**
-	 * Define se o botao de SELECT e visivel.
-	 * 
-	 * @param v
-	 */
-	private void setSelectVisible(View v) {
-		layoutCreate.setVisibility(View.GONE);
-		layoutSelect.setVisibility(View.VISIBLE);
-
-		inputManager.hideSoftInputFromWindow(v.getWindowToken(), 0);
-		selectButton.setEnabled(false);
-	}
 }
diff --git a/gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/SelectionMode.java b/gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/SelectionMode.java
deleted file mode 100644
index d20d50c..0000000
--- a/gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/SelectionMode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// From http://code.google.com/p/android-file-dialog/
-//
-// Copyright (c) 2011, 2012, Alexander Ponomarev <alexander.ponomarev.1@gmail.com>
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-// 
-// Redistributions of source code must retain the above copyright notice, this list
-// of conditions and the following disclaimer. Redistributions in binary form must
-// reproduce the above copyright notice, this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the distribution.
-// Neither the name of the <ORGANIZATION> nor the names of its contributors may be used
-// to endorse or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-// TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-// BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-// DAMAGE.
-
-package com.lamerman;
-
-public class SelectionMode {
-	public static final int MODE_CREATE = 0;
-
-	public static final int MODE_OPEN = 1;
-}
-- 
2.7.4