diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-18 19:22:14 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-05-18 19:23:19 -0700 |
| commit | 9275197d35a99c3f187d18d0eda6ead3b8a32603 (patch) | |
| tree | ba364f6cf805ce6dac0d3eb8ced5d82d71cd956a /core/java/android/app/Activity.java | |
| parent | fb5c3dba4ddac023cfd4cdcabdfdbcf343197c94 (diff) | |
| download | frameworks_base-9275197d35a99c3f187d18d0eda6ead3b8a32603.zip frameworks_base-9275197d35a99c3f187d18d0eda6ead3b8a32603.tar.gz frameworks_base-9275197d35a99c3f187d18d0eda6ead3b8a32603.tar.bz2 | |
Add aapt support for generating proguard rules for onClick methods.
Also fix Activity menu inflater when using the dark on light
theme wrapper to still be able to find onClick listeners.
Change-Id: Ie206db26d1df96041bc477804e476b02ad99dc9d
Diffstat (limited to 'core/java/android/app/Activity.java')
| -rw-r--r-- | core/java/android/app/Activity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index faf946c..f20fd33 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -3273,7 +3273,7 @@ public class Activity extends ContextThemeWrapper if (mMenuInflater == null) { initActionBar(); if (mActionBar != null) { - mMenuInflater = new MenuInflater(mActionBar.getThemedContext()); + mMenuInflater = new MenuInflater(mActionBar.getThemedContext(), this); } else { mMenuInflater = new MenuInflater(this); } |