Merged. Switched back to name "Preferences" instead of "Settings".

Merge branch 'master' of
https://code.google.com/p/quickdic-dictionary.dictionary

Conflicts:
	res/xml/preferences.xml
	src/com/hughes/android/dictionary/DictionaryActivity.java
	src/com/hughes/android/dictionary/PreferenceActivity.java

diff --cc AndroidManifest.xml
Simple merge

diff --cc res/values/strings.xml
index 8185bb1d3f8df7554b00473edf379300be8107b7,ef7d8bd50809434895a9c08ef08eea410d1dfbbb..c925821ee1c5f6d4f4a14fd36f8b5cf5cc389617
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -11,9 -11,12 +11,13 @@@
    <string name="help">Help</string>
    <string name="reportIssue">Report issue…</string>
    <string name="fontWorkaround">Detected font problem (common on Sony Ericsson devices), switching back to default font.</string>
 +  <string name="clearSearchText">Clear search text</string>
    
    
+   <string name="no_dict_file">Please specify a default directory in the settings.</string>
+     
+   
+   
     <!-- DictionaryManagerActivity -->
    <string name="dictionaryManager">Dictionary manager</string>
    <string name="helpText">Long-press a dictionary for more options.</string>

diff --cc res/xml/preferences.xml
index 1644b6116e2a64f9231c046993cc8ea962d74ddc,a57dece5b51e3cf1f2a9fbce891ea8921b969a6f..4b948a079f0f4618fc892d95b6a9ac4ca64b2dc0
--- 1/res/xml/settings.xml
--- 2/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@@ -1,5 -1,13 +1,12 @@@
  <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">\r
  \r
 -    \r
 -       <ListPreference \r
++  <ListPreference \r
+     android:key="@string/defaultDicKey"\r
+     android:title="@string/defaultDicTitle"\r
+     android:summary="@string/defaultDicSummary"\r
+     android:persistent="true"\r
+   />\r
 -    \r
++\r
    <EditTextPreference\r
      android:key="@string/quickdicDirectoryKey"\r
      android:title="@string/quickdicDirectoryTitle" \r

diff --cc src/com/hughes/android/dictionary/DictionaryActivity.java
index 57a49e587b7ca99776473de3e40fe7e6788f3fea,991e87b9a88e9d0f06e89fa3c93bec70014e2f45..6e4bb9106cf6b4ae014a55c109edc83af6cfd1b8
--- 1/src/com/hughes/android/dictionary/DictionaryActivity.java
--- 2/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@@ -14,9 -14,34 +14,10 @@@
  
  package com.hughes.android.dictionary;
  
 -import java.io.File;
 -import java.io.FileWriter;
 -import java.io.IOException;
 -import java.io.PrintWriter;
 -import java.io.RandomAccessFile;
 -import java.text.SimpleDateFormat;
 -import java.util.Arrays;
 -import java.util.Collections;
 -import java.util.Date;
 -import java.util.HashMap;
 -import java.util.LinkedHashSet;
 -import java.util.List;
 -import java.util.Locale;
 -import java.util.Random;
 -import java.util.Set;
 -import java.util.concurrent.Executor;
 -import java.util.concurrent.Executors;
 -import java.util.concurrent.ThreadFactory;
 -import java.util.concurrent.atomic.AtomicBoolean;
 -import java.util.regex.Matcher;
 -import java.util.regex.Pattern;
 -
 -import android.app.AlertDialog;
 +import android.annotation.SuppressLint;
  import android.app.Dialog;
 -import android.app.ListActivity;
+ import android.app.SearchManager;
  import android.content.Context;
 -import android.content.DialogInterface;
  import android.content.Intent;
  import android.content.SharedPreferences;
  import android.graphics.Color;
@@@ -28,10 -53,10 +29,7 @@@ import android.preference.PreferenceMan
  import android.speech.tts.TextToSpeech;
  import android.speech.tts.TextToSpeech.OnInitListener;
  import android.text.ClipboardManager;
--import android.text.Editable;
--import android.text.Selection;
  import android.text.Spannable;
--import android.text.TextWatcher;
  import android.text.method.LinkMovementMethod;
  import android.text.style.ClickableSpan;
  import android.text.style.StyleSpan;
@@@ -40,11 -65,13 +38,9 @@@ import android.util.TypedValue
  import android.view.ContextMenu;
  import android.view.ContextMenu.ContextMenuInfo;
  import android.view.KeyEvent;
- import android.view.LayoutInflater;
 -import android.view.Menu;
 -import android.view.MenuItem;
 -import android.view.MenuItem.OnMenuItemClickListener;
  import android.view.MotionEvent;
  import android.view.View;
  import android.view.View.OnClickListener;
--import android.view.View.OnFocusChangeListener;
  import android.view.View.OnLongClickListener;
  import android.view.ViewGroup;
  import android.view.WindowManager;
@@@ -53,9 -79,8 +49,7 @@@ import android.view.inputmethod.InputMe
  import android.widget.AdapterView.AdapterContextMenuInfo;
  import android.widget.BaseAdapter;
  import android.widget.Button;
--import android.widget.EditText;
 -import android.widget.ImageButton;
 +import android.widget.FrameLayout;
- import android.widget.ImageButton;
  import android.widget.ImageView;
  import android.widget.LinearLayout;
  import android.widget.ListAdapter;
