| commit | 1ffecb5fd20d91144c78874045dee39ee4a5c91e | [log] [tgz] |
|---|---|---|
| author | davidln <davidln@google.com> | Thu Mar 07 12:29:40 2019 -0800 |
| committer | David Nelloms <davidln@google.com> | Thu Mar 07 21:38:22 2019 +0000 |
| tree | 7706a7c819852a11479c495474dfbbcc11a2ab6e | |
| parent | e971a21a8133496eff6804139691e5ccbc4c3176 [diff] |
resolver_list.xml and resolver_list_with_default.xml are used as root elements, so they must have valid ViewGroups. Modified in ag/6257827 to move car resources out of the overlay. Bug: 126268681 Test: build and deploy, launch intent which requires layout: adb shell am start -a android.settings.SETTINGS Change-Id: Ic9248e405ea759914495626bec0fa3d52b669d5f
diff --git a/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list.xml b/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list.xml index ac5fa6f..eec830d 100644 --- a/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list.xml +++ b/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list.xml
@@ -16,6 +16,9 @@ * limitations under the License. */ --> -<merge> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> <include layout="@*android:layout/car_resolver_list"/> -</merge> +</FrameLayout>
diff --git a/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list_with_default.xml b/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list_with_default.xml index 8e4dbf6..682f749 100644 --- a/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list_with_default.xml +++ b/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list_with_default.xml
@@ -16,6 +16,9 @@ * limitations under the License. */ --> -<merge> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> <include layout="@*android:layout/car_resolver_list_with_default"/> -</merge> +</FrameLayout>