| commit | 31ee1c0aaa4526fdd01b09e5506782f9ca3876bc | [log] [tgz] |
|---|---|---|
| author | blackberrymobile.tcl <blackberrymobile.tcl@gmail.com> | Tue May 21 16:12:19 2019 +0800 |
| committer | Rafi Ahmad <rafiahmad@google.com> | Mon Jun 10 23:17:37 2019 +0000 |
| tree | c004778ed874409b7e8ad1a978125afbdc075e5d | |
| parent | 950e66cc1caf4552238460273a5d6a4d996a9365 [diff] |
DO NOT MERGE testMarginsArePercentagesOfContentFrame failed
testMarginsArePercentagesOfContentFrame failed on device with 1620x1080 due to CL 844120.
Only resize test dialog according to device density for ldpi devices, but keep 200x200 for others.
Bug: 133209782
Tests: 1. Build pass
2. testMarginsArePercentagesOfContentFrame test pass
Signed-off-by: blackberrymobile.tcl <blackberrymobile.tcl@gmail.com>
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/src/android/server/frametestapp/DialogTestActivity.java b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/src/android/server/frametestapp/DialogTestActivity.java index 54ee34c..cb86b5e 100644 --- a/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/src/android/server/frametestapp/DialogTestActivity.java +++ b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/src/android/server/frametestapp/DialogTestActivity.java
@@ -208,6 +208,6 @@ private int getSize() { float density = getResources().getDisplayMetrics().density; - return (int)(200 * density); + return density > 1.0 ? 200 : (int)(200 * density); } }
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/DialogFrameTests.java b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/DialogFrameTests.java index 125bcb3..0b28fd7 100644 --- a/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/DialogFrameTests.java +++ b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/DialogFrameTests.java
@@ -216,7 +216,7 @@ int size = explicitDimension; try { float density = getDensity(); - size = (int)(explicitDimension * density); + size = density > 1.0 ? explicitDimension : (int)(explicitDimension * density); } catch (DeviceNotAvailableException e) { } return size;