Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd09af72 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix FragmentManager.FragmentLifecycleCallbacks scope"

parents f22d457e 74827260

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4658,7 +4658,7 @@ package android.app { 
    method public abstract java.lang.String getName();

  }













  public abstract class FragmentManager.FragmentLifecycleCallbacks {













  public static abstract class FragmentManager.FragmentLifecycleCallbacks {















    ctor public FragmentManager.FragmentLifecycleCallbacks();















    method public void onFragmentActivityCreated(android.app.FragmentManager, android.app.Fragment, android.os.Bundle);















    method public void onFragmentAttached(android.app.FragmentManager, android.app.Fragment, android.content.Context);

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -4811,7 +4811,7 @@ package android.app {













    method public abstract java.lang.String getName();















  }



























  public abstract class FragmentManager.FragmentLifecycleCallbacks {













  public static abstract class FragmentManager.FragmentLifecycleCallbacks {















    ctor public FragmentManager.FragmentLifecycleCallbacks();















    method public void onFragmentActivityCreated(android.app.FragmentManager, android.app.Fragment, android.os.Bundle);















    method public void onFragmentAttached(android.app.FragmentManager, android.app.Fragment, android.content.Context);

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -4668,7 +4668,7 @@ package android.app {













    method public abstract java.lang.String getName();















  }



























  public abstract class FragmentManager.FragmentLifecycleCallbacks {













  public static abstract class FragmentManager.FragmentLifecycleCallbacks {















    ctor public FragmentManager.FragmentLifecycleCallbacks();















    method public void onFragmentActivityCreated(android.app.FragmentManager, android.app.Fragment, android.os.Bundle);















    method public void onFragmentAttached(android.app.FragmentManager, android.app.Fragment, android.content.Context);

























core/java/android/app/FragmentManager.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -387,7 +387,7 @@ public abstract class FragmentManager {













     * Callback interface for listening to fragment state changes that happen















     * within a given FragmentManager.















     */













    public abstract class FragmentLifecycleCallbacks {













    public abstract static class FragmentLifecycleCallbacks {















        /**















         * Called right before the fragment's {@link Fragment#onAttach(Context)} method is called.















         * This is a good time to inject any required dependencies for the fragment before any of

































packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -62,8 +62,7 @@ public class FragmentHostManager {













    private void createFragmentHost(Parcelable savedState) {















        mFragments = FragmentController.createController(new HostCallbacks());















        mFragments.attachHost(null);













        // TODO: Remove non-staticness from FragmentLifecycleCallbacks (hopefully).













        mLifecycleCallbacks = mFragments.getFragmentManager().new FragmentLifecycleCallbacks() {













        mLifecycleCallbacks = new FragmentLifecycleCallbacks() {















            @Override















            public void onFragmentViewCreated(FragmentManager fm, Fragment f, View v,















                    Bundle savedInstanceState) {