Merge "Fix merge that should have been manually merged"
commit
ef38215fa4
|
@ -22,7 +22,6 @@ import com.android.inputmethod.latin.LatinKeyboardBaseView.UIHandler;
|
||||||
|
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
import android.inputmethodservice.Keyboard;
|
import android.inputmethodservice.Keyboard;
|
||||||
import android.inputmethodservice.Keyboard.Key;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.MotionEvent;
|
import android.view.MotionEvent;
|
||||||
|
|
||||||
|
@ -429,7 +428,7 @@ public class PointerTracker {
|
||||||
// long press should not be started.
|
// long press should not be started.
|
||||||
if (isTemporaryUpperCase() && key.temporaryShiftLabel != null)
|
if (isTemporaryUpperCase() && key.temporaryShiftLabel != null)
|
||||||
return;
|
return;
|
||||||
mHandler.startLongPressTimer(LONGPRESS_TIMEOUT, keyIndex, this);
|
mHandler.startLongPressTimer(mLongPressKeyTimeout, keyIndex, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isTemporaryUpperCase() {
|
private boolean isTemporaryUpperCase() {
|
||||||
|
|
Loading…
Reference in New Issue