[DO NOT MERGE] Prefix view ids names to resolve layout overlay issues
Bug: 149120493
Bug: 154244647
Test: Manual
Change-Id: I810ff51b19d49c4598501741573526a0cc83c204
diff --git a/car-ui-lib/res/layout/car_ui_alert_dialog_title_with_subtitle.xml b/car-ui-lib/res/layout/car_ui_alert_dialog_title_with_subtitle.xml
index 271280d..3412610 100644
--- a/car-ui-lib/res/layout/car_ui_alert_dialog_title_with_subtitle.xml
+++ b/car-ui-lib/res/layout/car_ui_alert_dialog_title_with_subtitle.xml
@@ -23,7 +23,7 @@
style="@style/Widget.CarUi.AlertDialog.HeaderContainer">
<ImageView
- android:id="@+id/icon"
+ android:id="@+id/car_ui_alert_icon"
android:layout_width="@dimen/car_ui_dialog_icon_size"
android:layout_height="@dimen/car_ui_dialog_icon_size"
style="@style/Widget.CarUi.AlertDialog.Icon"/>
@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
style="@style/Widget.CarUi.AlertDialog.TitleContainer">
<TextView
- android:id="@+id/alertTitle"
+ android:id="@+id/car_ui_alert_title"
android:singleLine="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/alertSubtitle"
+ android:id="@+id/car_ui_alert_subtitle"
android:textAppearance="@style/TextAppearance.CarUi.AlertDialog.Subtitle"/>
</LinearLayout>
diff --git a/car-ui-lib/src/com/android/car/ui/AlertDialogBuilder.java b/car-ui-lib/src/com/android/car/ui/AlertDialogBuilder.java
index 8622af3..2bb0398 100644
--- a/car-ui-lib/src/com/android/car/ui/AlertDialogBuilder.java
+++ b/car-ui-lib/src/com/android/car/ui/AlertDialogBuilder.java
@@ -629,9 +629,12 @@
View customTitle = LayoutInflater.from(mContext).inflate(
R.layout.car_ui_alert_dialog_title_with_subtitle, null);
- TextView mTitleView = CarUiUtils.requireViewByRefId(customTitle, R.id.alertTitle);
- TextView mSubtitleView = CarUiUtils.requireViewByRefId(customTitle, R.id.alertSubtitle);
- ImageView mIconView = CarUiUtils.requireViewByRefId(customTitle, R.id.icon);
+ TextView mTitleView =
+ CarUiUtils.requireViewByRefId(customTitle, R.id.car_ui_alert_title);
+ TextView mSubtitleView =
+ CarUiUtils.requireViewByRefId(customTitle, R.id.car_ui_alert_subtitle);
+ ImageView mIconView =
+ CarUiUtils.requireViewByRefId(customTitle, R.id.car_ui_alert_icon);
mTitleView.setText(mTitle);
mSubtitleView.setText(mSubtitle);
