nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote branch 'goog/master' into merge

Browse source 
Conflicts:
	java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
	java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
	java/src/com/android/inputmethod/deprecated/voice/VoiceInputLogger.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java

Change-Id: Ibcb1aa61cbab8ff1863260a579d26d065ee7bd40
This commit is contained in:
satok 2011-03-25 19:24:19 -07:00
commit e932a0ae78
6 changed files with 52 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/src/com/android/inputmethod/compat/AbstractCompatWrapper.java
View file

@ -32,4 +32,8 @@ public abstract class AbstractCompatWrapper {
public Object getOriginalObject() {
return mObj;
}
public boolean hasOriginalObject() {
return mObj != null;
}
}

4
java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
View file

@ -44,6 +44,8 @@ public class InputMethodManagerCompatWrapper {
CompatUtils.getMethod(
InputMethodManager.class, "setInputMethodAndSubtype", IBinder.class,
String.class, InputMethodSubtypeCompatWrapper.CLASS_InputMethodSubtype);
private static final Method METHOD_switchToLastInputMethod = CompatUtils.getMethod(
InputMethodManager.class, "switchToLastInputMethod", IBinder.class);
private static final InputMethodManagerCompatWrapper sInstance =
new InputMethodManagerCompatWrapper();
@ -102,7 +104,7 @@ public class InputMethodManagerCompatWrapper {
}
public boolean switchToLastInputMethod(IBinder token) {
return false;
return (Boolean)CompatUtils.invoke(mImm, false, METHOD_switchToLastInputMethod, token);
}
public List<InputMethodInfoCompatWrapper> getEnabledInputMethodList() {

5
java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
View file

@ -18,6 +18,7 @@ package com.android.inputmethod.compat;
import com.android.inputmethod.latin.LatinImeLogger;
import android.text.TextUtils;
import android.util.Log;
import java.lang.reflect.Method;
@ -65,13 +66,13 @@ public final class InputMethodSubtypeCompatWrapper extends AbstractCompatWrapper
public String getLocale() {
final String s = (String)CompatUtils.invoke(mObj, null, METHOD_getLocale);
if (s == null) return DEFAULT_LOCALE;
if (TextUtils.isEmpty(s)) return DEFAULT_LOCALE;
return s;
}
public String getMode() {
String s = (String)CompatUtils.invoke(mObj, null, METHOD_getMode);
if (s == null) return DEFAULT_MODE;
if (TextUtils.isEmpty(s)) return DEFAULT_MODE;
return s;
}

36
java/src/com/android/inputmethod/deprecated/compat/VoiceInputLoggerCompatUtils.java Normal file
View file

@ -0,0 +1,36 @@
/*
* Copyright (C) 2011 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.inputmethod.deprecated.compat;
import com.android.common.userhappiness.UserHappinessSignals;
import com.android.inputmethod.compat.CompatUtils;
import java.lang.reflect.Method;
public class VoiceInputLoggerCompatUtils {
public static final String EXTRA_TEXT_REPLACED_LENGTH = "length";
public static final String EXTRA_BEFORE_N_BEST_CHOOSE = "before";
public static final String EXTRA_AFTER_N_BEST_CHOOSE = "after";
private static final Method METHOD_UserHappinessSignals_setHasVoiceLoggingInfo =
CompatUtils.getMethod(UserHappinessSignals.class, "setHasVoiceLoggingInfo",
boolean.class);
public static void setHasVoiceLoggingInfoCompat(boolean hasLoggingInfo) {
CompatUtils.invoke(null, null, METHOD_UserHappinessSignals_setHasVoiceLoggingInfo,
hasLoggingInfo);
}
}

10
java/src/com/android/inputmethod/deprecated/voice/VoiceInputLogger.java
View file

@ -18,6 +18,7 @@ package com.android.inputmethod.deprecated.voice;
import com.android.common.speech.LoggingEvents;
import com.android.common.userhappiness.UserHappinessSignals;
import com.android.inputmethod.deprecated.compat.VoiceInputLoggerCompatUtils;
import android.content.Context;
import android.content.Intent;
@ -212,13 +213,12 @@ public class VoiceInputLogger {
setHasLoggingInfo(true);
Intent i = newLoggingBroadcast(LoggingEvents.VoiceIme.TEXT_MODIFIED);
i.putExtra(LoggingEvents.VoiceIme.EXTRA_TEXT_MODIFIED_LENGTH, suggestionLength);
i.putExtra("length", replacedPhraseLength);
i.putExtra(VoiceInputLoggerCompatUtils.EXTRA_TEXT_REPLACED_LENGTH, replacedPhraseLength);
i.putExtra(LoggingEvents.VoiceIme.EXTRA_TEXT_MODIFIED_TYPE,
LoggingEvents.VoiceIme.TEXT_MODIFIED_TYPE_CHOOSE_SUGGESTION);
i.putExtra(LoggingEvents.VoiceIme.EXTRA_N_BEST_CHOOSE_INDEX, index);
i.putExtra("before", before);
i.putExtra("after", after);
i.putExtra(VoiceInputLoggerCompatUtils.EXTRA_BEFORE_N_BEST_CHOOSE, before);
i.putExtra(VoiceInputLoggerCompatUtils.EXTRA_AFTER_N_BEST_CHOOSE, after);
mContext.sendBroadcast(i);
}
@ -257,7 +257,7 @@ public class VoiceInputLogger {
// 2. type subject in subject field
// 3. speak message in message field
// 4. press send
// UserHappinessSignals.setHasVoiceLoggingInfo(hasLoggingInfo);
VoiceInputLoggerCompatUtils.setHasVoiceLoggingInfoCompat(hasLoggingInfo);
}
private boolean hasLoggingInfo(){

2
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
View file

@ -210,7 +210,7 @@ public class SubtypeSwitcher {
final String newLocale;
final String newMode;
final String oldMode = getCurrentSubtypeMode();
if (newSubtype == null || newSubtype.getOriginalObject() == null) {
if (newSubtype == null || !newSubtype.hasOriginalObject()) {
// Normally, newSubtype shouldn't be null. But just in case newSubtype was null,
// fallback to the default locale.
Log.w(TAG, "Couldn't get the current subtype.");