From 4c2c0e1d0f07779ee7eae138fc558fa593fc35ca Mon Sep 17 00:00:00 2001
From: Jose <jfmcode@gmail.com>
Date: Thu, 17 Dec 2015 00:09:09 +0000
Subject: [PATCH] Add cancel button feature

---
 .gitignore                                    |   2 +
 demo/aFileDialog/aFileDialog.iml              |   8 +-
 .../afiledialog/FileChooserActivity.java      |  17 +-
 .../daidalos/afiledialog/FileChooserCore.java | 173 ++++++++++++------
 .../afiledialog/FileChooserDialog.java        |  26 ++-
 .../afiledialog/FileChooserLabels.java        |   8 +-
 .../main/res/layout/daidalos_file_chooser.xml |  10 +-
 .../aFileDialogTesting/aFileDialogTesting.iml |   8 +-
 .../test/AFileDialogTestingActivity.java      |  50 ++++-
 .../src/main/res/layout/main.xml              |  12 ++
 .../src/main/res/values-en/strings.xml        |   1 +
 .../src/main/res/values-es/strings.xml        |   1 +
 .../src/main/res/values-fr/strings.xml        |   1 +
 .../src/main/res/values/strings.xml           |   1 +
 demo/demo.iml                                 |   2 +-
 library/app/app.iml                           |  93 ++++++++++
 .../afiledialog/FileChooserActivity.java      |  17 +-
 .../daidalos/afiledialog/FileChooserCore.java | 173 ++++++++++++------
 .../afiledialog/FileChooserDialog.java        |  26 ++-
 .../afiledialog/FileChooserLabels.java        |   8 +-
 .../main/res/layout/daidalos_file_chooser.xml |  10 +-
 library/library.iml                           |   4 +-
 22 files changed, 512 insertions(+), 139 deletions(-)
 create mode 100644 library/app/app.iml

diff --git a/.gitignore b/.gitignore
index 93fa760..6e2fdda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,12 @@
 /demo/.idea
+/demo/.gradle
 /demo/build
 /demo/local.properties
 /demo/aFileDialog/build
 /demo/aFileDialogTesting/build
 
 /library/.idea
+/library/.gradle
 /library/build
 /library/local.properties
 /library/app/build
diff --git a/demo/aFileDialog/aFileDialog.iml b/demo/aFileDialog/aFileDialog.iml
index 5597765..04a49c3 100644
--- a/demo/aFileDialog/aFileDialog.iml
+++ b/demo/aFileDialog/aFileDialog.iml
@@ -12,10 +12,12 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -25,7 +27,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
diff --git a/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserActivity.java b/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserActivity.java
index d4c462f..547dc2d 100644
--- a/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserActivity.java
+++ b/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserActivity.java
@@ -70,7 +70,13 @@ public class FileChooserActivity extends Activity implements FileChooser {
 	 * a boolean that indicates if the user can create files. 
 	 */
 	public static final String INPUT_CAN_CREATE_FILES = "input_can_create_files";
-	
+
+	/**
+	 * Constant used for represent the key of the bundle object (inside the start's intent) which contains
+	 * a boolean that indicates if the cancel button must be show.
+	 */
+	public static final String INPUT_SHOW_CANCEL_BUTTON = "input_show_cancel_button";
+
 	/**
 	 * Constant used for represent the key of the bundle object (inside the start's intent) which contains 
 	 * a regular expression which is going to be used as a filter to determine which files can be selected. 
@@ -160,6 +166,7 @@ public void onCreate(Bundle savedInstanceState) {
             if(extras.containsKey(INPUT_CAN_CREATE_FILES)) core.setCanCreateFiles(extras.getBoolean(INPUT_CAN_CREATE_FILES));
             if(extras.containsKey(INPUT_LABELS)) core.setLabels((FileChooserLabels) extras.get(INPUT_LABELS));
             if(extras.containsKey(INPUT_SHOW_CONFIRMATION_ON_CREATE)) core.setShowConfirmationOnCreate(extras.getBoolean(INPUT_SHOW_CONFIRMATION_ON_CREATE));
+            if(extras.containsKey(INPUT_SHOW_CANCEL_BUTTON)) core.setShowCancelButton(extras.getBoolean(INPUT_SHOW_CANCEL_BUTTON));
             if(extras.containsKey(INPUT_SHOW_CONFIRMATION_ON_SELECT)) core.setShowConfirmationOnSelect(extras.getBoolean(INPUT_SHOW_CONFIRMATION_ON_SELECT));
             if(extras.containsKey(INPUT_SHOW_FULL_PATH_IN_TITLE)) core.setShowFullPathInTitle(extras.getBoolean(INPUT_SHOW_FULL_PATH_IN_TITLE));
             if(extras.containsKey(INPUT_USE_BACK_BUTTON_TO_NAVIGATE)) this.useBackButton = extras.getBoolean(INPUT_USE_BACK_BUTTON_TO_NAVIGATE);
@@ -193,6 +200,14 @@ public void onFileSelected(File file) {
                 finish();	
 			}
 		});
+
+		// Add a listener for when the cancel button is pressed.
+		core.addListener(new FileChooserCore.OnCancelListener() {
+			public void onCancel() {
+                // Close activity.
+                FileChooserActivity.super.onBackPressed();
+			}
+		});
     }
     
     /** Called when the user push the 'back' button. */
diff --git a/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserCore.java b/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserCore.java
index f233e88..df9b0eb 100644
--- a/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserCore.java
+++ b/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserCore.java
@@ -51,8 +51,13 @@ class FileChooserCore {
 	/**
 	 * The listeners for the event of select a file.
 	 */
-	private List<OnFileSelectedListener> listeners;
-	
+	private List<OnFileSelectedListener> fileSelectedListeners;
+
+    /**
+     * The listeners for the event of select a file.
+     */
+    private List<OnCancelListener> cancelListeners;
+
 	/**
 	 * A regular expression for filter the files.
 	 */
@@ -72,7 +77,12 @@ class FileChooserCore {
 	 * A boolean indicating if the chooser is going to be used to select folders.
 	 */
 	private boolean folderMode;
-	
+
+	/**
+	 * A boolean indicating if the chooser is going to be used to select folders.
+	 */
+	private boolean showCancelButton;
+
 	/**
 	 * A file that indicates the folder that is currently being displayed.
 	 */
@@ -122,7 +132,8 @@ class FileChooserCore {
 	public FileChooserCore(FileChooser fileChooser) {
 		// Initialize attributes.
 		this.chooser = fileChooser;	
-		this.listeners = new LinkedList<OnFileSelectedListener>();
+		this.fileSelectedListeners = new LinkedList<OnFileSelectedListener>();
+        this.cancelListeners = new LinkedList<OnCancelListener>();
 		this.filter = null;
 		this.showOnlySelectable = false;
 		this.setCanCreateFiles(false);
@@ -132,13 +143,16 @@ public FileChooserCore(FileChooser fileChooser) {
 		this.showConfirmationOnCreate = false;
 		this.showConfirmationOnSelect = false;
 		this.showFullPathInTitle = false;
-		
-		// Add listener for the  buttons.
+        this.showCancelButton = false;
+
+		// Add listener for the buttons.
 		LinearLayout root = this.chooser.getRootLayout();
 		Button addButton = (Button) root.findViewById(R.id.buttonAdd);
 		addButton.setOnClickListener(addButtonClickListener);
 		Button okButton = (Button) root.findViewById(R.id.buttonOk);
 		okButton.setOnClickListener(okButtonClickListener);
+        Button cancelButton = (Button) root.findViewById(R.id.buttonCancel);
+        cancelButton.setOnClickListener(cancelButtonClickListener);
 	}
 	
 	// ----- Events methods ----- //
@@ -178,7 +192,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
 					// Verify if a value has been entered.
 					if(fileName != null && fileName.length() > 0) {
 						// Notify the listeners.
-						FileChooserCore.this.notifyListeners(FileChooserCore.this.currentFolder, fileName);
+						FileChooserCore.this.notifyFileListeners(FileChooserCore.this.currentFolder, fileName);
 					}
 				}
 			});
@@ -199,10 +213,20 @@ public void onClick(DialogInterface dialog, int whichButton) {
 	private View.OnClickListener okButtonClickListener = new View.OnClickListener() {
 		public void onClick(View v) {
 			// Notify the listeners.
-			FileChooserCore.this.notifyListeners(FileChooserCore.this.currentFolder, null);
+			FileChooserCore.this.notifyFileListeners(FileChooserCore.this.currentFolder, null);
 		}
 	};
-	
+
+    /**
+     * Implementation of the click listener for when the cancel button is clicked.
+     */
+    private View.OnClickListener cancelButtonClickListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            // Notify the listeners.
+            FileChooserCore.this.notifyCancelListeners();
+        }
+    };
+
 	/**
 	 * Implementation of the click listener for when a file item is clicked.
 	 */
@@ -215,7 +239,7 @@ public void onClick(FileItem source) {
 				FileChooserCore.this.loadFolder(file);
 			} else {
 				// Notify the listeners.
-				FileChooserCore.this.notifyListeners(file, null);
+				FileChooserCore.this.notifyFileListeners(file, null);
 			}
 		}
 	};
