From cb09bc45c58740af953874f9915306d351fc3d9d Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Tue, 18 Nov 2014 21:53:47 +0000 Subject: Fix typos in previous bugfixes. The commits 2c9fbdd and 12b6d29 introduced minor bugs. This change fixes them. --- .../bridge/src/android/widget/TimePickerSpinnerDelegate_Delegate.java | 2 +- .../bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/layoutlib/bridge/src/android/widget/TimePickerSpinnerDelegate_Delegate.java b/tools/layoutlib/bridge/src/android/widget/TimePickerSpinnerDelegate_Delegate.java index 0d239b8..c9d35b9 100644 --- a/tools/layoutlib/bridge/src/android/widget/TimePickerSpinnerDelegate_Delegate.java +++ b/tools/layoutlib/bridge/src/android/widget/TimePickerSpinnerDelegate_Delegate.java @@ -30,7 +30,7 @@ public class TimePickerSpinnerDelegate_Delegate { private static final int PM = 1; @LayoutlibDelegate - static int getAmOrPmKeyCode(int amOrPm) { + static int getAmOrPmKeyCode(TimePickerSpinnerDelegate tpsd, int amOrPm) { // We don't care about locales here. if (amOrPm == AM) { return KeyEvent.KEYCODE_A; diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java index 05e38b4..fe34c46 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java @@ -482,7 +482,7 @@ public final class BridgeContext extends Context { // In some cases, style may not be a dynamic id, so we do a full search. ResourceReference ref = resolveId(resid); if (ref != null) { - mRenderResources.getStyle(ref.getName(), ref.isFramework()); + style = mRenderResources.getStyle(ref.getName(), ref.isFramework()); } } -- cgit v1.1