summaryrefslogtreecommitdiffstats
path: root/core/java/android/util
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android/util')
-rw-r--r--core/java/android/util/Size.java33
-rw-r--r--core/java/android/util/SizeF.java33
2 files changed, 2 insertions, 64 deletions
diff --git a/core/java/android/util/Size.java b/core/java/android/util/Size.java
index 6424344..62df564 100644
--- a/core/java/android/util/Size.java
+++ b/core/java/android/util/Size.java
@@ -18,13 +18,10 @@ package android.util;
import static com.android.internal.util.Preconditions.checkNotNull;
-import android.os.Parcel;
-import android.os.Parcelable;
-
/**
* Immutable class for describing width and height dimensions in pixels.
*/
-public final class Size implements Parcelable {
+public final class Size {
/**
* Create a new immutable Size instance.
*
@@ -36,11 +33,6 @@ public final class Size implements Parcelable {
mHeight = height;
}
- private Size(Parcel in) {
- mWidth = in.readInt();
- mHeight = in.readInt();
- }
-
/**
* Get the width of the size (in pixels).
* @return width
@@ -155,29 +147,6 @@ public final class Size implements Parcelable {
return mHeight ^ ((mWidth << (Integer.SIZE / 2)) | (mWidth >>> (Integer.SIZE / 2)));
}
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel out, int flags) {
- out.writeInt(mWidth);
- out.writeInt(mHeight);
- }
-
- public static final Parcelable.Creator<Size> CREATOR = new Parcelable.Creator<Size>() {
- @Override
- public Size createFromParcel(Parcel in) {
- return new Size(in);
- }
-
- @Override
- public Size[] newArray(int size) {
- return new Size[size];
- }
- };
-
private final int mWidth;
private final int mHeight;
}
diff --git a/core/java/android/util/SizeF.java b/core/java/android/util/SizeF.java
index 88bb439..ac4f187 100644
--- a/core/java/android/util/SizeF.java
+++ b/core/java/android/util/SizeF.java
@@ -18,9 +18,6 @@ package android.util;
import static com.android.internal.util.Preconditions.checkArgumentFinite;
-import android.os.Parcel;
-import android.os.Parcelable;
-
/**
* Immutable class for describing width and height dimensions in some arbitrary
* unit.
@@ -28,7 +25,7 @@ import android.os.Parcelable;
* Width and height are finite values stored as a floating point representation.
* </p>
*/
-public final class SizeF implements Parcelable {
+public final class SizeF {
/**
* Create a new immutable SizeF instance.
*
@@ -46,11 +43,6 @@ public final class SizeF implements Parcelable {
mHeight = checkArgumentFinite(height, "height");
}
- private SizeF(Parcel in) {
- mWidth = in.readFloat();
- mHeight = in.readFloat();
- }
-
/**
* Get the width of the size (as an arbitrary unit).
* @return width
@@ -111,29 +103,6 @@ public final class SizeF implements Parcelable {
return Float.floatToIntBits(mWidth) ^ Float.floatToIntBits(mHeight);
}
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel out, int flags) {
- out.writeFloat(mWidth);
- out.writeFloat(mHeight);
- }
-
- public static final Parcelable.Creator<SizeF> CREATOR = new Parcelable.Creator<SizeF>() {
- @Override
- public SizeF createFromParcel(Parcel in) {
- return new SizeF(in);
- }
-
- @Override
- public SizeF[] newArray(int size) {
- return new SizeF[size];
- }
- };
-
private final float mWidth;
private final float mHeight;
}