| commit | e9667ee1b8a64394d572d61615ce122060d5957b | [log] [tgz] |
|---|---|---|
| author | Tsuyoshi Matsuzaki <matsuzakit@google.com> | Sun Dec 21 14:16:56 2014 +0000 |
| committer | Yohei Yukawa <yukawa@google.com> | Sun Dec 21 14:16:56 2014 +0000 |
| tree | cf94c9aeed4e10055eeadcda70c85fcf5fd63554 | |
| parent | 292a574a975e964f7c19d9d6dafcf01d19174a4f [diff] |
Ignore InflateException when showing AlertDialog (part 2) This is a follow up CL for r461, which caused several compile failures. BUG=Issue mozc:262 TEST=compile git-svn-id: https://mozc.googlecode.com/svn/trunk@462 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/android/src/com/google/android/inputmethod/japanese/SymbolInputView.java b/src/android/src/com/google/android/inputmethod/japanese/SymbolInputView.java index 77a941d..5dbc0bb 100644 --- a/src/android/src/com/google/android/inputmethod/japanese/SymbolInputView.java +++ b/src/android/src/com/google/android/inputmethod/japanese/SymbolInputView.java
@@ -938,7 +938,7 @@ .setTitle(R.string.pref_emoji_provider_type_title) .setItems(R.array.pref_emoji_provider_type_entries, listener) .create(); - this.emojiProviderDialog = Optional.of(dialog); + this.emojiProviderDialog = dialog; } catch (InflateException e) { // Ignore the exception. }
diff --git a/src/android/src/com/google/android/inputmethod/japanese/ui/MenuDialog.java b/src/android/src/com/google/android/inputmethod/japanese/ui/MenuDialog.java index af0ea82..43f5f46 100644 --- a/src/android/src/com/google/android/inputmethod/japanese/ui/MenuDialog.java +++ b/src/android/src/com/google/android/inputmethod/japanese/ui/MenuDialog.java
@@ -48,6 +48,7 @@ import android.content.res.Resources; import android.os.IBinder; import android.view.InflateException; +import android.view.WindowManager; import java.util.Collections; import java.util.List;
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt index b3b69b6..e13d6b5 100644 --- a/src/mozc_version_template.txt +++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@ MAJOR=2 MINOR=16 -BUILD=2001 +BUILD=2002 REVISION=102 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be # downloaded by NaCl Mozc.