Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev (c4d7248c) · Commits · e / os / android_frameworks_base

cmds/vr/src/com/android/commands/vr/Vr.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		package com.android.commands.vr;

		import android.app.CompatibilityDisplayProperties;
		import android.app.Vr2dDisplayProperties;
		import android.content.Context;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		@@ -39,7 +39,7 @@ public final class Vr extends BaseCommand {

		private static final String COMMAND_SET_PERSISTENT_VR_MODE_ENABLED =
		"set-persistent-vr-mode-enabled";
		private static final String COMMAND_SET_COMPATIBILITY_DISPLAY_PROPERTIES =
		private static final String COMMAND_SET_VR2D_DISPLAY_PROPERTIES =
		"set-display-props";

		private IVrManager mVrService;
		@@ -63,8 +63,8 @@ public final class Vr extends BaseCommand {

		String command = nextArgRequired();
		switch (command) {
		case COMMAND_SET_COMPATIBILITY_DISPLAY_PROPERTIES:
		runSetCompatibilityDisplayProperties();
		case COMMAND_SET_VR2D_DISPLAY_PROPERTIES:
		runSetVr2dDisplayProperties();
		break;
		case COMMAND_SET_PERSISTENT_VR_MODE_ENABLED:
		runSetPersistentVrModeEnabled();
		@@ -74,7 +74,7 @@ public final class Vr extends BaseCommand {
		}
		}

		private void runSetCompatibilityDisplayProperties() throws RemoteException {
		private void runSetVr2dDisplayProperties() throws RemoteException {
		String widthStr = nextArgRequired();
		int width = Integer.parseInt(widthStr);

		@@ -84,11 +84,11 @@ public final class Vr extends BaseCommand {
		String dpiStr = nextArgRequired();
		int dpi = Integer.parseInt(dpiStr);

		CompatibilityDisplayProperties compatDisplayProperties =
		new CompatibilityDisplayProperties(width, height, dpi);
		Vr2dDisplayProperties vr2dDisplayProperties =
		new Vr2dDisplayProperties(width, height, dpi);

		try {
		mVrService.setCompatibilityDisplayProperties(compatDisplayProperties);
		mVrService.setVr2dDisplayProperties(vr2dDisplayProperties);
		} catch (RemoteException re) {
		System.err.println("Error: Can't set persistent mode " + re);
		}

core/java/android/app/ActivityManagerInternal.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -244,8 +244,8 @@ public abstract class ActivityManagerInternal {

		/**
		* Called after virtual display Id is updated by
		* {@link com.android.server.vr.CompatibilityDisplay} with a specific
		* {@param compatibilityDisplayId}.
		* {@link com.android.server.vr.Vr2dDisplay} with a specific
		* {@param vr2dDisplayId}.
		*/
		public abstract void setVrCompatibilityDisplayId(int vrCompatibilityDisplayId);
		public abstract void setVr2dDisplayId(int vr2dDisplayId);
		}

core/java/android/app/CompatibilityDisplayProperties.aidl→core/java/android/app/Vr2dDisplayProperties.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,4 +17,4 @@
		package android.app;

		/** @hide */
		parcelable CompatibilityDisplayProperties;
		parcelable Vr2dDisplayProperties;

core/java/android/app/CompatibilityDisplayProperties.java→core/java/android/app/Vr2dDisplayProperties.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import java.io.PrintWriter;
		*
		* @hide
		*/
		public class CompatibilityDisplayProperties implements Parcelable {
		public class Vr2dDisplayProperties implements Parcelable {

		/**
		* The actual width, height and dpi.
		@@ -36,7 +36,7 @@ public class CompatibilityDisplayProperties implements Parcelable {
		private final int mHeight;
		private final int mDpi;

		public CompatibilityDisplayProperties(int width, int height, int dpi) {
		public Vr2dDisplayProperties(int width, int height, int dpi) {
		mWidth = width;
		mHeight = height;
		mDpi = dpi;
		@@ -52,7 +52,7 @@ public class CompatibilityDisplayProperties implements Parcelable {

		@Override
		public String toString() {
		return "CompatibilityDisplayProperties{" +
		return "Vr2dDisplayProperties{" +
		"mWidth=" + mWidth +
		", mHeight=" + mHeight +
		", mDpi=" + mDpi +
		@@ -64,7 +64,7 @@ public class CompatibilityDisplayProperties implements Parcelable {
		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;

		CompatibilityDisplayProperties that = (CompatibilityDisplayProperties) o;
		Vr2dDisplayProperties that = (Vr2dDisplayProperties) o;

		if (getWidth() != that.getWidth()) return false;
		if (getHeight() != that.getHeight()) return false;
		@@ -83,27 +83,27 @@ public class CompatibilityDisplayProperties implements Parcelable {
		dest.writeInt(mDpi);
		}

		public static final Parcelable.Creator<CompatibilityDisplayProperties> CREATOR
		= new Parcelable.Creator<CompatibilityDisplayProperties>() {
		public static final Parcelable.Creator<Vr2dDisplayProperties> CREATOR
		= new Parcelable.Creator<Vr2dDisplayProperties>() {
		@Override
		public CompatibilityDisplayProperties createFromParcel(Parcel source) {
		return new CompatibilityDisplayProperties(source);
		public Vr2dDisplayProperties createFromParcel(Parcel source) {
		return new Vr2dDisplayProperties(source);
		}

		@Override
		public CompatibilityDisplayProperties[] newArray(int size) {
		return new CompatibilityDisplayProperties[size];
		public Vr2dDisplayProperties[] newArray(int size) {
		return new Vr2dDisplayProperties[size];
		}
		};

		private CompatibilityDisplayProperties(Parcel source) {
		private Vr2dDisplayProperties(Parcel source) {
		mWidth = source.readInt();
		mHeight = source.readInt();
		mDpi = source.readInt();
		}

		public void dump(PrintWriter pw, String prefix) {
		pw.println(prefix + "CompatibilityDisplayProperties:");
		pw.println(prefix + "Vr2dDisplayProperties:");
		pw.println(prefix + " width=" + mWidth);
		pw.println(prefix + " height=" + mHeight);
		pw.println(prefix + " dpi=" + mDpi);

core/java/android/app/VrManager.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -45,20 +45,20 @@ public class VrManager {
		}

		/**
		* Sets the resolution and DPI of the compatibility virtual display used to display 2D
		* Sets the resolution and DPI of the vr2d virtual display used to display 2D
		* applications in VR mode.
		*
		* <p>Requires {@link android.Manifest.permission#ACCESS_VR_MANAGER} permission.</p>
		*
		* @param {@link android.app.CompatibilityDisplayProperties} properties to be set to the
		* virtual display for 2D applications in VR mode.
		* @param vr2dDisplayProp properties to be set to the virtual display for
		* 2D applications in VR mode.
		*
		* {@hide}
		*/
		public void setCompatibilityDisplayProperties(
		CompatibilityDisplayProperties compatDisplayProp) {
		public void setVr2dDisplayProperties(
		Vr2dDisplayProperties vr2dDisplayProp) {
		try {
		mService.setCompatibilityDisplayProperties(compatDisplayProp);
		mService.setVr2dDisplayProperties(vr2dDisplayProp);
		} catch (RemoteException e) {
		e.rethrowFromSystemServer();
		}