diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-18 20:25:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-18 20:25:22 +0000 |
| commit | 07ecc748fb378a1acb86f3b93a7ad35d8fbb5aa5 (patch) | |
| tree | b9ec6a4d3993b0b05aa1e0480bc3236b0596d9fc /core/java/android/view | |
| parent | 3c7f018f4232082b189fa6828a01f41c7253b1cc (diff) | |
| parent | a9ddb8dc23b253c53f24ceb81e9d596c072d834e (diff) | |
| download | frameworks_base-07ecc748fb378a1acb86f3b93a7ad35d8fbb5aa5.zip frameworks_base-07ecc748fb378a1acb86f3b93a7ad35d8fbb5aa5.tar.gz frameworks_base-07ecc748fb378a1acb86f3b93a7ad35d8fbb5aa5.tar.bz2 | |
Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/LayoutInflater.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java index 577415e..5f37042 100644 --- a/core/java/android/view/LayoutInflater.java +++ b/core/java/android/view/LayoutInflater.java @@ -606,9 +606,9 @@ public abstract class LayoutInflater { constructor.setAccessible(true); final View view = constructor.newInstance(args); if (view instanceof ViewStub) { - // always use ourselves when inflating ViewStub later + // Use the same context when inflating ViewStub later. final ViewStub viewStub = (ViewStub) view; - viewStub.setLayoutInflater(this); + viewStub.setLayoutInflater(cloneInContext((Context) args[0])); } return view; |