summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCalvin Huang <calhuang@google.com>2022-02-15 15:31:36 -0800
committerCalvin Huang <calhuang@google.com>2022-02-16 01:14:07 +0000
commitbd290460e506afc9bc98549a10b13b559711b104 (patch)
treeca7ab0a380f26680c61028abdc20a9f6ec02b35b
parent4b2a120060ed29318c16dfdcd36859e7208c378f (diff)
downloadTemplates-ub_automotive.tar.gz
Fix crashes for aosp host with gradleub_automotive
1. Fixed crashes due to the lack of asynclayoutinflater 2. Fixed crashes due to the andoridx.constraintLayout, will cover by copybara 3. Fixed crashes due to the missing meter_text, need to sync to g3 Known bug to fix: when switch day/night, screen gose black Bug: 194232491 Test: ./gradlew :app:installDebug Change-Id: Ie290d5e91a10b753b91cba7fab72ebbb0f61486c
-rw-r--r--Host/app/build.gradle2
-rw-r--r--Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/maps/res/layout-w1280dp-h1000dp/map_template_layout.xml4
-rw-r--r--Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/maps/res/layout/map_template_layout.xml4
-rw-r--r--Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout-w1280dp-h1000dp/list_navigation_template_layout.xml4
-rw-r--r--Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout-w1280dp-h1000dp/navigation_template_layout.xml4
-rw-r--r--Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout/list_navigation_template_layout.xml4
-rw-r--r--Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout/navigation_template_layout.xml4
-rw-r--r--Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/widgets/common/res/layout/header_view.xml4
-rw-r--r--Host/app/src/main/java/com/android/car/templates/host/di/HostResourceIdsImpl.java2
9 files changed, 17 insertions, 15 deletions
diff --git a/Host/app/build.gradle b/Host/app/build.gradle
index 837f387..139ef01 100644
--- a/Host/app/build.gradle
+++ b/Host/app/build.gradle
@@ -58,4 +58,6 @@ dependencies {
implementation "com.google.dagger:hilt-android:2.40.5"
kapt 'com.google.dagger:hilt-compiler:2.40.5'
+ runtimeOnly 'androidx.asynclayoutinflater:asynclayoutinflater:1.0.0'
+
}
diff --git a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/maps/res/layout-w1280dp-h1000dp/map_template_layout.xml b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/maps/res/layout-w1280dp-h1000dp/map_template_layout.xml
index 3800de5..6db01ee 100644
--- a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/maps/res/layout-w1280dp-h1000dp/map_template_layout.xml
+++ b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/maps/res/layout-w1280dp-h1000dp/map_template_layout.xml
@@ -28,7 +28,7 @@
TODO(b/159348229): update this once MapView has an explicit API to do this.
-->
- <android.support.constraint.ConstraintLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -54,5 +54,5 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
layout="@layout/action_strip_view_floating"/>
- </android.support.constraint.ConstraintLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
diff --git a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/maps/res/layout/map_template_layout.xml b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/maps/res/layout/map_template_layout.xml
index 8bb5fff..17d0fe3 100644
--- a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/maps/res/layout/map_template_layout.xml
+++ b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/maps/res/layout/map_template_layout.xml
@@ -28,7 +28,7 @@
TODO(b/159348229): update this once MapView has an explicit API to do this.
-->
- <android.support.constraint.ConstraintLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -43,5 +43,5 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
layout="@layout/action_strip_view_floating"/>
- </android.support.constraint.ConstraintLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
diff --git a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout-w1280dp-h1000dp/list_navigation_template_layout.xml b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout-w1280dp-h1000dp/list_navigation_template_layout.xml
index bdfce7f..6b399a8 100644
--- a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout-w1280dp-h1000dp/list_navigation_template_layout.xml
+++ b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout-w1280dp-h1000dp/list_navigation_template_layout.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@@ -58,4 +58,4 @@
<include
android:id="@+id/map_action_strip"
layout="@layout/map_action_strip_view_floating"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout-w1280dp-h1000dp/navigation_template_layout.xml b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout-w1280dp-h1000dp/navigation_template_layout.xml
index de60d02..6cc5d7f 100644
--- a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout-w1280dp-h1000dp/navigation_template_layout.xml
+++ b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout-w1280dp-h1000dp/navigation_template_layout.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@@ -68,4 +68,4 @@
<include
android:id="@+id/map_action_strip"
layout="@layout/map_action_strip_view_floating"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout/list_navigation_template_layout.xml b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout/list_navigation_template_layout.xml
index f363ece..c450b75 100644
--- a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout/list_navigation_template_layout.xml
+++ b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout/list_navigation_template_layout.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -47,4 +47,4 @@
<include
android:id="@+id/map_action_strip"
layout="@layout/map_action_strip_view_floating"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout/navigation_template_layout.xml b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout/navigation_template_layout.xml
index 2363b8e..afcdb5a 100644
--- a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout/navigation_template_layout.xml
+++ b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/presenters/navigation/res/layout/navigation_template_layout.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@@ -56,4 +56,4 @@
<include
android:id="@+id/map_action_strip"
layout="@layout/map_action_strip_view_floating"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/widgets/common/res/layout/header_view.xml b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/widgets/common/res/layout/header_view.xml
index 9b99a99..ca44180 100644
--- a/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/widgets/common/res/layout/header_view.xml
+++ b/Host/app/renderer/src/main/java/com/android/car/libraries/templates/host/view/widgets/common/res/layout/header_view.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@@ -95,4 +95,4 @@
android:maxHeight="?templateHeaderButtonContainerSize"
tools:ignore="ContentDescription"/>
</FrameLayout>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Host/app/src/main/java/com/android/car/templates/host/di/HostResourceIdsImpl.java b/Host/app/src/main/java/com/android/car/templates/host/di/HostResourceIdsImpl.java
index 084955d..03accb9 100644
--- a/Host/app/src/main/java/com/android/car/templates/host/di/HostResourceIdsImpl.java
+++ b/Host/app/src/main/java/com/android/car/templates/host/di/HostResourceIdsImpl.java
@@ -123,7 +123,7 @@ public class HostResourceIdsImpl implements HostResourceIds {
@Override
public int getDistanceInMetersStringFormat() {
- return 0;
+ return R.string.meter_text;
}
@Override