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

Commit d5ea3b46 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Add initial multi-display support." into jb-mr1-dev

parents 0552cbcf bd6e1500

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/database/IContentObserver.aidl \

	core/java/android/hardware/ISerialManager.aidl \

	core/java/android/hardware/display/IDisplayManager.aidl \

	core/java/android/hardware/display/IDisplayManagerCallback.aidl \

	core/java/android/hardware/input/IInputManager.aidl \

	core/java/android/hardware/input/IInputDevicesChangedListener.aidl \

	core/java/android/hardware/usb/IUsbManager.aidl \

api/current.txt

+3 −1
Original line number Diff line number Diff line
@@ -9997,7 +9997,8 @@ package android.hardware { 
package android.hardware.display {















  public final class DisplayManager {













    method public android.view.Display getDisplay(int, android.content.Context);













    method public android.view.Display getDisplay(int);













    method public android.view.Display[] getDisplays();















    method public void registerDisplayListener(android.hardware.display.DisplayManager.DisplayListener, android.os.Handler);















    method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);















  }










@@ -23453,6 +23454,7 @@ package android.view {













    method public int getRotation();















    method public void getSize(android.graphics.Point);















    method public deprecated int getWidth();













    method public boolean isValid();















    field public static final int DEFAULT_DISPLAY = 0; // 0x0















  }







































core/java/android/app/ActivityManager.java



+3
−1




























Original line number
Diff line number
Diff line








@@ -31,6 +31,7 @@ import android.content.res.Resources;













import android.graphics.Bitmap;















import android.graphics.Point;















import android.hardware.display.DisplayManager;













import android.hardware.display.DisplayManagerGlobal;















import android.os.Binder;















import android.os.Bundle;















import android.os.Debug;










@@ -376,7 +377,8 @@ public class ActivityManager {













            return true;















        }





























        Display display = DisplayManager.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY);













        Display display = DisplayManagerGlobal.getInstance().getRealDisplay(













                Display.DEFAULT_DISPLAY);















        Point p = new Point();















        display.getRealSize(p);















        int pixels = p.x * p.y;

































core/java/android/app/ActivityThread.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -43,6 +43,7 @@ import android.database.sqlite.SQLiteDebug.DbStats;













import android.graphics.Bitmap;















import android.graphics.Canvas;















import android.hardware.display.DisplayManager;













import android.hardware.display.DisplayManagerGlobal;















import android.net.IConnectivityManager;















import android.net.Proxy;















import android.net.ProxyProperties;










@@ -1557,7 +1558,7 @@ public final class ActivityThread {













            return dm;















        }





























        DisplayManager displayManager = DisplayManager.getInstance();













        DisplayManagerGlobal displayManager = DisplayManagerGlobal.getInstance();















        if (displayManager == null) {















            // may be null early in system startup















            dm = new DisplayMetrics();

































core/java/android/app/ContextImpl.java



+5
−4




























Original line number
Diff line number
Diff line








@@ -349,9 +349,10 @@ class ContextImpl extends Context {













                    return InputManager.getInstance();















                }});





























        registerService(DISPLAY_SERVICE, new StaticServiceFetcher() {













            public Object createStaticService() {













                return DisplayManager.getInstance();













        registerService(DISPLAY_SERVICE, new ServiceFetcher() {













                @Override













                public Object createService(ContextImpl ctx) {













                    return new DisplayManager(ctx.getOuterContext());















                }});































        registerService(INPUT_METHOD_SERVICE, new ServiceFetcher() {