Bug fixes, Spanish support, 'up navigation' now focuses on current ch…

…ild, support for exclusions from media scan

git-svn-id: https://android-file-explorer.googlecode.com/svn/trunk@87 c017096b-075d-594c-fef8-5f4576a4bf52

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.appositedesigns.fileexplorer"
-    android:versionCode="16"
+    android:versionCode="17"
     android:versionName="@string/app_version" 
     android:installLocation="auto">
 

res/values-ru/strings.xml

@@ -37,7 +37,7 @@
     <string name="menu_preferences">Настройки</string>
     <string name="menu_refresh">Обновить</string>
     <string name="menu_bookmark">Добавить в закладки</string>
-    <string name="menu_exclude_from_media">Исключить</string>
+    <string name="menu_exclude_from_media">Исключить из сканирования СМИ</string>
 
     <string name="yes">Да</string>
     <string name="actions">Действия</string>

res/values/strings.xml

@@ -207,7 +207,7 @@
 	<string name="pref_show_sdcard_options_off">SD Card Options are hidden</string>
 
 	<string name="pref_media_scan_exclusion">Enable Media Scan Exclusions</string>
-	<string name="pref_media_scan_exclusion_desc">Provide an option to exclude certain folders from galleries and audio libraries and other local media listings</string>
+	<string name="pref_media_scan_exclusion_desc">Provide an option to exclude certain folders from galleries, audio libraries and other local media listings</string>
 
 	<string name="pref_rate">Rate FileExplorer</string>
 	<string name="pref_rate_desc">Rate and write a review on the Google Play Store</string>

res/values/version.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_version">2.3.7</string>
+    <string name="app_version">2.4</string>
 
 </resources>

res/xml/about_prefs.xml

@@ -12,13 +12,6 @@
             </intent>
         </PreferenceScreen>
 
-		<PreferenceScreen
-            android:summary="@string/pref_rate_desc"
-            android:title="@string/pref_rate" >
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="market://details?id=net.appositedesigns.fileexplorer" />
-        </PreferenceScreen>
         <PreferenceScreen
             android:summary="@string/pref_twitter_desc"
             android:title="@string/pref_twitter" >
@@ -41,6 +34,13 @@
             android:summary="@string/pref_share_desc"
             android:title="@string/pref_share" >
         </PreferenceScreen>
+        <PreferenceScreen
+            android:summary="@string/pref_rate_desc"
+            android:title="@string/pref_rate" >
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="market://details?id=net.appositedesigns.fileexplorer" />
+        </PreferenceScreen>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_cat_about" >
         <PreferenceScreen

res/xml/geeky_prefs.xml

@@ -32,12 +32,13 @@
             android:summaryOff="@string/pref_show_sdcard_options_off"
             android:summaryOn="@string/pref_show_sdcard_options_on"
             android:title="@string/pref_show_sdcard_options" />
-
+        <!-- 
          <CheckBoxPreference
             android:defaultValue="false"
-            android:key="media_exclusion"
+            android:key="media_exclusions"
             android:summary="@string/pref_media_scan_exclusion_desc"
             android:title="@string/pref_media_scan_exclusion" />
+         -->
         </PreferenceCategory>
 
 </PreferenceScreen>

src/net/appositedesigns/fileexplorer/activity/BookmarkListActivity.java

@@ -9,6 +9,7 @@
 import net.appositedesigns.fileexplorer.R;
 import net.appositedesigns.fileexplorer.adapters.BookmarkListAdapter;
 import net.appositedesigns.fileexplorer.model.FileListEntry;
+import net.appositedesigns.fileexplorer.util.PreferenceHelper;
 import net.appositedesigns.fileexplorer.workers.BookmarkLoader;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -40,7 +41,9 @@ public class BookmarkListActivity extends BaseFileListActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 
+		setTheme(new PreferenceHelper(this).getTheme());
 		super.onCreate(savedInstanceState);
+		getActionBar().setDisplayHomeAsUpEnabled(true);
 		setContentView(R.layout.main);
 		isPicker = getIntent().getBooleanExtra(FileExplorerApp.EXTRA_IS_PICKER, false);
 		bookmarks = new ArrayList<FileListEntry>();
@@ -129,6 +132,8 @@ public void onItemClick(AdapterView<?> parent, View view,
 		});
 
 	}
+
+
 	protected void select(File path) {
 		Intent intent = new Intent();
 		intent.putExtra(FileExplorerApp.EXTRA_SELECTED_BOOKMARK, path.getAbsolutePath());
@@ -139,7 +144,13 @@ protected void select(File path) {
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		if(R.id.menu_settings == item.getItemId())
+
+		if(item.getItemId()== android.R.id.home)
+		{
+			onBackPressed();
+			return true;
+		}
+		else if(R.id.menu_settings == item.getItemId())
 		{
 			Intent prefsIntent = new Intent(this,
 					SettingsActivity.class);

src/net/appositedesigns/fileexplorer/activity/FileListActivity.java

@@ -515,12 +515,14 @@ private void setMediaExclusionForFolder() {
 		{
 			//Now include folder in media
 			FileUtils.deleteQuietly(new File(currentDir, ".nomedia"));
+			excludeFromMedia = false;
 		}
 		else
 		{
 			try
 			{
 				FileUtils.touch(new File(currentDir, ".nomedia"));
+				excludeFromMedia = true;
 			}
 			catch(Exception e)
 			{

src/net/appositedesigns/fileexplorer/activity/SettingsActivity.java

@@ -10,6 +10,7 @@
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
+import android.view.MenuItem;
 
 public class SettingsActivity extends PreferenceActivity {
 
@@ -18,11 +19,23 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		setTheme(new PreferenceHelper(this).getTheme());
 		super.onCreate(savedInstanceState);
-
-//		addPreferencesFromResource(R.xml.prefs);
+		getActionBar().setDisplayHomeAsUpEnabled(true);
 
 	}
 
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+
+		if(item.getItemId()== android.R.id.home)
+		{
+			onBackPressed();
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
     /**
      * Populate the activity with the top-level headers.
      */

src/net/appositedesigns/fileexplorer/util/PreferenceHelper.java

@@ -152,7 +152,7 @@ public boolean isEnableSdCardOptions() {
 	public boolean focusOnParent() {
 
 		return PreferenceManager.getDefaultSharedPreferences(mContext)
-		.getBoolean(PREF_NAVIGATE_FOCUS_ON_PARENT, false);
+		.getBoolean(PREF_NAVIGATE_FOCUS_ON_PARENT, true);
 	}
 	public boolean isZipEnabled() {
 		return PreferenceManager.getDefaultSharedPreferences(mContext)