summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2011-01-20 08:16:05 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-20 08:16:05 -0800
commitf41e1af8c092c2f7c18850bf263b32b7811dc074 (patch)
tree4ee8adebd54fbd88f2924866b209568332e6050d /packages
parentd738d87e130a06cc094a7deb8e61901ae53a9568 (diff)
parent7fff9d8e0489455363eb2d70111b7164adab46ff (diff)
downloadframeworks_base-f41e1af8c092c2f7c18850bf263b32b7811dc074.zip
frameworks_base-f41e1af8c092c2f7c18850bf263b32b7811dc074.tar.gz
frameworks_base-f41e1af8c092c2f7c18850bf263b32b7811dc074.tar.bz2
am 7fff9d8e: am 586f0513: Refine InputMethodInfo API
* commit '7fff9d8e0489455363eb2d70111b7164adab46ff': Refine InputMethodInfo API
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
index 7012ddc..28f485c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
@@ -124,9 +124,9 @@ public class InputMethodButton extends ImageView {
if (subtype != null) {
return pm.getDrawable(imi.getPackageName(), subtype.getIconResId(),
imi.getServiceInfo().applicationInfo);
- } else if (imi.getSubtypes().size() > 0) {
+ } else if (imi.getSubtypeCount() > 0) {
return pm.getDrawable(imi.getPackageName(),
- imi.getSubtypes().get(0).getIconResId(),
+ imi.getSubtypeAt(0).getIconResId(),
imi.getServiceInfo().applicationInfo);
} else {
try {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java
index cc200e3..a3ccef9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java
@@ -342,9 +342,9 @@ public class InputMethodsPanel extends LinearLayout implements StatusBarPanel, O
if (subtype != null) {
return mPackageManager.getDrawable(imi.getPackageName(), subtype.getIconResId(),
imi.getServiceInfo().applicationInfo);
- } else if (imi.getSubtypes().size() > 0) {
+ } else if (imi.getSubtypeCount() > 0) {
return mPackageManager.getDrawable(imi.getPackageName(),
- imi.getSubtypes().get(0).getIconResId(),
+ imi.getSubtypeAt(0).getIconResId(),
imi.getServiceInfo().applicationInfo);
} else {
try {