From: Thad Hughes <thadh@google.com>
Date: Tue, 3 Dec 2013 18:49:47 +0000 (-0800)
Subject: Merged.  Switched back to name "Preferences" instead of "Settings".
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=c625416a33f9da39bb8ec6a2c9a67a7d47e477d8

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
---

c625416a33f9da39bb8ec6a2c9a67a7d47e477d8
diff --cc res/values/strings.xml
index 8185bb1,ef7d8bd..c925821
--- a/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 1644b61,a57dece..4b948a0
--- a/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">
  
 -    
 -       <ListPreference 
++  <ListPreference 
+     android:key="@string/defaultDicKey"
+     android:title="@string/defaultDicTitle"
+     android:summary="@string/defaultDicSummary"
+     android:persistent="true"
+   />
 -    
++
    <EditTextPreference
      android:key="@string/quickdicDirectoryKey"
      android:title="@string/quickdicDirectoryTitle" 
diff --cc src/com/hughes/android/dictionary/DictionaryActivity.java
index 57a49e5,991e87b..6e4bb91
--- a/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 09e7ba4,72892da..ca8d4ac
--- a/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 74ac895,8ca3c92..af50112
--- a/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 0000000,343deda..5e74a3c
mode 000000,100644..100644
--- a/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();
+   }
 -
+ }