@@@ -488,21 -597,19 +568,21 @@@ public class DictionaryActivity extend
      }
  
      void updateLangButton() {
 -        // final LanguageResources languageResources =
 -        // Language.isoCodeToResources.get(index.shortName);
 -        // if (languageResources != null && languageResources.flagId != 0) {
 -        // langButton.setCompoundDrawablesWithIntrinsicBounds(0, 0,
 -        // languageResources.flagId, 0);
 -        // } else {
 -        // langButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
 -        langButton.setText(index.shortName);
 -        // }
 +        final LanguageResources languageResources =
 +                Language.isoCodeToResources.get(index.shortName);
 +        if (languageResources != null && languageResources.flagId != 0) {
 +            searchHintIcon.setImageResource(languageResources.flagId);
 +        } else {
 +            if (indexIndex % 2 == 0) {
 +                searchHintIcon.setImageResource(android.R.drawable.ic_media_next);
 +            } else {
 +                searchHintIcon.setImageResource(android.R.drawable.ic_media_previous);
 +            }
 +        }
-         updateTTSLanuage();
+         updateTTSLanguage();
 -    }
 +     }
  
-     private void updateTTSLanuage() {
+     private void updateTTSLanguage() {
          if (!ttsReady || index == null || textToSpeech == null) {
              Log.d(LOG, "Can't updateTTSLanguage.");
              return;

diff --cc src/com/hughes/android/dictionary/DictionaryApplication.java
index 09e7ba44e995d2ef7f425d799863aea400435e98,72892daace9ba00add4777ae532b665451a90951..ca8d4ac0fb432a963eedaef5e19b3ad897cd4a7a
--- 1/src/com/hughes/android/dictionary/DictionaryApplication.java
--- 2/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@@ -143,13 -141,12 +143,13 @@@ public class DictionaryApplication exte
        }
      });
  
 -    final MenuItem preferences = menu.add(getString(R.string.preferences));
 +    final MenuItem preferences = menu.add(getString(R.string.settings));
 +    preferences.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
      preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
        public boolean onMenuItemClick(final MenuItem menuItem) {
-         SettingsActivity.settingsMightHaveChanged = true;
-         final Intent intent = new Intent().setClassName(SettingsActivity.class
-             .getPackage().getName(), SettingsActivity.class.getCanonicalName());
+         PreferenceActivity.prefsMightHaveChanged = true;
+         final Intent intent = new Intent().setClassName(PreferenceActivity.class
+             .getPackage().getName(), PreferenceActivity.class.getCanonicalName());
          context.startActivity(intent);
          return false;
        }

diff --cc src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 74ac89500ce905f4a9eb14f652f15fe934d82c60,8ca3c92aea6f02632db1e08bf1e9ffb268633b92..af50112dbc98f36ff15b0693e5ffd7b24cdf4bc3
--- 1/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
--- 2/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@@ -154,8 -149,8 +154,8 @@@ public class DictionaryManagerActivity 
    protected void onResume() {
      super.onResume();
      
-     if (SettingsActivity.settingsMightHaveChanged) {
-       SettingsActivity.settingsMightHaveChanged = false;
+     if (PreferenceActivity.prefsMightHaveChanged) {
 -      PreferenceActivity.prefsMightHaveChanged = false;
++        PreferenceActivity.prefsMightHaveChanged = false;
        finish();
        startActivity(getIntent());
      }

diff --cc src/com/hughes/android/dictionary/PreferenceActivity.java
index 0000000000000000000000000000000000000000,343deda4d5089e9c4eb8ff6a9eaaf4a83a946e19..5e74a3cd0554d1d903873465753c0c155bb19faf
mode 000000,100644..100644
--- /dev/null
--- 2/src/com/hughes/android/dictionary/PreferenceActivity.java
+++ b/src/com/hughes/android/dictionary/PreferenceActivity.java
@@@ -1,0 -1,62 +1,59 @@@
 -    
 -    
+ // Copyright 2011 Google Inc. All Rights Reserved.
+ //
+ // Licensed under the Apache License, Version 2.0 (the "License");
+ // you may not use this file except in compliance with the License.
+ // You may obtain a copy of the License at
+ //
+ //     http://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing, software
+ // distributed under the License is distributed on an "AS IS" BASIS,
+ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+ 
+ package com.hughes.android.dictionary;
+ 
+ import java.util.List;
+ 
+ import android.os.Bundle;
+ import android.preference.ListPreference;
+ 
+ public class PreferenceActivity extends android.preference.PreferenceActivity {
+   
+   static boolean prefsMightHaveChanged = false;
+   
+   @SuppressWarnings("deprecation")
+   @Override
+   public void onCreate(Bundle savedInstanceState) {
+     setTheme(((DictionaryApplication)getApplication()).getSelectedTheme().themeId);
+ 
+     /**
+      * @author Dominik Köppl
+      * Preference: select default dictionary
+      * As this list is dynamically generated, we have to do it in this fashion
+      */
+     super.onCreate(savedInstanceState);
+     addPreferencesFromResource(R.xml.preferences);
+     ListPreference defaultDic = (ListPreference) findPreference(getResources().getString(R.string.defaultDicKey));
+     DictionaryApplication application = (DictionaryApplication) getApplication();
+     List<DictionaryInfo> dicts = application.getUsableDicts();
+     
+       final CharSequence[] entries = new CharSequence[dicts.size()];
+       final CharSequence[] entryvalues = new CharSequence[dicts.size()];
+ 
+       for(int i = 0; i < entries.length; ++i)
+       {
+               entries[i] = dicts.get(i).dictInfo;
+               entryvalues[i] = dicts.get(i).uncompressedFilename;
+       }
+       
+       defaultDic.setEntries(entries);
+       defaultDic.setEntryValues(entryvalues);
 -
+   }
+ 
+   @Override
+   public void onContentChanged() {
+     super.onContentChanged();
+   }
+ }