| commit | 322ca17157d6d262948259c947cd549c4de77350 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Mar 08 02:39:39 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 08 02:39:39 2019 +0000 |
| tree | 1207c70242938c7b4e7118f7310a270b6b64b648 | |
| parent | 9c59494602b858af7f8cbbb652437f9ed1b3fbfa [diff] | |
| parent | 1ffecb5fd20d91144c78874045dee39ee4a5c91e [diff] |
Merge "resolver_list.xml and resolver_list_with_default.xml are used as root elements, so they must have valid ViewGroups."
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>