Merge branch 'master' of git://github.com/jruesga/CMFileManager into dvt

3 files changed, 16 insertions, 0 deletions

diff --git a/res/layout/editor.xml b/res/layout/editor.xml
index b10ead5d..a05a00bd 100644
--- a/res/layout/editor.xml
+++ b/res/layout/editor.xml
@@ -17,6 +17,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+  <!-- Dummy item to prevent Editor from receiving focus -->
+  <View
+      android:layout_width="0px"
+      android:layout_height="0px"
+      android:focusable="true"
+      android:focusableInTouchMode="true" />
+
   <ScrollView
       android:id="@+id/editor_scroller"
       android:layout_width="match_parent"
@@ -39,6 +46,7 @@
       android:cursorVisible="true"
       android:background="@null"
       android:inputType="textMultiLine|textImeMultiLine"
+      
       android:text="@null"
       android:textAppearance="@style/secondary_text_appearance" />
 
diff --git a/src/com/cyanogenmod/filemanager/activities/EditorActivity.java b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
index 2370b9f8..dd35d002 100644
--- a/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
@@ -527,6 +527,7 @@ public class EditorActivity extends Activity implements TextWatcher {
                 if (!result.booleanValue()) {
                     if (this.mCause != null) {
                         ExceptionUtil.translateException(EditorActivity.this, this.mCause);
+                        EditorActivity.this.mEditor.setEnabled(false);
                     }
                 } else {
                     // Now we have the buffer, set the text of the editor
@@ -665,11 +666,15 @@ public class EditorActivity extends Activity implements TextWatcher {
                                             ExceptionUtil.translateException(
                                                                         EditorActivity.this,
                                                                         cause);
+                                            EditorActivity.this.mEditor.setEnabled(false);
                                             return;
                                         }
 
                                         //Read the file again
                                         asyncRead();
+                                    } else {
+                                        // Finish the application
+                                        EditorActivity.this.finish();
                                     }
                                 }
                             });
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 83d8971d..a25c650c 100644
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -625,6 +625,9 @@ public class NavigationActivity extends Activity
             if (checkBackAction()) {
                 return true;
             }
+
+            // An exit event has occurred, force the destroy the consoles
+            exit();
         }
         return super.onKeyUp(keyCode, event);
     }