diff options
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java | 2 | ||||
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java index 8b8cc382317e..958b7aa02ea2 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java @@ -151,7 +151,7 @@ public class AppCompatActionBar extends BridgeActionBar { @Override public void createMenuPopup() { - // it's hard to addd menus to appcompat's actionbar, since it'll use a lot of reflection. + // it's hard to add menus to appcompat's actionbar, since it'll use a lot of reflection. // so we skip it for now. } diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java index f6c2626e4271..dae5509f2aa3 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java @@ -94,14 +94,8 @@ public class AsmGenerator { ListIterator<Class<?>> iter = injectedClasses.listIterator(); while (iter.hasNext()) { Class<?> clazz = iter.next(); - try { - int i = 1; - while(i < 100) { - iter.add(Class.forName(clazz.getName() + "$" + i)); - i++; - } - } catch (ClassNotFoundException ignored) { - // Expected. + for (Class<?> aClass : clazz.getDeclaredClasses()) { + iter.add(aClass); } } mInjectClasses = injectedClasses.toArray(new Class<?>[0]); |