@@ -226,7 +250,7 @@ public void onClick(FileItem source) {
 	 * @param listener The listener to add.
 	 */
 	public void addListener(OnFileSelectedListener listener) {
-		this.listeners.add(listener);
+		this.fileSelectedListeners.add(listener);
 	}
 	
 	/**
@@ -235,16 +259,35 @@ public void addListener(OnFileSelectedListener listener) {
 	 * @param listener The listener to remove.
 	 */
 	public void removeListener(OnFileSelectedListener listener) {
-		this.listeners.remove(listener);
-	}
-	
-	/**
-	 * Removes all the listeners for the event of a file selected.
-	 */
-	public void removeAllListeners() {
-		this.listeners.clear();
+		this.fileSelectedListeners.remove(listener);
 	}
-	
+
+    /**
+     * Add a listener for the event of a file selected.
+     *
+     * @param listener The listener to add.
+     */
+    public void addListener(OnCancelListener listener) {
+        this.cancelListeners.add(listener);
+    }
+
+    /**
+     * Removes a listener for the event of a file selected.
+     *
+     * @param listener The listener to remove.
+     */
+    public void removeListener(OnCancelListener listener) {
+        this.cancelListeners.remove(listener);
+    }
+
+    /**
+     * Removes all the listeners for the event of a file selected.
+     */
+    public void removeAllListeners() {
+        this.fileSelectedListeners.clear();
+        this.cancelListeners.clear();
+    }
+
 	/**
 	 * Interface definition for a callback to be invoked when a file is selected. 
 	 */
@@ -264,14 +307,33 @@ public interface OnFileSelectedListener {
 		 */
 		void onFileSelected(File folder, String name);
 	}
-	
+
+    /**
+     * Interface definition for a callback to be invoked when the cancel button is clicked.
+     */
+    public interface OnCancelListener {
+        /**
+         * Called when the cancel button is clicked.
+         */
+        void onCancel();
+    }
+
+    /**
+     * Notify to all listeners that the cancel button has been pressed.
+     */
+    private void notifyCancelListeners() {
+        for(int i=0; i<FileChooserCore.this.cancelListeners.size(); i++) {
+            FileChooserCore.this.cancelListeners.get(i).onCancel();
+        }
+    }
+
 	/**
 	 * Notify to all listeners that a file has been selected or created.
 	 * 
 	 * @param file The file or folder selected or the folder in which the file must be created.
 	 * @param name The name of the file that must be created or 'null' if a file was selected (instead of being created).
 	 */
-	private void notifyListeners(final File file, final String name) {
+	private void notifyFileListeners(final File file, final String name) {
 		// Determine if a file has been selected or created.
 		final boolean creation = name != null && name.length() > 0;
 		
@@ -301,11 +363,11 @@ private void notifyListeners(final File file, final String name) {
 			alert.setPositiveButton(posButton, new DialogInterface.OnClickListener() {
 				public void onClick(DialogInterface dialog, int whichButton) {
 					// Notify to listeners.
-					for(int i=0; i<FileChooserCore.this.listeners.size(); i++) {
+					for(int i=0; i<FileChooserCore.this.fileSelectedListeners.size(); i++) {
 						if(creation) {
-							FileChooserCore.this.listeners.get(i).onFileSelected(file, name);				
+							FileChooserCore.this.fileSelectedListeners.get(i).onFileSelected(file, name);
 						} else {
-							FileChooserCore.this.listeners.get(i).onFileSelected(file);
+							FileChooserCore.this.fileSelectedListeners.get(i).onFileSelected(file);
 						}
 					}	
 				}
@@ -320,11 +382,11 @@ public void onClick(DialogInterface dialog, int whichButton) {
 			alert.show();
 		} else {
 			// Notify to listeners.
-			for(int i=0; i<FileChooserCore.this.listeners.size(); i++) {
+			for(int i=0; i<FileChooserCore.this.fileSelectedListeners.size(); i++) {
 				if(creation) {
-					FileChooserCore.this.listeners.get(i).onFileSelected(file, name);				
+					FileChooserCore.this.fileSelectedListeners.get(i).onFileSelected(file, name);
 				} else {
-					FileChooserCore.this.listeners.get(i).onFileSelected(file);
+					FileChooserCore.this.fileSelectedListeners.get(i).onFileSelected(file);
 				}
 			}			
 		}		
@@ -362,7 +424,7 @@ public void setShowFullPathInTitle(boolean show) {
 	/**
 	 * Defines the value of the labels.
 	 * 
-	 * @param label The labels.
+	 * @param labels The labels.
 	 */
 	public void setLabels(FileChooserLabels labels) {
 		this.labels = labels;
@@ -379,7 +441,12 @@ public void setLabels(FileChooserLabels labels) {
 			if(labels.labelSelectButton != null) {
 				Button okButton = (Button) root.findViewById(R.id.buttonOk);
 				okButton.setText(labels.labelSelectButton);
-			}			
+			}
+
+            if(labels.labelCancelButton != null) {
+                Button cancelButton = (Button) root.findViewById(R.id.buttonCancel);
+                cancelButton.setText(labels.labelCancelButton);
+            }
 		}
 	}
 	
@@ -413,7 +480,19 @@ public void setFolderMode(boolean folderMode) {
 		// Reload the list of files.
 		this.loadFolder(this.currentFolder);
 	}
-	
+
+	/**
+	 * Defines if the chooser is going to be used to select folders, instead of files.
+	 *
+	 * @param showCancelButton 'true' for show the cancel button or 'false' for not showing it.
+	 */
+	public void setShowCancelButton(boolean showCancelButton) {
+		this.showCancelButton = showCancelButton;
+
+		// Show or hide the 'Cancel' button.
+		updateButtonsLayout();
+	}
+
 	/**
 	 * Defines if the user can create files, instead of only select files.
 	 * 
@@ -455,37 +534,19 @@ public File getCurrentFolder() {
 	private void updateButtonsLayout() {
 		// Get the buttons layout.
 		LinearLayout root = this.chooser.getRootLayout();
-		LinearLayout buttonsLayout = (LinearLayout) root.findViewById(R.id.linearLayoutButtons);
 
 		// Verify if the 'Add' button is visible or not.
 		View addButton = root.findViewById(R.id.buttonAdd);
-		addButton.setVisibility(this.canCreateFiles? View.VISIBLE : View.INVISIBLE);
-		addButton.getLayoutParams().width = this.canCreateFiles? ViewGroup.LayoutParams.MATCH_PARENT : 0;
+		addButton.setVisibility(this.canCreateFiles? View.VISIBLE : View.GONE);
 
 		// Verify if the 'Ok' button is visible or not.
 		View okButton = root.findViewById(R.id.buttonOk);
-		okButton.setVisibility(this.folderMode? View.VISIBLE : View.INVISIBLE);
-		okButton.getLayoutParams().width = this.folderMode? ViewGroup.LayoutParams.MATCH_PARENT : 0;
-		
-		// If both buttons are invisible, hide the layout.
-		ViewGroup.LayoutParams params = buttonsLayout.getLayoutParams();
-		if(this.canCreateFiles || this.folderMode) {
-			// Show the layout.
-			params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
-
-			// If only the 'Ok' button is visible, put him first. Otherwise, put 'Add' first.
-			buttonsLayout.removeAllViews();
-			if(this.folderMode && !this.canCreateFiles) {
-				buttonsLayout.addView(okButton);
-				buttonsLayout.addView(addButton);
-			} else {
-				buttonsLayout.addView(addButton);			
-				buttonsLayout.addView(okButton);
-			}
-		} else {
-			// Hide the layout.
-			params.height = 0;
-		}
+		okButton.setVisibility(this.folderMode? View.VISIBLE : View.GONE);
+
+        // Verify if the 'Cancel' button is visible or not.
+        View cancelButton = root.findViewById(R.id.buttonCancel);
+        cancelButton.setVisibility(this.showCancelButton? View.VISIBLE : View.GONE);
+
 	}
 	
 	/**
diff --git a/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserDialog.java b/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserDialog.java
index 0da4c33..0b89f9b 100644
--- a/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserDialog.java
+++ b/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserDialog.java
@@ -94,17 +94,26 @@ public FileChooserDialog(Context context, String folderPath) {
         core.addListener(new FileChooserCore.OnFileSelectedListener() {
 			public void onFileSelected(File folder, String name) {
 				// Call to the listeners.
-				for(int i=0; i<FileChooserDialog.this.listeners.size(); i++) {
+				for (int i = 0; i < FileChooserDialog.this.listeners.size(); i++) {
 					FileChooserDialog.this.listeners.get(i).onFileSelected(FileChooserDialog.this, folder, name);
 				}
 			}
+
 			public void onFileSelected(File file) {
 				// Call to the listeners.
-				for(int i=0; i<FileChooserDialog.this.listeners.size(); i++) {
+				for (int i = 0; i < FileChooserDialog.this.listeners.size(); i++) {
 					FileChooserDialog.this.listeners.get(i).onFileSelected(FileChooserDialog.this, file);
 				}
 			}
 		});
+
+		// Add a listener for when the cancel button is pressed.
+		core.addListener(new FileChooserCore.OnCancelListener() {
+			public void onCancel() {
+				// Close activity.
+                FileChooserDialog.super.onBackPressed();
+			}
+		});
 	}
 	
     // ----- Events methods ----- //
@@ -210,11 +219,20 @@ public void setFolderMode(boolean folderMode) {
 	public void setCanCreateFiles(boolean canCreate) {
 		this.core.setCanCreateFiles(canCreate);
 	}
-	
+
+	/**
+	 * Defines if the cancel button must be show.
+	 *
+	 * @param canShow 'true' if the user can create files or 'false' if it can only select them.
+	 */
+	public void setShowCancelButton(boolean canShow) {
+		this.core.setShowCancelButton(canShow);
+	}
+
 	/**
 	 * Defines the value of the labels.
 	 * 
-	 * @param label The labels.
+	 * @param labels The labels.
 	 */
 	public void setLabels(FileChooserLabels labels) {
 		this.core.setLabels(labels);
diff --git a/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserLabels.java b/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserLabels.java
index 46c4643..77a1905 100644
--- a/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserLabels.java
+++ b/demo/aFileDialog/src/main/java/ar/com/daidalos/afiledialog/FileChooserLabels.java
@@ -38,6 +38,7 @@ public class FileChooserLabels implements Serializable {
 	 */
 	public FileChooserLabels() {
 		this.labelAddButton = null;
+		this.labelCancelButton = null;
 		this.labelSelectButton = null;
 		this.messageConfirmSelection = null;
 		this.messageConfirmCreation = null;
@@ -53,7 +54,12 @@ public FileChooserLabels() {
 	 * The label for the button used to create a file or a folder.
 	 */
 	public String labelAddButton;
-	
+
+	/**
+	 * The label for the cancel button.
+	 */
+	public String labelCancelButton;
+
 	/**
 	 * The label for the button for select the current folder (when using the file chooser for select folders).
 	 */
diff --git a/demo/aFileDialog/src/main/res/layout/daidalos_file_chooser.xml b/demo/aFileDialog/src/main/res/layout/daidalos_file_chooser.xml
index 75417c4..6431485 100644
--- a/demo/aFileDialog/src/main/res/layout/daidalos_file_chooser.xml
+++ b/demo/aFileDialog/src/main/res/layout/daidalos_file_chooser.xml
@@ -44,6 +44,14 @@
             android:layout_weight="1"
             android:drawableLeft="@drawable/tick"
             android:text="@string/daidalos_ok" />
-        
+
+        <Button
+            android:id="@+id/buttonCancel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:drawableLeft="@drawable/no"
+            android:text="@string/daidalos_cancel" />
+
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/demo/aFileDialogTesting/aFileDialogTesting.iml b/demo/aFileDialogTesting/aFileDialogTesting.iml
index 5b70629..192313a 100644
--- a/demo/aFileDialogTesting/aFileDialogTesting.iml
+++ b/demo/aFileDialogTesting/aFileDialogTesting.iml
@@ -12,10 +12,12 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,7 +26,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
diff --git a/demo/aFileDialogTesting/src/main/java/ar/com/daidalos/afiledialog/test/AFileDialogTestingActivity.java b/demo/aFileDialogTesting/src/main/java/ar/com/daidalos/afiledialog/test/AFileDialogTestingActivity.java
index b94daab..f1297c3 100644
--- a/demo/aFileDialogTesting/src/main/java/ar/com/daidalos/afiledialog/test/AFileDialogTestingActivity.java
+++ b/demo/aFileDialogTesting/src/main/java/ar/com/daidalos/afiledialog/test/AFileDialogTestingActivity.java
@@ -55,6 +55,8 @@ public void onCreate(Bundle savedInstanceState) {
         buttonActivity6.setOnClickListener(btnActivityAskConfirmation);
         Button buttonActivity7 = (Button)this.findViewById(R.id.activity_custom_labels);
         buttonActivity7.setOnClickListener(btnActivityCustomLabels);
+		Button buttonActivity8 = (Button)this.findViewById(R.id.activity_cancel_button);
+		buttonActivity8.setOnClickListener(btnActivityCancelButton);
 
         Button buttonDialog1 = (Button)this.findViewById(R.id.dialog_simple_open);
         buttonDialog1.setOnClickListener(btnDialogSimpleOpen);
@@ -70,6 +72,8 @@ public void onCreate(Bundle savedInstanceState) {
         buttonDialog6.setOnClickListener(btnDialogAskConfirmation);
         Button buttonDialog7 = (Button)this.findViewById(R.id.dialog_custom_labels);
         buttonDialog7.setOnClickListener(btnDialogCustomLabels);
+		Button buttonDialog8 = (Button)this.findViewById(R.id.dialog_cancel_button);
+		buttonDialog8.setOnClickListener(btnDialogCancelButton);
     }
     
     // ----- Buttons for open a dialog ----- //
@@ -184,7 +188,10 @@ public void onClick(View v) {
     		
     		// Activate the button for create files.
     		dialog.setCanCreateFiles(true);
-    		
+
+			// Activate the button for cancel.
+			dialog.setShowCancelButton(true);
+
     		// Activate the confirmation dialogs.
     		dialog.setShowConfirmation(true, true);
     		
@@ -200,13 +207,31 @@ public void onClick(View v) {
     		labels.messageConfirmSelection = "messageConfirmSelection";
     		labels.labelConfirmYesButton = "yesButton";
     		labels.labelConfirmNoButton = "noButton";
+			labels.labelCancelButton = "cancelButton";
     		dialog.setLabels(labels);
     		
     		// Show the dialog.
             dialog.show();
     	}
 	};
-	
+
+
+    private OnClickListener btnDialogCancelButton = new OnClickListener() {
+        public void onClick(View v) {
+            // Create the dialog.
+            FileChooserDialog dialog = new FileChooserDialog(AFileDialogTestingActivity.this);
+
+            // Assign listener for the select event.
+            dialog.addListener(AFileDialogTestingActivity.this.onFileSelectedListener);
+
+            // Activate the button for create files.
+            dialog.setShowCancelButton(true);
+
+            // Show the dialog.
+            dialog.show();
+        }
+    };
+
 	// ---- Buttons for open an activity ----- //
     
 	private OnClickListener btnActivitySimpleOpen = new OnClickListener() {
@@ -298,7 +323,10 @@ public void onClick(View v) {
             
             // Activate the button for create files.
             intent.putExtra(FileChooserActivity.INPUT_CAN_CREATE_FILES, true);
-            
+
+			// Activate the cancel button.
+			intent.putExtra(FileChooserActivity.INPUT_SHOW_CANCEL_BUTTON, true);
+
             // Activate the confirmation dialogs.
             intent.putExtra(FileChooserActivity.INPUT_SHOW_CONFIRMATION_ON_CREATE, true);
             intent.putExtra(FileChooserActivity.INPUT_SHOW_CONFIRMATION_ON_SELECT, true);
@@ -315,13 +343,27 @@ public void onClick(View v) {
     		labels.messageConfirmSelection = "messageConfirmSelection";
     		labels.labelConfirmYesButton = "yesButton";
     		labels.labelConfirmNoButton = "noButton";
+			labels.labelCancelButton = "cancelButton";
     		intent.putExtra(FileChooserActivity.INPUT_LABELS, (Serializable) labels);
     		
     		// Call the activity            
             AFileDialogTestingActivity.this.startActivityForResult(intent, 0); 
     	}
 	};
-	
+
+    private OnClickListener btnActivityCancelButton = new OnClickListener() {
+        public void onClick(View v) {
+            // Create the intent for call the activity.
+            Intent intent = new Intent(AFileDialogTestingActivity.this, FileChooserActivity.class);
+
+            // Activate the folder mode.
+            intent.putExtra(FileChooserActivity.INPUT_SHOW_CANCEL_BUTTON, true);
+
+            // Call the activity
+            AFileDialogTestingActivity.this.startActivityForResult(intent, 0);
+        }
+    };
+
 	/*
 	private OnClickListener clickButtonOpenActivity = new OnClickListener() {
     	public void onClick(View v) {
diff --git a/demo/aFileDialogTesting/src/main/res/layout/main.xml b/demo/aFileDialogTesting/src/main/res/layout/main.xml
index 9d2ea4f..7da03ee 100644
--- a/demo/aFileDialogTesting/src/main/res/layout/main.xml
+++ b/demo/aFileDialogTesting/src/main/res/layout/main.xml
@@ -63,6 +63,12 @@
                 android:layout_height="wrap_content"
                 android:text="@string/custom_labels" />
 
+            <Button
+                android:id="@+id/dialog_cancel_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/cancel_button" />
+
         </LinearLayout>
 
         <LinearLayout
@@ -120,6 +126,12 @@
                 android:layout_height="wrap_content"
                 android:text="@string/custom_labels" />
 
+            <Button
+                android:id="@+id/activity_cancel_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/cancel_button" />
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/demo/aFileDialogTesting/src/main/res/values-en/strings.xml b/demo/aFileDialogTesting/src/main/res/values-en/strings.xml
index 96c4018..ce9ee32 100644
--- a/demo/aFileDialogTesting/src/main/res/values-en/strings.xml
+++ b/demo/aFileDialogTesting/src/main/res/values-en/strings.xml
@@ -14,5 +14,6 @@
     <string name="select_images">Select images</string>
     <string name="ask_confirmation">Ask confirmation</string>
     <string name="custom_labels">Custom labels</string>
+    <string name="cancel_button">Cancel button</string>
 
 </resources>
\ No newline at end of file
diff --git a/demo/aFileDialogTesting/src/main/res/values-es/strings.xml b/demo/aFileDialogTesting/src/main/res/values-es/strings.xml
index f17a41a..182b1c2 100644
--- a/demo/aFileDialogTesting/src/main/res/values-es/strings.xml
+++ b/demo/aFileDialogTesting/src/main/res/values-es/strings.xml
@@ -14,5 +14,6 @@
     <string name="select_images">Escoger imágenes</string>
     <string name="ask_confirmation">Pedir confirmación</string>
     <string name="custom_labels">Etiquetas personalizadas</string>
+    <string name="cancel_button">Botón cancelar</string>
 
 </resources>
\ No newline at end of file
diff --git a/demo/aFileDialogTesting/src/main/res/values-fr/strings.xml b/demo/aFileDialogTesting/src/main/res/values-fr/strings.xml
index 6fdbaf7..9898ea9 100644
--- a/demo/aFileDialogTesting/src/main/res/values-fr/strings.xml
+++ b/demo/aFileDialogTesting/src/main/res/values-fr/strings.xml
@@ -14,5 +14,6 @@
     <string name="select_images">Choisir images</string>
     <string name="ask_confirmation">Démander confirmation</string>
     <string name="custom_labels">Étiquettes personnalisés</string>
+    <string name="cancel_button">Bouton annuler</string>
 
 </resources>
\ No newline at end of file
diff --git a/demo/aFileDialogTesting/src/main/res/values/strings.xml b/demo/aFileDialogTesting/src/main/res/values/strings.xml
index 96c4018..ce9ee32 100644
--- a/demo/aFileDialogTesting/src/main/res/values/strings.xml
+++ b/demo/aFileDialogTesting/src/main/res/values/strings.xml
@@ -14,5 +14,6 @@
     <string name="select_images">Select images</string>
     <string name="ask_confirmation">Ask confirmation</string>
     <string name="custom_labels">Custom labels</string>
+    <string name="cancel_button">Cancel button</string>
 
 </resources>
\ No newline at end of file
diff --git a/demo/demo.iml b/demo/demo.iml
index f914fec..1666738 100644
--- a/demo/demo.iml
+++ b/demo/demo.iml
@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
diff --git a/library/app/app.iml b/library/app/app.iml
new file mode 100644
index 0000000..484494c
--- /dev/null
+++ b/library/app/app.iml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="library" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":app" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="LIBRARY_PROJECT" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 10 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserActivity.java b/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserActivity.java
index d4c462f..547dc2d 100644
--- a/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserActivity.java
+++ b/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserActivity.java
@@ -70,7 +70,13 @@ public class FileChooserActivity extends Activity implements FileChooser {
 	 * a boolean that indicates if the user can create files. 
 	 */
 	public static final String INPUT_CAN_CREATE_FILES = "input_can_create_files";
-	
+
+	/**
+	 * Constant used for represent the key of the bundle object (inside the start's intent) which contains
+	 * a boolean that indicates if the cancel button must be show.
+	 */
+	public static final String INPUT_SHOW_CANCEL_BUTTON = "input_show_cancel_button";
+
 	/**
 	 * Constant used for represent the key of the bundle object (inside the start's intent) which contains 
 	 * a regular expression which is going to be used as a filter to determine which files can be selected. 
@@ -160,6 +166,7 @@ public void onCreate(Bundle savedInstanceState) {
             if(extras.containsKey(INPUT_CAN_CREATE_FILES)) core.setCanCreateFiles(extras.getBoolean(INPUT_CAN_CREATE_FILES));
             if(extras.containsKey(INPUT_LABELS)) core.setLabels((FileChooserLabels) extras.get(INPUT_LABELS));
             if(extras.containsKey(INPUT_SHOW_CONFIRMATION_ON_CREATE)) core.setShowConfirmationOnCreate(extras.getBoolean(INPUT_SHOW_CONFIRMATION_ON_CREATE));
+            if(extras.containsKey(INPUT_SHOW_CANCEL_BUTTON)) core.setShowCancelButton(extras.getBoolean(INPUT_SHOW_CANCEL_BUTTON));
             if(extras.containsKey(INPUT_SHOW_CONFIRMATION_ON_SELECT)) core.setShowConfirmationOnSelect(extras.getBoolean(INPUT_SHOW_CONFIRMATION_ON_SELECT));
             if(extras.containsKey(INPUT_SHOW_FULL_PATH_IN_TITLE)) core.setShowFullPathInTitle(extras.getBoolean(INPUT_SHOW_FULL_PATH_IN_TITLE));
             if(extras.containsKey(INPUT_USE_BACK_BUTTON_TO_NAVIGATE)) this.useBackButton = extras.getBoolean(INPUT_USE_BACK_BUTTON_TO_NAVIGATE);
@@ -193,6 +200,14 @@ public void onFileSelected(File file) {
                 finish();	
 			}
 		});
+
+		// Add a listener for when the cancel button is pressed.
+		core.addListener(new FileChooserCore.OnCancelListener() {
+			public void onCancel() {
+                // Close activity.
+                FileChooserActivity.super.onBackPressed();
+			}
+		});
     }
     
     /** Called when the user push the 'back' button. */
diff --git a/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserCore.java b/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserCore.java
index f233e88..df9b0eb 100644
--- a/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserCore.java
+++ b/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserCore.java
@@ -51,8 +51,13 @@ class FileChooserCore {
 	/**
 	 * The listeners for the event of select a file.
 	 */
-	private List<OnFileSelectedListener> listeners;
-	
+	private List<OnFileSelectedListener> fileSelectedListeners;
+
+    /**
+     * The listeners for the event of select a file.
+     */
+    private List<OnCancelListener> cancelListeners;
+
 	/**
 	 * A regular expression for filter the files.
 	 */
@@ -72,7 +77,12 @@ class FileChooserCore {
 	 * A boolean indicating if the chooser is going to be used to select folders.
 	 */
 	private boolean folderMode;
-	
+
+	/**
+	 * A boolean indicating if the chooser is going to be used to select folders.
+	 */
+	private boolean showCancelButton;
+
 	/**
 	 * A file that indicates the folder that is currently being displayed.
 	 */
@@ -122,7 +132,8 @@ class FileChooserCore {
 	public FileChooserCore(FileChooser fileChooser) {
 		// Initialize attributes.
 		this.chooser = fileChooser;	
-		this.listeners = new LinkedList<OnFileSelectedListener>();
+		this.fileSelectedListeners = new LinkedList<OnFileSelectedListener>();
+        this.cancelListeners = new LinkedList<OnCancelListener>();
 		this.filter = null;
 		this.showOnlySelectable = false;
 		this.setCanCreateFiles(false);
@@ -132,13 +143,16 @@ public FileChooserCore(FileChooser fileChooser) {
 		this.showConfirmationOnCreate = false;
 		this.showConfirmationOnSelect = false;
 		this.showFullPathInTitle = false;
-		
-		// Add listener for the  buttons.
+        this.showCancelButton = false;
+
+		// Add listener for the buttons.
 		LinearLayout root = this.chooser.getRootLayout();
 		Button addButton = (Button) root.findViewById(R.id.buttonAdd);
 		addButton.setOnClickListener(addButtonClickListener);
 		Button okButton = (Button) root.findViewById(R.id.buttonOk);
 		okButton.setOnClickListener(okButtonClickListener);
+        Button cancelButton = (Button) root.findViewById(R.id.buttonCancel);
+        cancelButton.setOnClickListener(cancelButtonClickListener);
 	}
 	
 	// ----- Events methods ----- //
@@ -178,7 +192,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
 					// Verify if a value has been entered.
 					if(fileName != null && fileName.length() > 0) {
 						// Notify the listeners.
-						FileChooserCore.this.notifyListeners(FileChooserCore.this.currentFolder, fileName);
+						FileChooserCore.this.notifyFileListeners(FileChooserCore.this.currentFolder, fileName);
 					}
 				}
 			});
@@ -199,10 +213,20 @@ public void onClick(DialogInterface dialog, int whichButton) {
 	private View.OnClickListener okButtonClickListener = new View.OnClickListener() {
 		public void onClick(View v) {
 			// Notify the listeners.
-			FileChooserCore.this.notifyListeners(FileChooserCore.this.currentFolder, null);
+			FileChooserCore.this.notifyFileListeners(FileChooserCore.this.currentFolder, null);
 		}
 	};
-	
+
+    /**
+     * Implementation of the click listener for when the cancel button is clicked.
+     */
+    private View.OnClickListener cancelButtonClickListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            // Notify the listeners.
+            FileChooserCore.this.notifyCancelListeners();
+        }
+    };
+
 	/**
 	 * Implementation of the click listener for when a file item is clicked.
 	 */
@@ -215,7 +239,7 @@ public void onClick(FileItem source) {
 				FileChooserCore.this.loadFolder(file);
 			} else {
 				// Notify the listeners.
-				FileChooserCore.this.notifyListeners(file, null);
+				FileChooserCore.this.notifyFileListeners(file, null);
 			}
 		}
 	};
@@ -226,7 +250,7 @@ public void onClick(FileItem source) {
 	 * @param listener The listener to add.
 	 */
 	public void addListener(OnFileSelectedListener listener) {
-		this.listeners.add(listener);
+		this.fileSelectedListeners.add(listener);
 	}
 	
 	/**
@@ -235,16 +259,35 @@ public void addListener(OnFileSelectedListener listener) {
 	 * @param listener The listener to remove.
 	 */
 	public void removeListener(OnFileSelectedListener listener) {
-		this.listeners.remove(listener);
-	}
-	
-	/**
-	 * Removes all the listeners for the event of a file selected.
-	 */
-	public void removeAllListeners() {
-		this.listeners.clear();
+		this.fileSelectedListeners.remove(listener);
 	}
-	
+
+    /**
+     * Add a listener for the event of a file selected.
+     *
+     * @param listener The listener to add.
+     */
+    public void addListener(OnCancelListener listener) {
+        this.cancelListeners.add(listener);
+    }
+
+    /**
+     * Removes a listener for the event of a file selected.
+     *
+     * @param listener The listener to remove.
+     */
+    public void removeListener(OnCancelListener listener) {
+        this.cancelListeners.remove(listener);
+    }
+
+    /**
+     * Removes all the listeners for the event of a file selected.
+     */
+    public void removeAllListeners() {
+        this.fileSelectedListeners.clear();
+        this.cancelListeners.clear();
+    }
+
 	/**
 	 * Interface definition for a callback to be invoked when a file is selected. 
 	 */
@@ -264,14 +307,33 @@ public interface OnFileSelectedListener {
 		 */
 		void onFileSelected(File folder, String name);
 	}
-	
+
+    /**
+     * Interface definition for a callback to be invoked when the cancel button is clicked.
+     */
+    public interface OnCancelListener {
+        /**
+         * Called when the cancel button is clicked.
+         */
+        void onCancel();
+    }
+
+    /**
+     * Notify to all listeners that the cancel button has been pressed.
+     */
+    private void notifyCancelListeners() {
+        for(int i=0; i<FileChooserCore.this.cancelListeners.size(); i++) {
+            FileChooserCore.this.cancelListeners.get(i).onCancel();
+        }
+    }
+
 	/**
 	 * Notify to all listeners that a file has been selected or created.
 	 * 
 	 * @param file The file or folder selected or the folder in which the file must be created.
 	 * @param name The name of the file that must be created or 'null' if a file was selected (instead of being created).
 	 */
-	private void notifyListeners(final File file, final String name) {
+	private void notifyFileListeners(final File file, final String name) {
 		// Determine if a file has been selected or created.
 		final boolean creation = name != null && name.length() > 0;
 		
@@ -301,11 +363,11 @@ private void notifyListeners(final File file, final String name) {
 			alert.setPositiveButton(posButton, new DialogInterface.OnClickListener() {
 				public void onClick(DialogInterface dialog, int whichButton) {
 					// Notify to listeners.
-					for(int i=0; i<FileChooserCore.this.listeners.size(); i++) {
+					for(int i=0; i<FileChooserCore.this.fileSelectedListeners.size(); i++) {
 						if(creation) {
-							FileChooserCore.this.listeners.get(i).onFileSelected(file, name);				
+							FileChooserCore.this.fileSelectedListeners.get(i).onFileSelected(file, name);
 						} else {
-							FileChooserCore.this.listeners.get(i).onFileSelected(file);
+							FileChooserCore.this.fileSelectedListeners.get(i).onFileSelected(file);
 						}
 					}	
 				}
@@ -320,11 +382,11 @@ public void onClick(DialogInterface dialog, int whichButton) {
 			alert.show();
 		} else {
 			// Notify to listeners.
-			for(int i=0; i<FileChooserCore.this.listeners.size(); i++) {
+			for(int i=0; i<FileChooserCore.this.fileSelectedListeners.size(); i++) {
 				if(creation) {
-					FileChooserCore.this.listeners.get(i).onFileSelected(file, name);				
+					FileChooserCore.this.fileSelectedListeners.get(i).onFileSelected(file, name);
 				} else {
-					FileChooserCore.this.listeners.get(i).onFileSelected(file);
+					FileChooserCore.this.fileSelectedListeners.get(i).onFileSelected(file);
 				}
 			}			
 		}		
@@ -362,7 +424,7 @@ public void setShowFullPathInTitle(boolean show) {
 	/**
 	 * Defines the value of the labels.
 	 * 
-	 * @param label The labels.
+	 * @param labels The labels.
 	 */
 	public void setLabels(FileChooserLabels labels) {
 		this.labels = labels;
@@ -379,7 +441,12 @@ public void setLabels(FileChooserLabels labels) {
 			if(labels.labelSelectButton != null) {
 				Button okButton = (Button) root.findViewById(R.id.buttonOk);
 				okButton.setText(labels.labelSelectButton);
-			}			
+			}
+
+            if(labels.labelCancelButton != null) {
+                Button cancelButton = (Button) root.findViewById(R.id.buttonCancel);
+                cancelButton.setText(labels.labelCancelButton);
+            }
 		}
 	}
 	
@@ -413,7 +480,19 @@ public void setFolderMode(boolean folderMode) {
 		// Reload the list of files.
 		this.loadFolder(this.currentFolder);
 	}
-	
+
+	/**
+	 * Defines if the chooser is going to be used to select folders, instead of files.
+	 *
+	 * @param showCancelButton 'true' for show the cancel button or 'false' for not showing it.
+	 */
+	public void setShowCancelButton(boolean showCancelButton) {
+		this.showCancelButton = showCancelButton;
+
+		// Show or hide the 'Cancel' button.
+		updateButtonsLayout();
+	}
+
 	/**
 	 * Defines if the user can create files, instead of only select files.
 	 * 
@@ -455,37 +534,19 @@ public File getCurrentFolder() {
 	private void updateButtonsLayout() {
 		// Get the buttons layout.
 		LinearLayout root = this.chooser.getRootLayout();
-		LinearLayout buttonsLayout = (LinearLayout) root.findViewById(R.id.linearLayoutButtons);
 
 		// Verify if the 'Add' button is visible or not.
 		View addButton = root.findViewById(R.id.buttonAdd);
-		addButton.setVisibility(this.canCreateFiles? View.VISIBLE : View.INVISIBLE);
-		addButton.getLayoutParams().width = this.canCreateFiles? ViewGroup.LayoutParams.MATCH_PARENT : 0;
+		addButton.setVisibility(this.canCreateFiles? View.VISIBLE : View.GONE);
 
 		// Verify if the 'Ok' button is visible or not.
 		View okButton = root.findViewById(R.id.buttonOk);
-		okButton.setVisibility(this.folderMode? View.VISIBLE : View.INVISIBLE);
-		okButton.getLayoutParams().width = this.folderMode? ViewGroup.LayoutParams.MATCH_PARENT : 0;
-		
-		// If both buttons are invisible, hide the layout.
-		ViewGroup.LayoutParams params = buttonsLayout.getLayoutParams();
-		if(this.canCreateFiles || this.folderMode) {
-			// Show the layout.
-			params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
-
-			// If only the 'Ok' button is visible, put him first. Otherwise, put 'Add' first.
-			buttonsLayout.removeAllViews();
-			if(this.folderMode && !this.canCreateFiles) {
-				buttonsLayout.addView(okButton);
-				buttonsLayout.addView(addButton);
-			} else {
-				buttonsLayout.addView(addButton);			
-				buttonsLayout.addView(okButton);
-			}
-		} else {
-			// Hide the layout.
-			params.height = 0;
-		}
+		okButton.setVisibility(this.folderMode? View.VISIBLE : View.GONE);
+
+        // Verify if the 'Cancel' button is visible or not.
+        View cancelButton = root.findViewById(R.id.buttonCancel);
+        cancelButton.setVisibility(this.showCancelButton? View.VISIBLE : View.GONE);
+
 	}
 	
 	/**
diff --git a/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserDialog.java b/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserDialog.java
index 0da4c33..0b89f9b 100644
--- a/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserDialog.java
+++ b/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserDialog.java
@@ -94,17 +94,26 @@ public FileChooserDialog(Context context, String folderPath) {
         core.addListener(new FileChooserCore.OnFileSelectedListener() {
 			public void onFileSelected(File folder, String name) {
 				// Call to the listeners.
-				for(int i=0; i<FileChooserDialog.this.listeners.size(); i++) {
+				for (int i = 0; i < FileChooserDialog.this.listeners.size(); i++) {
 					FileChooserDialog.this.listeners.get(i).onFileSelected(FileChooserDialog.this, folder, name);
 				}
 			}
+
 			public void onFileSelected(File file) {
 				// Call to the listeners.
-				for(int i=0; i<FileChooserDialog.this.listeners.size(); i++) {
+				for (int i = 0; i < FileChooserDialog.this.listeners.size(); i++) {
 					FileChooserDialog.this.listeners.get(i).onFileSelected(FileChooserDialog.this, file);
 				}
 			}
 		});
+
+		// Add a listener for when the cancel button is pressed.
+		core.addListener(new FileChooserCore.OnCancelListener() {
+			public void onCancel() {
+				// Close activity.
+                FileChooserDialog.super.onBackPressed();
+			}
+		});
 	}
 	
     // ----- Events methods ----- //
@@ -210,11 +219,20 @@ public void setFolderMode(boolean folderMode) {
 	public void setCanCreateFiles(boolean canCreate) {
 		this.core.setCanCreateFiles(canCreate);
 	}
-	
+
+	/**
+	 * Defines if the cancel button must be show.
+	 *
+	 * @param canShow 'true' if the user can create files or 'false' if it can only select them.
+	 */
+	public void setShowCancelButton(boolean canShow) {
+		this.core.setShowCancelButton(canShow);
+	}
+
 	/**
 	 * Defines the value of the labels.
 	 * 
-	 * @param label The labels.
+	 * @param labels The labels.
 	 */
 	public void setLabels(FileChooserLabels labels) {
 		this.core.setLabels(labels);
diff --git a/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserLabels.java b/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserLabels.java
index 46c4643..77a1905 100644
--- a/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserLabels.java
+++ b/library/app/src/main/java/ar/com/daidalos/afiledialog/FileChooserLabels.java
@@ -38,6 +38,7 @@ public class FileChooserLabels implements Serializable {
 	 */
 	public FileChooserLabels() {
 		this.labelAddButton = null;
+		this.labelCancelButton = null;
 		this.labelSelectButton = null;
 		this.messageConfirmSelection = null;
 		this.messageConfirmCreation = null;
@@ -53,7 +54,12 @@ public FileChooserLabels() {
 	 * The label for the button used to create a file or a folder.
 	 */
 	public String labelAddButton;
-	
+
+	/**
+	 * The label for the cancel button.
+	 */
+	public String labelCancelButton;
+
 	/**
 	 * The label for the button for select the current folder (when using the file chooser for select folders).
 	 */
diff --git a/library/app/src/main/res/layout/daidalos_file_chooser.xml b/library/app/src/main/res/layout/daidalos_file_chooser.xml
index 75417c4..6431485 100644
--- a/library/app/src/main/res/layout/daidalos_file_chooser.xml
+++ b/library/app/src/main/res/layout/daidalos_file_chooser.xml
@@ -44,6 +44,14 @@
             android:layout_weight="1"
             android:drawableLeft="@drawable/tick"
             android:text="@string/daidalos_ok" />
-        
+
+        <Button
+            android:id="@+id/buttonCancel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:drawableLeft="@drawable/no"
+            android:text="@string/daidalos_cancel" />
+
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/library/library.iml b/library/library.iml
index bfb1daa..8ff71cb 100644
--- a/library/library.iml
+++ b/library/library.iml
@@ -8,12 +8,12 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file