am c0fc4bf9: am 8e1f1be0: Long press mic/comma key bring mini keyboard with settings

Merge commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99'

* commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99':
  Long press mic/comma key bring mini keyboard with settings

2 files changed, 2 insertions, 10 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 76b90f8f3..31394d1cc 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -375,11 +375,13 @@ public class LatinKeyboard extends Keyboard {
             mF1Key.label = null;
             mF1Key.icon = mMicIcon;
             mF1Key.iconPreview = mMicPreviewIcon;
+            mF1Key.popupResId = R.xml.popup_mic;
         } else {
             mF1Key.label = ",";
             mF1Key.codes = new int[] { ',' };
             mF1Key.icon = null;
             mF1Key.iconPreview = null;
+            mF1Key.popupResId = R.xml.popup_comma;
         }
     }
 
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
index c4afd9a27..22d39f7aa 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
@@ -17,7 +17,6 @@
 package com.android.inputmethod.latin;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.inputmethodservice.Keyboard;
@@ -42,8 +41,6 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
 
     private Keyboard mPhoneKeyboard;
 
-    private final boolean mLongPressCommaForSettingsEnabled;
-
     /** Whether we've started dropping move events because we found a big jump */
     private boolean mDroppingEvents;
     /**
@@ -62,10 +59,6 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
 
     public LatinKeyboardView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-
-        Resources res = context.getResources();
-        mLongPressCommaForSettingsEnabled = res.getBoolean(
-                R.bool.config_long_press_comma_for_settings_enabled);
     }
 
     public void setPhoneKeyboard(Keyboard phoneKeyboard) {
@@ -101,9 +94,6 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
         } else if (primaryCode == '0' && getKeyboard() == mPhoneKeyboard) {
             // Long pressing on 0 in phone number keypad gives you a '+'.
             return invokeOnKey('+');
-        } else if (primaryCode == KEYCODE_VOICE
-                || (primaryCode == ',' && mLongPressCommaForSettingsEnabled)) {
-            return invokeOnKey(KEYCODE_OPTIONS);
         } else {
             return super.onLongPress(key);
         }