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

Author: matsuza

src/android/src/com/google/android/inputmethod/japanese/SymbolInputView.java

@@ -938,7 +938,7 @@ protected void maybeInitializeEmojiProviderDialog(Context context) {
           .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.
     }

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;

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.