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

Commit e8c9238d authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Added onMultiWindowChanged and onPictureInPictureChanged methods to Fragement class"

parents 75929877 7c796811

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -4422,9 +4422,11 @@ package android.app { 
    method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);

    method public deprecated void onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle);

    method public void onLowMemory();

    method public void onMultiWindowChanged(boolean);

    method public boolean onOptionsItemSelected(android.view.MenuItem);

    method public void onOptionsMenuClosed(android.view.Menu);

    method public void onPause();

    method public void onPictureInPictureChanged(boolean);

    method public void onPrepareOptionsMenu(android.view.Menu);

    method public void onRequestPermissionsResult(int, java.lang.String[], int[]);

    method public void onResume();
@@ -4505,9 +4507,11 @@ package android.app { 
    method public void dispatchDestroy();

    method public void dispatchDestroyView();

    method public void dispatchLowMemory();

    method public void dispatchMultiWindowChanged(boolean);

    method public boolean dispatchOptionsItemSelected(android.view.MenuItem);

    method public void dispatchOptionsMenuClosed(android.view.Menu);

    method public void dispatchPause();

    method public void dispatchPictureInPictureChanged(boolean);

    method public boolean dispatchPrepareOptionsMenu(android.view.Menu);

    method public void dispatchResume();

    method public void dispatchStart();

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -4555,9 +4555,11 @@ package android.app { 
    method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);

    method public deprecated void onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle);

    method public void onLowMemory();

    method public void onMultiWindowChanged(boolean);

    method public boolean onOptionsItemSelected(android.view.MenuItem);

    method public void onOptionsMenuClosed(android.view.Menu);

    method public void onPause();

    method public void onPictureInPictureChanged(boolean);

    method public void onPrepareOptionsMenu(android.view.Menu);

    method public void onRequestPermissionsResult(int, java.lang.String[], int[]);

    method public void onResume();
@@ -4638,9 +4640,11 @@ package android.app { 
    method public void dispatchDestroy();

    method public void dispatchDestroyView();

    method public void dispatchLowMemory();

    method public void dispatchMultiWindowChanged(boolean);

    method public boolean dispatchOptionsItemSelected(android.view.MenuItem);

    method public void dispatchOptionsMenuClosed(android.view.Menu);

    method public void dispatchPause();

    method public void dispatchPictureInPictureChanged(boolean);

    method public boolean dispatchPrepareOptionsMenu(android.view.Menu);

    method public void dispatchResume();

    method public void dispatchStart();

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -4422,9 +4422,11 @@ package android.app { 
    method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);

    method public deprecated void onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle);

    method public void onLowMemory();

    method public void onMultiWindowChanged(boolean);

    method public boolean onOptionsItemSelected(android.view.MenuItem);

    method public void onOptionsMenuClosed(android.view.Menu);

    method public void onPause();

    method public void onPictureInPictureChanged(boolean);

    method public void onPrepareOptionsMenu(android.view.Menu);

    method public void onRequestPermissionsResult(int, java.lang.String[], int[]);

    method public void onResume();
@@ -4505,9 +4507,11 @@ package android.app { 
    method public void dispatchDestroy();

    method public void dispatchDestroyView();

    method public void dispatchLowMemory();

    method public void dispatchMultiWindowChanged(boolean);

    method public boolean dispatchOptionsItemSelected(android.view.MenuItem);

    method public void dispatchOptionsMenuClosed(android.view.Menu);

    method public void dispatchPause();

    method public void dispatchPictureInPictureChanged(boolean);

    method public boolean dispatchPrepareOptionsMenu(android.view.Menu);

    method public void dispatchResume();

    method public void dispatchStart();

core/java/android/app/Activity.java

+3 −0
Original line number Diff line number Diff line
@@ -1837,6 +1837,7 @@ public class Activity extends ContextThemeWrapper 
    public void onMultiWindowChanged(boolean inMultiWindow) {

        if (DEBUG_LIFECYCLE) Slog.v(TAG,

                "onMultiWindowChanged " + this + ": " + inMultiWindow);

        mFragments.dispatchMultiWindowChanged(inMultiWindow);

        if (mWindow != null) {

            mWindow.onMultiWindowChanged();

        }
@@ -1862,9 +1863,11 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param inPictureInPicture True if the activity is in picture-in-picture mode.

     */

    @CallSuper

    public void onPictureInPictureChanged(boolean inPictureInPicture) {

        if (DEBUG_LIFECYCLE) Slog.v(TAG,

                "onPictureInPictureChanged " + this + ": " + inPictureInPicture);

        mFragments.dispatchPictureInPictureChanged(inPictureInPicture);

    }



    /**

core/java/android/app/Fragment.java

+33 −0
Original line number Diff line number Diff line
@@ -1576,6 +1576,25 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
    public void onSaveInstanceState(Bundle outState) {

    }



    /**

     * Called when the Fragment's activity changes from fullscreen mode to multi-window mode and

     * visa-versa. This is generally tied to {@link Activity#onMultiWindowChanged} of the containing

     * Activity.

     *

     * @param inMultiWindow True if the activity is in multi-window mode.

     */

    public void onMultiWindowChanged(boolean inMultiWindow) {

    }



    /**

     * Called by the system when the activity changes to and from picture-in-picture mode. This is

     * generally tied to {@link Activity#onPictureInPictureChanged} of the containing Activity.

     *

     * @param inPictureInPicture True if the activity is in picture-in-picture mode.

     */

    public void onPictureInPictureChanged(boolean inPictureInPicture) {

    }



    public void onConfigurationChanged(Configuration newConfig) {

        mCalled = true;

    }
@@ -2308,6 +2327,20 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
        }

    }



    void performMultiWindowChanged(boolean inMultiWindow) {

        onMultiWindowChanged(inMultiWindow);

        if (mChildFragmentManager != null) {

            mChildFragmentManager.dispatchMultiWindowChanged(inMultiWindow);

        }

    }



    void performPictureInPictureChanged(boolean inPictureInPicture) {

        onPictureInPictureChanged(inPictureInPicture);

        if (mChildFragmentManager != null) {

            mChildFragmentManager.dispatchPictureInPictureChanged(inPictureInPicture);

        }

    }



    void performConfigurationChanged(Configuration newConfig) {

        onConfigurationChanged(newConfig);

        if (mChildFragmentManager != null) {