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

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

Merge "Renamed Activity class multi-window APIs"

parents 20a0e405 3b93a4d3

api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -3408,7 +3408,7 @@ package android.app { 
    method public boolean dispatchTouchEvent(android.view.MotionEvent);

    method public boolean dispatchTrackballEvent(android.view.MotionEvent);

    method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);

    method public void enterPictureInPictureMode();

    method public void enterPictureInPicture();

    method public android.view.View findViewById(int);

    method public void finish();

    method public void finishActivity(int);
@@ -3448,8 +3448,8 @@ package android.app { 
    method public android.view.Window getWindow();

    method public android.view.WindowManager getWindowManager();

    method public boolean hasWindowFocus();

    method public boolean inMultiWindowMode();

    method public boolean inPictureInPictureMode();

    method public boolean inMultiWindow();

    method public boolean inPictureInPicture();

    method public void invalidateOptionsMenu();

    method public boolean isChangingConfigurations();

    method public final boolean isChild();
@@ -3503,7 +3503,7 @@ package android.app { 
    method public void onLowMemory();

    method public boolean onMenuItemSelected(int, android.view.MenuItem);

    method public boolean onMenuOpened(int, android.view.Menu);

    method public void onMultiWindowModeChanged(boolean);

    method public void onMultiWindowChanged(boolean);

    method public boolean onNavigateUp();

    method public boolean onNavigateUpFromChild(android.app.Activity);

    method protected void onNewIntent(android.content.Intent);
@@ -3511,7 +3511,7 @@ package android.app { 
    method public void onOptionsMenuClosed(android.view.Menu);

    method public void onPanelClosed(int, android.view.Menu);

    method protected void onPause();

    method public void onPictureInPictureModeChanged(boolean);

    method public void onPictureInPictureChanged(boolean);

    method protected void onPostCreate(android.os.Bundle);

    method public void onPostCreate(android.os.Bundle, android.os.PersistableBundle);

    method protected void onPostResume();

api/system-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -3523,7 +3523,7 @@ package android.app { 
    method public boolean dispatchTouchEvent(android.view.MotionEvent);

    method public boolean dispatchTrackballEvent(android.view.MotionEvent);

    method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);

    method public void enterPictureInPictureMode();

    method public void enterPictureInPicture();

    method public android.view.View findViewById(int);

    method public void finish();

    method public void finishActivity(int);
@@ -3563,8 +3563,8 @@ package android.app { 
    method public android.view.Window getWindow();

    method public android.view.WindowManager getWindowManager();

    method public boolean hasWindowFocus();

    method public boolean inMultiWindowMode();

    method public boolean inPictureInPictureMode();

    method public boolean inMultiWindow();

    method public boolean inPictureInPicture();

    method public void invalidateOptionsMenu();

    method public boolean isBackgroundVisibleBehind();

    method public boolean isChangingConfigurations();
@@ -3620,7 +3620,7 @@ package android.app { 
    method public void onLowMemory();

    method public boolean onMenuItemSelected(int, android.view.MenuItem);

    method public boolean onMenuOpened(int, android.view.Menu);

    method public void onMultiWindowModeChanged(boolean);

    method public void onMultiWindowChanged(boolean);

    method public boolean onNavigateUp();

    method public boolean onNavigateUpFromChild(android.app.Activity);

    method protected void onNewIntent(android.content.Intent);
@@ -3628,7 +3628,7 @@ package android.app { 
    method public void onOptionsMenuClosed(android.view.Menu);

    method public void onPanelClosed(int, android.view.Menu);

    method protected void onPause();

    method public void onPictureInPictureModeChanged(boolean);

    method public void onPictureInPictureChanged(boolean);

    method protected void onPostCreate(android.os.Bundle);

    method public void onPostCreate(android.os.Bundle, android.os.PersistableBundle);

    method protected void onPostResume();

api/test-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -3408,7 +3408,7 @@ package android.app { 
    method public boolean dispatchTouchEvent(android.view.MotionEvent);

    method public boolean dispatchTrackballEvent(android.view.MotionEvent);

    method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);

    method public void enterPictureInPictureMode();

    method public void enterPictureInPicture();

    method public android.view.View findViewById(int);

    method public void finish();

    method public void finishActivity(int);
@@ -3448,8 +3448,8 @@ package android.app { 
    method public android.view.Window getWindow();

    method public android.view.WindowManager getWindowManager();

    method public boolean hasWindowFocus();

    method public boolean inMultiWindowMode();

    method public boolean inPictureInPictureMode();

    method public boolean inMultiWindow();

    method public boolean inPictureInPicture();

    method public void invalidateOptionsMenu();

    method public boolean isChangingConfigurations();

    method public final boolean isChild();
@@ -3503,7 +3503,7 @@ package android.app { 
    method public void onLowMemory();

    method public boolean onMenuItemSelected(int, android.view.MenuItem);

    method public boolean onMenuOpened(int, android.view.Menu);

    method public void onMultiWindowModeChanged(boolean);

    method public void onMultiWindowChanged(boolean);

    method public boolean onNavigateUp();

    method public boolean onNavigateUpFromChild(android.app.Activity);

    method protected void onNewIntent(android.content.Intent);
@@ -3511,7 +3511,7 @@ package android.app { 
    method public void onOptionsMenuClosed(android.view.Menu);

    method public void onPanelClosed(int, android.view.Menu);

    method protected void onPause();

    method public void onPictureInPictureModeChanged(boolean);

    method public void onPictureInPictureChanged(boolean);

    method protected void onPostCreate(android.os.Bundle);

    method public void onPostCreate(android.os.Bundle, android.os.PersistableBundle);

    method protected void onPostResume();

core/java/android/app/Activity.java

+13 −24
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import android.database.Cursor; 
import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Icon;

import android.media.AudioManager;

import android.media.session.MediaController;

import android.net.Uri;
@@ -72,7 +71,6 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.Looper;

import android.os.Parcelable;

import android.os.PersistableBundle;

import android.os.RemoteException;

import android.os.StrictMode;

import android.os.UserHandle;
@@ -80,16 +78,12 @@ import android.text.Selection; 
import android.text.SpannableStringBuilder;

import android.text.TextUtils;

import android.text.method.TextKeyListener;

import android.transition.Scene;

import android.transition.TransitionManager;

import android.util.ArrayMap;

import android.util.AttributeSet;

import android.util.EventLog;

import android.util.Log;

import android.util.PrintWriterPrinter;

import android.util.Slog;

import android.util.SparseArray;

import android.util.SuperNotCalledException;

import android.view.ActionMode;

import android.view.ContextMenu;

import android.view.ContextMenu.ContextMenuInfo;
@@ -110,16 +104,11 @@ import android.view.ViewGroup.LayoutParams; 
import android.view.ViewManager;

import android.view.ViewRootImpl;

import android.view.Window;

import android.view.Window.WindowControllerCallback;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;

import android.view.accessibility.AccessibilityEvent;

import android.widget.AdapterView;

import android.widget.Toolbar;



import com.android.internal.app.IVoiceInteractor;

import com.android.internal.app.ToolbarActionBar;

import com.android.internal.app.WindowDecorActionBar;

import com.android.internal.policy.PhoneWindow;



import java.io.FileDescriptor;
@@ -1842,14 +1831,14 @@ public class Activity extends ContextThemeWrapper 
     * visa-versa.

     * @see android.R.attr#resizeableActivity

     *

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

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

     */

    @CallSuper

    public void onMultiWindowModeChanged(boolean multiWindowMode) {

    public void onMultiWindowChanged(boolean inMultiWindow) {

        if (DEBUG_LIFECYCLE) Slog.v(TAG,

                "onMultiWindowModeChanged " + this + ": " + multiWindowMode);

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

        if (mWindow != null) {

            mWindow.onMultiWindowModeChanged();

            mWindow.onMultiWindowChanged();

        }

    }
@@ -1859,9 +1848,9 @@ public class Activity extends ContextThemeWrapper 
     *

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

     */

    public boolean inMultiWindowMode() {

    public boolean inMultiWindow() {

        try {

            return ActivityManagerNative.getDefault().inMultiWindowMode(mToken);

            return ActivityManagerNative.getDefault().inMultiWindow(mToken);

        } catch (RemoteException e) {

        }

        return false;
@@ -1871,11 +1860,11 @@ public class Activity extends ContextThemeWrapper 
     * Called by the system when the activity changes to and from picture-in-picture mode.

     * @see android.R.attr#supportsPictureInPicture

     *

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

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

     */

    public void onPictureInPictureModeChanged(boolean pictureInPictureMode) {

    public void onPictureInPictureChanged(boolean inPictureInPicture) {

        if (DEBUG_LIFECYCLE) Slog.v(TAG,

                "onPictureInPictureModeChanged " + this + ": " + pictureInPictureMode);

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

    }



    /**
@@ -1884,9 +1873,9 @@ public class Activity extends ContextThemeWrapper 
     *

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

     */

    public boolean inPictureInPictureMode() {

    public boolean inPictureInPicture() {

        try {

            return ActivityManagerNative.getDefault().inPictureInPictureMode(mToken);

            return ActivityManagerNative.getDefault().inPictureInPicture(mToken);

        } catch (RemoteException e) {

        }

        return false;
@@ -1896,9 +1885,9 @@ public class Activity extends ContextThemeWrapper 
     * Puts the activity in picture-in-picture mode.

     * @see android.R.attr#supportsPictureInPicture

     */

    public void enterPictureInPictureMode() {

    public void enterPictureInPicture() {

        try {

            ActivityManagerNative.getDefault().enterPictureInPictureMode(mToken);

            ActivityManagerNative.getDefault().enterPictureInPicture(mToken);

        } catch (RemoteException e) {

        }

    }

core/java/android/app/ActivityManagerNative.java

+14 −14
Original line number Diff line number Diff line
@@ -2842,26 +2842,26 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            reply.writeInt(res);

            return true;

        }

        case IN_MULTI_WINDOW_MODE_TRANSACTION: {

        case IN_MULTI_WINDOW_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            final IBinder token = data.readStrongBinder();

            final boolean multiWindowMode = inMultiWindowMode(token);

            final boolean inMultiWindow = inMultiWindow(token);

            reply.writeNoException();

            reply.writeInt(multiWindowMode ? 1 : 0);

            reply.writeInt(inMultiWindow ? 1 : 0);

            return true;

        }

        case IN_PICTURE_IN_PICTURE_MODE_TRANSACTION: {

        case IN_PICTURE_IN_PICTURE_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            final IBinder token = data.readStrongBinder();

            final boolean pipMode = inPictureInPictureMode(token);

            final boolean inPip = inPictureInPicture(token);

            reply.writeNoException();

            reply.writeInt(pipMode ? 1 : 0);

            reply.writeInt(inPip ? 1 : 0);

            return true;

        }

        case ENTER_PICTURE_IN_PICTURE_MODE_TRANSACTION: {

        case ENTER_PICTURE_IN_PICTURE_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            final IBinder token = data.readStrongBinder();

            enterPictureInPictureMode(token);

            enterPictureInPicture(token);

            reply.writeNoException();

            return true;

        }
@@ -6678,12 +6678,12 @@ class ActivityManagerProxy implements IActivityManager 
    }



    @Override

    public boolean inMultiWindowMode(IBinder token) throws RemoteException {

    public boolean inMultiWindow(IBinder token) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(token);

        mRemote.transact(IN_MULTI_WINDOW_MODE_TRANSACTION, data, reply, 0);

        mRemote.transact(IN_MULTI_WINDOW_TRANSACTION, data, reply, 0);

        reply.readException();

        final boolean multiWindowMode = reply.readInt() == 1 ? true : false;

        data.recycle();
@@ -6692,12 +6692,12 @@ class ActivityManagerProxy implements IActivityManager 
    }



    @Override

    public boolean inPictureInPictureMode(IBinder token) throws RemoteException {

    public boolean inPictureInPicture(IBinder token) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(token);

        mRemote.transact(IN_PICTURE_IN_PICTURE_MODE_TRANSACTION, data, reply, 0);

        mRemote.transact(IN_PICTURE_IN_PICTURE_TRANSACTION, data, reply, 0);

        reply.readException();

        final boolean pipMode = reply.readInt() == 1 ? true : false;

        data.recycle();
@@ -6706,12 +6706,12 @@ class ActivityManagerProxy implements IActivityManager 
    }



    @Override

    public void enterPictureInPictureMode(IBinder token) throws RemoteException {

    public void enterPictureInPicture(IBinder token) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(token);

        mRemote.transact(ENTER_PICTURE_IN_PICTURE_MODE_TRANSACTION, data, reply, 0);

        mRemote.transact(ENTER_PICTURE_IN_PICTURE_TRANSACTION, data, reply, 0);

        reply.readException();

        data.recycle();

        reply.recycle();