Before this CL, minimum dimensions of Activity wasn't respected, that said, an Activity could be embedded in a TaskFragment of which bounds are smaller its minimum dimensions. This CL add the minimum dimensions on several places: WM core: 1. Verify minimum dimension requirement before adding an Activity to a TaskFragment. It'll be early return if the requirement is not satisfied. 2. Propagate the minimum dimensions to the client side through TaskFragmentInfo to notify the requirement. 3. If TaskFragmentOrganizer tries to shrink a TaskFragment to the bounds that smaller than minimum dimensions of its children Activity, switch to match the parent bounds. AndroidX Window extensions: 1. Early return if TaskFragment is resized to the bounds that smaller than minimum dimensions which dispatched from the server side. 2. When organizer tries to show Activities side-by-side, verify if minimum dimensions requirement of the primary Activiy. If the requirement is not satisfied, show Activities in fullscreen instead. TODO: Add an API to check if an Activity intent is allowed to embed in a TaskFragment. Bug: 232871351 Test: atest TaskFragmentOrganizerControllerTest Test: atest TaskFragmentOrganizerTest TaskFragmentOrganizerPolicyTest Test: atest SplitActivityLifecycleTest Test: atest CtsWindowManagerJetpackTestCases Test: atest WmJetpackUnitTests Merged-In: Ib46c2cec2a0735b9e3f3420f2cb94754801b86b9 Change-Id: Ib46c2cec2a0735b9e3f3420f2cb94754801b86b9
178 lines
4.3 KiB
Java
178 lines
4.3 KiB
Java
/*
|
|
* Copyright (C) 2007 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package android.graphics;
|
|
|
|
import android.annotation.NonNull;
|
|
import android.annotation.Nullable;
|
|
import android.os.Parcel;
|
|
import android.os.Parcelable;
|
|
|
|
/**
|
|
* Point holds two integer coordinates
|
|
*/
|
|
public class Point implements Parcelable {
|
|
public int x;
|
|
public int y;
|
|
|
|
public Point() {}
|
|
|
|
public Point(int x, int y) {
|
|
this.x = x;
|
|
this.y = y;
|
|
}
|
|
|
|
public Point(@NonNull Point src) {
|
|
set(src);
|
|
}
|
|
|
|
/**
|
|
* Set the point's x and y coordinates
|
|
*/
|
|
public void set(int x, int y) {
|
|
this.x = x;
|
|
this.y = y;
|
|
}
|
|
|
|
/**
|
|
* Sets the point's from {@code src}'s coordinates
|
|
* @hide
|
|
*/
|
|
public void set(@NonNull Point src) {
|
|
this.x = src.x;
|
|
this.y = src.y;
|
|
}
|
|
|
|
/**
|
|
* Negate the point's coordinates
|
|
*/
|
|
public final void negate() {
|
|
x = -x;
|
|
y = -y;
|
|
}
|
|
|
|
/**
|
|
* Offset the point's coordinates by dx, dy
|
|
*/
|
|
public final void offset(int dx, int dy) {
|
|
x += dx;
|
|
y += dy;
|
|
}
|
|
|
|
/**
|
|
* Returns true if the point's coordinates equal (x,y)
|
|
*/
|
|
public final boolean equals(int x, int y) {
|
|
return this.x == x && this.y == y;
|
|
}
|
|
|
|
@Override
|
|
public boolean equals(Object o) {
|
|
if (this == o) return true;
|
|
if (o == null || getClass() != o.getClass()) return false;
|
|
|
|
Point point = (Point) o;
|
|
|
|
if (x != point.x) return false;
|
|
if (y != point.y) return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
@Override
|
|
public int hashCode() {
|
|
int result = x;
|
|
result = 31 * result + y;
|
|
return result;
|
|
}
|
|
|
|
@Override
|
|
public String toString() {
|
|
return "Point(" + x + ", " + y + ")";
|
|
}
|
|
|
|
/**
|
|
* @return Returns a {@link String} that represents this point which can be parsed with
|
|
* {@link #unflattenFromString(String)}.
|
|
* @hide
|
|
*/
|
|
@NonNull
|
|
public String flattenToString() {
|
|
return x + "x" + y;
|
|
}
|
|
|
|
/**
|
|
* @return Returns a {@link Point} from a short string created from {@link #flattenToString()}.
|
|
* @hide
|
|
*/
|
|
@Nullable
|
|
public static Point unflattenFromString(String s) throws NumberFormatException {
|
|
final int sep_ix = s.indexOf("x");
|
|
return new Point(Integer.parseInt(s.substring(0, sep_ix)),
|
|
Integer.parseInt(s.substring(sep_ix + 1)));
|
|
}
|
|
|
|
/**
|
|
* Parcelable interface methods
|
|
*/
|
|
@Override
|
|
public int describeContents() {
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Write this point to the specified parcel. To restore a point from
|
|
* a parcel, use readFromParcel()
|
|
* @param out The parcel to write the point's coordinates into
|
|
*/
|
|
@Override
|
|
public void writeToParcel(Parcel out, int flags) {
|
|
out.writeInt(x);
|
|
out.writeInt(y);
|
|
}
|
|
|
|
public static final @android.annotation.NonNull Parcelable.Creator<Point> CREATOR = new Parcelable.Creator<Point>() {
|
|
/**
|
|
* Return a new point from the data in the specified parcel.
|
|
*/
|
|
@Override
|
|
public Point createFromParcel(Parcel in) {
|
|
Point r = new Point();
|
|
r.readFromParcel(in);
|
|
return r;
|
|
}
|
|
|
|
/**
|
|
* Return an array of rectangles of the specified size.
|
|
*/
|
|
@Override
|
|
public Point[] newArray(int size) {
|
|
return new Point[size];
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Set the point's coordinates from the data stored in the specified
|
|
* parcel. To write a point to a parcel, call writeToParcel().
|
|
*
|
|
* @param in The parcel to read the point's coordinates from
|
|
*/
|
|
public void readFromParcel(@NonNull Parcel in) {
|
|
x = in.readInt();
|
|
y = in.readInt();
|
|
}
|
|
}
|