| commit | cb09bc45c58740af953874f9915306d351fc3d9d | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Nov 18 21:53:47 2014 +0000 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Thu Nov 20 13:35:47 2014 +0000 |
| tree | a403c9cb0c8beb1a8a00b3430e8d67999582290d | |
| parent | c79173c7da4de4d809d3b5492e5433393193a652 [diff] |
Fix typos in previous bugfixes. The commits 2c9fbdd and 12b6d29 introduced minor bugs. This change fixes them.
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 @@ 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 @@ // 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()); } }