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

Commit ccafb1ad authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 437a0fbd: Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev 

* commit '437a0fbd':
  Introduce multiple displays with DisplayContent.
parents 23e6a909 437a0fbd

cmds/am/src/com/android/commands/am/Am.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.SystemProperties;

import android.util.AndroidException;

import android.util.AndroidException;

import android.view.Display;

import android.view.IWindowManager;

import android.view.IWindowManager;





import java.io.BufferedReader;

import java.io.BufferedReader;
@@ -1117,9 +1118,10 @@ public class Am { 




        try {

        try {

            if (m >= 0 && n >= 0) {

            if (m >= 0 && n >= 0) {

                wm.setForcedDisplaySize(m, n);

                // TODO(multidisplay): For now Configuration only applies to main screen.

                wm.setForcedDisplaySize(Display.DEFAULT_DISPLAY, m, n);

            } else {

            } else {

                wm.clearForcedDisplaySize();

                wm.clearForcedDisplaySize(Display.DEFAULT_DISPLAY);

            }

            }

        } catch (RemoteException e) {

        } catch (RemoteException e) {

        }

        }

core/java/android/view/IWindowManager.aidl

+3 −3
Original line number Original line Diff line number Diff line
@@ -57,8 +57,8 @@ interface IWindowManager 
            in IInputContext inputContext);

            in IInputContext inputContext);

    boolean inputMethodClientHasFocus(IInputMethodClient client);

    boolean inputMethodClientHasFocus(IInputMethodClient client);





    void setForcedDisplaySize(int longDimen, int shortDimen);

    void setForcedDisplaySize(int displayId, int longDimen, int shortDimen);

    void clearForcedDisplaySize();

    void clearForcedDisplaySize(int displayId);





    // Is the device configured to have a full system bar for larger screens?

    // Is the device configured to have a full system bar for larger screens?

    boolean hasSystemNavBar();

    boolean hasSystemNavBar();
@@ -184,7 +184,7 @@ interface IWindowManager 
	/**

	/**

	 * Create a screenshot of the applications currently displayed.

	 * Create a screenshot of the applications currently displayed.

	 */

	 */

	Bitmap screenshotApplications(IBinder appToken, int maxWidth, int maxHeight);

	Bitmap screenshotApplications(IBinder appToken, int displayId, int maxWidth, int maxHeight);





    /**

    /**

     * Called by the status bar to notify Views of changes to System UI visiblity.

     * Called by the status bar to notify Views of changes to System UI visiblity.

services/java/com/android/server/SystemServer.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ import android.util.DisplayMetrics; 
import android.util.EventLog;

import android.util.EventLog;

import android.util.Log;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.view.Display;

import android.view.WindowManager;

import android.view.WindowManager;





import com.android.internal.os.BinderInternal;

import com.android.internal.os.BinderInternal;

services/java/com/android/server/am/ActivityStack.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ import android.os.UserId; 
import android.util.EventLog;

import android.util.EventLog;

import android.util.Log;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.view.Display;

import android.view.WindowManagerPolicy;

import android.view.WindowManagerPolicy;





import java.io.IOException;

import java.io.IOException;
@@ -919,7 +920,8 @@ final class ActivityStack { 
        }

        }





        if (w > 0) {

        if (w > 0) {

            return mService.mWindowManager.screenshotApplications(who.appToken, w, h);

            return mService.mWindowManager.screenshotApplications(who.appToken,

                    Display.DEFAULT_DISPLAY, w, h);

        }

        }

        return null;

        return null;

    }

    }

services/java/com/android/server/am/ProcessList.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.server.wm.WindowManagerService; 




import android.graphics.Point;

import android.graphics.Point;

import android.util.Slog;

import android.util.Slog;

import android.view.Display;





/**

/**

 * Activity manager code dealing with processes.

 * Activity manager code dealing with processes.
@@ -146,7 +147,7 @@ class ProcessList { 
    void applyDisplaySize(WindowManagerService wm) {

    void applyDisplaySize(WindowManagerService wm) {

        if (!mHaveDisplaySize) {

        if (!mHaveDisplaySize) {

            Point p = new Point();

            Point p = new Point();

            wm.getInitialDisplaySize(p);

            wm.getInitialDisplaySize(Display.DEFAULT_DISPLAY, p);

            if (p.x != 0 && p.y != 0) {

            if (p.x != 0 && p.y != 0) {

                updateOomLevels(p.x, p.y, true);

                updateOomLevels(p.x, p.y, true);

                mHaveDisplaySize = true;

                mHaveDisplaySize = true;