Merge "Rename minWidth/Height attributes" into nyc-dev
am: a926ec80cc
* commit 'a926ec80cc303ff7fbe8b8c401f0a4bfa8f74029':
Rename minWidth/Height attributes
Change-Id: I9c4f5b3af3f76eab9f27e190d320fcda7071cd8d
diff --git a/hostsidetests/services/activitymanager/app/AndroidManifest.xml b/hostsidetests/services/activitymanager/app/AndroidManifest.xml
index 9170ebb..7ab6e33 100755
--- a/hostsidetests/services/activitymanager/app/AndroidManifest.xml
+++ b/hostsidetests/services/activitymanager/app/AndroidManifest.xml
@@ -106,8 +106,8 @@
<layout android:defaultWidth="240dp"
android:defaultHeight="160dp"
android:gravity="top|left"
- android:minimalWidth="100dp"
- android:minimalHeight="80dp"
+ android:minWidth="100dp"
+ android:minHeight="80dp"
/>
</activity>
<activity android:name=".TopRightLayoutActivity"
@@ -117,8 +117,8 @@
<layout android:defaultWidth="25%"
android:defaultHeight="35%"
android:gravity="top|right"
- android:minimalWidth="100dp"
- android:minimalHeight="80dp"
+ android:minWidth="100dp"
+ android:minHeight="80dp"
/>
</activity>
<activity android:name=".BottomLeftLayoutActivity"
@@ -128,8 +128,8 @@
<layout android:defaultWidth="25%"
android:defaultHeight="35%"
android:gravity="bottom|left"
- android:minimalWidth="100dp"
- android:minimalHeight="80dp"
+ android:minWidth="100dp"
+ android:minHeight="80dp"
/>
</activity>
<activity android:name=".BottomRightLayoutActivity"
@@ -139,8 +139,8 @@
<layout android:defaultWidth="240dp"
android:defaultHeight="160dp"
android:gravity="bottom|right"
- android:minimalWidth="100dp"
- android:minimalHeight="80dp"
+ android:minWidth="100dp"
+ android:minHeight="80dp"
/>
</activity>
</application>
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityAndWindowManagersState.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityAndWindowManagersState.java
index 54892de..42349c0 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityAndWindowManagersState.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityAndWindowManagersState.java
@@ -334,8 +334,8 @@
+ ", stackId=" + stackId, aTaskBounds, wTaskBounds);
if (compareTaskAndStackBounds && stackId != FREEFORM_WORKSPACE_STACK_ID) {
- int aTaskMinWidth = aTask.getMinimalWidth();
- int aTaskMinHeight = aTask.getMinimalHeight();
+ int aTaskMinWidth = aTask.getMinWidth();
+ int aTaskMinHeight = aTask.getMinHeight();
if (aTaskMinWidth == -1 || aTaskMinHeight == -1) {
// Minimal dimension(s) not set for task - it should be using defaults.
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerManifestLayoutTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerManifestLayoutTests.java
index 527d670..2395e55 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerManifestLayoutTests.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerManifestLayoutTests.java
@@ -41,8 +41,8 @@
private static final int DEFAULT_HEIGHT_DP = 160;
private static final float DEFAULT_WIDTH_FRACTION = 0.25f;
private static final float DEFAULT_HEIGHT_FRACTION = 0.35f;
- private static final int MINIMAL_WIDTH_DP = 100;
- private static final int MINIMAL_HEIGHT_DP = 80;
+ private static final int MIN_WIDTH_DP = 100;
+ private static final int MIN_HEIGHT_DP = 80;
private static final int GRAVITY_VER_CENTER = 0x01;
private static final int GRAVITY_VER_TOP = 0x02;
@@ -87,7 +87,7 @@
final String activityName = "BottomRightLayoutActivity";
// Issue command to resize to <0,0,1,1>. We expect the size to be floored at
- // MINIMAL_WIDTH_DPxMINIMAL_HEIGHT_DP.
+ // MIN_WIDTH_DPxMIN_HEIGHT_DP.
if (stackId == FREEFORM_WORKSPACE_STACK_ID) {
launchActivityInStack(activityName, stackId);
resizeActivityTask(activityName, 0, 0, 1, 1);
@@ -97,12 +97,12 @@
}
getDisplayAndWindowState(activityName, false);
- final int minimalWidth = dpToPx(MINIMAL_WIDTH_DP, mDisplay.getDpi());
- final int minimalHeight = dpToPx(MINIMAL_HEIGHT_DP, mDisplay.getDpi());
+ final int minWidth = dpToPx(MIN_WIDTH_DP, mDisplay.getDpi());
+ final int minHeight = dpToPx(MIN_HEIGHT_DP, mDisplay.getDpi());
final Rectangle containingRect = mWindowState.getContainingFrame();
- Assert.assertEquals("Minimum width is incorrect", minimalWidth, containingRect.width);
- Assert.assertEquals("Minimum height is incorrect", minimalHeight, containingRect.height);
+ Assert.assertEquals("Min width is incorrect", minWidth, containingRect.width);
+ Assert.assertEquals("Min height is incorrect", minHeight, containingRect.height);
}
private void testLayout(
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerState.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerState.java
index e56c32f..474b9c2 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerState.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerState.java
@@ -536,15 +536,15 @@
protected static final Pattern FULLSCREEN_PATTERN = Pattern.compile("mFullscreen=(\\S+)");
protected static final Pattern BOUNDS_PATTERN =
Pattern.compile("mBounds=Rect\\((\\d+), (\\d+) - (\\d+), (\\d+)\\)");
- protected static final Pattern MINIMAL_WIDTH_PATTERN =
- Pattern.compile("mMinimalWidth=(\\d+)");
- protected static final Pattern MINIMAL_HEIGHT_PATTERN =
- Pattern.compile("mMinimalHeight=(\\d+)");
+ protected static final Pattern MIN_WIDTH_PATTERN =
+ Pattern.compile("mMinWidth=(\\d+)");
+ protected static final Pattern MIN_HEIGHT_PATTERN =
+ Pattern.compile("mMinHeight=(\\d+)");
protected boolean mFullscreen;
protected Rectangle mBounds;
- protected int mMinimalWidth = -1;
- protected int mMinimalHeight = -1;
+ protected int mMinWidth = -1;
+ protected int mMinHeight = -1;
boolean extractFullscreen(String line) {
final Matcher matcher = FULLSCREEN_PATTERN.matcher(line);
@@ -580,15 +580,15 @@
}
boolean extractMinimalSize(String line) {
- final Matcher minWidthMatcher = MINIMAL_WIDTH_PATTERN.matcher(line);
- final Matcher minHeightMatcher = MINIMAL_HEIGHT_PATTERN.matcher(line);
+ final Matcher minWidthMatcher = MIN_WIDTH_PATTERN.matcher(line);
+ final Matcher minHeightMatcher = MIN_HEIGHT_PATTERN.matcher(line);
if (minWidthMatcher.matches()) {
log(line);
- mMinimalWidth = Integer.valueOf(minWidthMatcher.group(1));
+ mMinWidth = Integer.valueOf(minWidthMatcher.group(1));
} else if (minHeightMatcher.matches()) {
log(line);
- mMinimalHeight = Integer.valueOf(minHeightMatcher.group(1));
+ mMinHeight = Integer.valueOf(minHeightMatcher.group(1));
} else {
return false;
}
@@ -603,12 +603,12 @@
return mFullscreen;
}
- int getMinimalWidth() {
- return mMinimalWidth;
+ int getMinWidth() {
+ return mMinWidth;
}
- int getMinimalHeight() {
- return mMinimalHeight;
+ int getMinHeight() {
+ return mMinHeight;
}
}
