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

[Dictionary.git] / src / com / hughes / android / dictionary / PreferenceActivity.java

diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java
old mode 100755 (executable)
new mode 100644 (file)
index eae1497..5e74a3c
--- a/src/com/hughes/android/dictionary/PreferenceActivity.java
+++ b/src/com/hughes/android/dictionary/PreferenceActivity.java
@@ -1,14 +1,59 @@
-package com.hughes.android.dictionary;\r
-\r
-import android.os.Bundle;\r
-\r
-public class PreferenceActivity extends android.preference.PreferenceActivity {\r
-  @Override\r
-  public void onCreate(Bundle savedInstanceState) {\r
-    ((DictionaryApplication)getApplication()).applyTheme(this);\r
-\r
-    super.onCreate(savedInstanceState);\r
-    addPreferencesFromResource(R.xml.preferences);\r
-  }\r
-\r
-}\r
+// 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();
+  }
+}