diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-16 22:43:15 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-16 22:43:15 +0000 |
| commit | 7156f1e2dfe51cce0df8759fc13dcbbe043b8797 (patch) | |
| tree | 44bd7c841dcf732f0a40f7d98282235171b73ee0 | |
| parent | 3f30e535c78b7e76ee3e14d29a75e997e33fd30c (diff) | |
| parent | 5d425f448138dcf0e87a579b49145b32332fb48e (diff) | |
| download | layoutlib-7156f1e2dfe51cce0df8759fc13dcbbe043b8797.tar.gz | |
Snap for 8310876 from 5d425f448138dcf0e87a579b49145b32332fb48e to mainline-adservices-release
Change-Id: I50238a595b50847f56e8e5fa76d618466e941822
| -rw-r--r-- | METADATA | 16 | ||||
| -rw-r--r-- | bridge/src/android/view/WindowManagerImpl.java | 6 |
2 files changed, 11 insertions, 11 deletions
@@ -1,11 +1,11 @@ third_party { - # would be NOTICE save for EPL in: - # create/tests/res/mock_data/mock_android/fake/InnerTest.java - # create/tests/res/mock_data/mock_android/util/EmptyArray.java - # create/tests/res/mock_data/mock_android/view/View.java - # create/tests/res/mock_data/mock_android/view/ViewGroup.java - # create/tests/res/mock_data/mock_android/widget/LinearLayout.java - # create/tests/res/mock_data/mock_android/widget/TableLayout.java - # create/tests/res/mock_data/notjava/lang/JavaClass.java + license_note: "would be NOTICE save for EPL in:\n" + " create/tests/res/mock_data/mock_android/fake/InnerTest.java\n" + " create/tests/res/mock_data/mock_android/util/EmptyArray.java\n" + " create/tests/res/mock_data/mock_android/view/View.java\n" + " create/tests/res/mock_data/mock_android/view/ViewGroup.java\n" + " create/tests/res/mock_data/mock_android/widget/LinearLayout.java\n" + " create/tests/res/mock_data/mock_android/widget/TableLayout.java\n" + " create/tests/res/mock_data/notjava/lang/JavaClass.java" license_type: RECIPROCAL } diff --git a/bridge/src/android/view/WindowManagerImpl.java b/bridge/src/android/view/WindowManagerImpl.java index f3d5a87252..dabeda3584 100644 --- a/bridge/src/android/view/WindowManagerImpl.java +++ b/bridge/src/android/view/WindowManagerImpl.java @@ -120,18 +120,18 @@ public class WindowManagerImpl implements WindowManager { int parentHeight = MeasureSpec.getSize(parentHeightMeasureSpec); int childWidthMeasureSpec = 0; int childHeightMeasureSpec = ViewRootImpl.getRootMeasureSpec(parentHeight, - lp.height); + lp.height, 0); if (lp.width == WRAP_CONTENT) { int baseSize = mContext.getResources().getDimensionPixelSize(R.dimen.config_prefDialogWidth); if (baseSize != 0 && baseSize < parentWidth) { childWidthMeasureSpec = ViewRootImpl.getRootMeasureSpec(baseSize, - lp.width); + lp.width, 0); } } if (childWidthMeasureSpec == 0) { childWidthMeasureSpec = ViewRootImpl.getRootMeasureSpec(parentWidth, - lp.width); + lp.width, 0); } child.measure(childWidthMeasureSpec, childHeightMeasureSpec); } |