Merge "Change NFC antenna api comments to indicated top-left start point for all axis." into main (3c3ccd2b) · Commits · e / os / android_frameworks_base

nfc/java/android/nfc/AvailableNfcAntenna.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -28,13 +28,13 @@ import android.os.Parcelable;
		public final class AvailableNfcAntenna implements Parcelable {
		/**
		* Location of the antenna on the Y axis in millimeters.
		* 0 is the bottom-left when the user is facing the screen
		* 0 is the top-left when the user is facing the screen
		* and the device orientation is Portrait.
		*/
		private final int mLocationX;
		/**
		* Location of the antenna on the Y axis in millimeters.
		* 0 is the bottom-left when the user is facing the screen
		* 0 is the top-left when the user is facing the screen
		* and the device orientation is Portrait.
		*/
		private final int mLocationY;
		@@ -46,7 +46,7 @@ public final class AvailableNfcAntenna implements Parcelable {

		/**
		* Location of the antenna on the X axis in millimeters.
		* 0 is the bottom-left when the user is facing the screen
		* 0 is the top-left when the user is facing the screen
		* and the device orientation is Portrait.
		*/
		public int getLocationX() {
		@@ -55,7 +55,7 @@ public final class AvailableNfcAntenna implements Parcelable {

		/**
		* Location of the antenna on the Y axis in millimeters.
		* 0 is the bottom-left when the user is facing the screen
		* 0 is the top-left when the user is facing the screen
		* and the device orientation is Portrait.
		*/
		public int getLocationY() {

+2 −2

Original line number	Diff line number	Diff line
		@@ -64,9 +64,9 @@ public final class NfcAntennaInfo implements Parcelable {

		/**
		* Whether the device is foldable. When the device is foldable,
		* the 0, 0 is considered to be bottom-left when the device is unfolded and
		* the 0, 0 is considered to be top-left when the device is unfolded and
		* the screens are facing the user. For non-foldable devices 0, 0
		* is bottom-left when the user is facing the screen.
		* is top-left when the user is facing the screen.
		*/
		public boolean isDeviceFoldable() {
		return mDeviceFoldable;