diff options
author | Jeff Brown <jeffbrown@google.com> | 2012-05-10 21:29:33 -0700 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2012-05-11 12:32:56 -0700 |
commit | 2f0957607411b99810226ad38d59cf18718b86d0 (patch) | |
tree | 02c124b552f1f206498e50f3532c5140c9fda8c4 /services/java/com/android/server/input/InputManagerService.java | |
parent | 3816174b3bea63eb355a0aa212c6b51e9435627b (diff) | |
download | frameworks_base-2f0957607411b99810226ad38d59cf18718b86d0.zip frameworks_base-2f0957607411b99810226ad38d59cf18718b86d0.tar.gz frameworks_base-2f0957607411b99810226ad38d59cf18718b86d0.tar.bz2 |
Rename kcm attribute to keyboardLayout.
Bug: 6478076
Change-Id: I7fc0d8eb36d03a628d070f8fd6ea1e1464b1a163
Diffstat (limited to 'services/java/com/android/server/input/InputManagerService.java')
-rw-r--r-- | services/java/com/android/server/input/InputManagerService.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/services/java/com/android/server/input/InputManagerService.java b/services/java/com/android/server/input/InputManagerService.java index 299649d..9e94b52 100644 --- a/services/java/com/android/server/input/InputManagerService.java +++ b/services/java/com/android/server/input/InputManagerService.java @@ -597,7 +597,7 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog. visitAllKeyboardLayouts(new KeyboardLayoutVisitor() { @Override public void visitKeyboardLayout(Resources resources, - String descriptor, String label, int kcmResId) { + String descriptor, String label, int keyboardLayoutResId) { list.add(new KeyboardLayout(descriptor, label)); } }); @@ -614,7 +614,7 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog. visitKeyboardLayout(keyboardLayoutDescriptor, new KeyboardLayoutVisitor() { @Override public void visitKeyboardLayout(Resources resources, - String descriptor, String label, int kcmResId) { + String descriptor, String label, int keyboardLayoutResId) { result[0] = new KeyboardLayout(descriptor, label); } }); @@ -683,10 +683,11 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog. com.android.internal.R.styleable.KeyboardLayout_name); String label = a.getString( com.android.internal.R.styleable.KeyboardLayout_label); - int kcmResId = a.getResourceId( - com.android.internal.R.styleable.KeyboardLayout_kcm, 0); - if (name == null || label == null || kcmResId == 0) { - Log.w(TAG, "Missing required 'name', 'label' or 'kcm' " + int keyboardLayoutResId = a.getResourceId( + com.android.internal.R.styleable.KeyboardLayout_keyboardLayout, + 0); + if (name == null || label == null || keyboardLayoutResId == 0) { + Log.w(TAG, "Missing required 'name', 'label' or 'keyboardLayout' " + "attributes in keyboard layout " + "resource from receiver " + receiver.packageName + "/" + receiver.name); @@ -695,7 +696,7 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog. receiver.packageName, receiver.name, name); if (keyboardName == null || name.equals(keyboardName)) { visitor.visitKeyboardLayout(resources, descriptor, - label, kcmResId); + label, keyboardLayoutResId); } } } finally { @@ -1138,11 +1139,11 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog. visitKeyboardLayout(keyboardLayoutDescriptor, new KeyboardLayoutVisitor() { @Override public void visitKeyboardLayout(Resources resources, - String descriptor, String label, int kcmResId) { + String descriptor, String label, int keyboardLayoutResId) { try { result[0] = descriptor; result[1] = Streams.readFully(new InputStreamReader( - resources.openRawResource(kcmResId))); + resources.openRawResource(keyboardLayoutResId))); } catch (IOException ex) { } catch (NotFoundException ex) { } @@ -1261,7 +1262,7 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog. private interface KeyboardLayoutVisitor { void visitKeyboardLayout(Resources resources, - String descriptor, String label, int kcmResId); + String descriptor, String label, int keyboardLayoutResId); } private final class InputDevicesChangedListenerRecord implements DeathRecipient { |