Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include InputMethodSubtypeSwitchingController in state dump." into mnc-dev

Browse Source
This commit is contained in:
Yohei Yukawa
2015-06-04 08:06:08 +00:00
committed by Android (Google) Code Review
parent 1d283bf269 d724886cc1
commit cc71518aef
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/java/com/android/internal/inputmethod/InputMethodSubtypeSwitchingController.java
View File

@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.pm.PackageManager;
import android.text.TextUtils;
import android.util.Log;
import android.util.Printer;
import android.util.Slog;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodSubtype;
@@ -314,6 +315,15 @@ public class InputMethodSubtypeSwitchingController {
}
return null;
}
protected void dump(final Printer pw, final String prefix) {
final int N = mImeSubtypeList.size();
for (int i = 0; i < N; ++i) {
final int rank = i;
final ImeSubtypeListItem item = mImeSubtypeList.get(i);
pw.println(prefix + "rank=" + rank + " item=" + item);
}
}
}
private static class DynamicRotationList {
@@ -388,6 +398,14 @@ public class InputMethodSubtypeSwitchingController {
}
return null;
}
protected void dump(final Printer pw, final String prefix) {
for (int i = 0; i < mUsageHistoryOfSubtypeListItemIndex.length; ++i) {
final int rank = mUsageHistoryOfSubtypeListItemIndex[i];
final ImeSubtypeListItem item = mImeSubtypeList.get(i);
pw.println(prefix + "rank=" + rank + " item=" + item);
}
}
}
@VisibleForTesting
@@ -478,6 +496,13 @@ public class InputMethodSubtypeSwitchingController {
}
return result;
}
protected void dump(final Printer pw) {
pw.println(" mSwitchingAwareRotationList:");
mSwitchingAwareRotationList.dump(pw, " ");
pw.println(" mSwitchingUnawareRotationList:");
mSwitchingUnawareRotationList.dump(pw, " ");
}
}
private final InputMethodSettings mSettings;
@@ -526,4 +551,12 @@ public class InputMethodSubtypeSwitchingController {
return mSubtypeList.getSortedInputMethodAndSubtypeList(
showSubtypes, includingAuxiliarySubtypes, isScreenLocked);
}
public void dump(final Printer pw) {
if (mController != null) {
mController.dump(pw);
} else {
pw.println(" mController=null");
}
}
}

2
services/core/java/com/android/server/InputMethodManagerService.java
View File

@@ -3713,6 +3713,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
p.println(" mCurUserActionNotificationSequenceNumber="
+ mCurUserActionNotificationSequenceNumber);
p.println(" mSystemReady=" + mSystemReady + " mInteractive=" + mScreenOn);
p.println(" mSwitchingController:");
mSwitchingController.dump(p);
}
p.println(" ");