aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-04-23 19:18:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-23 19:18:48 -0700
commit6a355d2d189388833148cf3850429b38d57ae9e9 (patch)
tree3688f1dc826e6932a3dd2bd037654e79cf2b0b08 /java/src
parentbf53cade7b06d79b02fd73391e1b532a55a83786 (diff)
parent197a2d32e1f74470f0cd0b9ba391b1b836e44430 (diff)
downloadlatinime-6a355d2d189388833148cf3850429b38d57ae9e9.tar.gz
latinime-6a355d2d189388833148cf3850429b38d57ae9e9.tar.xz
latinime-6a355d2d189388833148cf3850429b38d57ae9e9.zip
am 197a2d32: Merge "[PB1] Cleanup"
* commit '197a2d32e1f74470f0cd0b9ba391b1b836e44430': [PB1] Cleanup
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/dictionarypack/WordListPreference.java11
1 files changed, 2 insertions, 9 deletions
diff --git a/java/src/com/android/inputmethod/dictionarypack/WordListPreference.java b/java/src/com/android/inputmethod/dictionarypack/WordListPreference.java
index 93f12d53e..f042795dd 100644
--- a/java/src/com/android/inputmethod/dictionarypack/WordListPreference.java
+++ b/java/src/com/android/inputmethod/dictionarypack/WordListPreference.java
@@ -16,10 +16,9 @@
package com.android.inputmethod.dictionarypack;
-import android.app.Dialog;
import android.content.Context;
import android.content.SharedPreferences;
-import android.preference.DialogPreference;
+import android.preference.Preference;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
@@ -38,7 +37,7 @@ import java.util.Locale;
* pack. Upon being pressed, it displays a menu to allow the user to install, disable,
* enable or delete it as appropriate for the current state of the word list.
*/
-public final class WordListPreference extends DialogPreference {
+public final class WordListPreference extends Preference {
static final private String TAG = WordListPreference.class.getSimpleName();
// What to display in the "status" field when we receive unknown data as a status from
@@ -93,12 +92,6 @@ public final class WordListPreference extends DialogPreference {
if (status == mStatus) return;
mStatus = status;
setSummary(getSummary(status));
- // If we are currently displaying the dialog, we should update it, or at least
- // dismiss it.
- final Dialog dialog = getDialog();
- if (null != dialog) {
- dialog.dismiss();
- }
}
private String getSummary(final int status) {