diff options
| author | Todd Kennedy <toddke@google.com> | 2015-05-05 15:53:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 15:53:29 +0000 |
| commit | 3266f60ba0c2a37883446cadbfc00bb8354824d0 (patch) | |
| tree | 93384e13842b98b4a33f47015d8fe5347758a414 /core/java/android/app/Activity.java | |
| parent | e02b7868c6c8f856a21f36569a77dab7f1cc7c78 (diff) | |
| parent | 434bd65ca61ff5cec46fce9fbe866d8ee40579da (diff) | |
| download | frameworks_base-3266f60ba0c2a37883446cadbfc00bb8354824d0.zip frameworks_base-3266f60ba0c2a37883446cadbfc00bb8354824d0.tar.gz frameworks_base-3266f60ba0c2a37883446cadbfc00bb8354824d0.tar.bz2 | |
Merge "Call Activity#onAttachFragment()" into mnc-dev
Diffstat (limited to 'core/java/android/app/Activity.java')
| -rw-r--r-- | core/java/android/app/Activity.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index afbddd9..7260d10 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -6498,6 +6498,11 @@ public class Activity extends ContextThemeWrapper return (w == null) ? 0 : w.getAttributes().windowAnimations; } + @Override + public void onAttachFragment(Fragment fragment) { + Activity.this.onAttachFragment(fragment); + } + @Nullable @Override public View onFindViewById(int id) { |