6 files changed, 13 insertions, 11 deletions
diff --git a/core/res/res/layout/notification_2025_reply_container.xml b/core/res/res/layout/notification_2025_reply_history_container.xml
index 6923b59f34dc..6923b59f34dc 100644
--- a/core/res/res/layout/notification_2025_reply_container.xml
+++ b/core/res/res/layout/notification_2025_reply_history_container.xml
diff --git a/core/res/res/layout/notification_2025_template_expanded_base.xml b/core/res/res/layout/notification_2025_template_expanded_base.xml
index d364c659d0db..e12db2783191 100644
--- a/core/res/res/layout/notification_2025_template_expanded_base.xml
+++ b/core/res/res/layout/notification_2025_template_expanded_base.xml
@@ -67,7 +67,7 @@
         </FrameLayout>
 
         <ViewStub
-            android:layout="@layout/notification_2025_reply_container"
+            android:layout="@layout/notification_2025_reply_history_container"
             android:id="@+id/notification_material_reply_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/core/res/res/layout/notification_2025_template_expanded_big_picture.xml b/core/res/res/layout/notification_2025_template_expanded_big_picture.xml
index 12e11728f608..fac9d1c47f41 100644
--- a/core/res/res/layout/notification_2025_template_expanded_big_picture.xml
+++ b/core/res/res/layout/notification_2025_template_expanded_big_picture.xml
@@ -74,8 +74,8 @@
             />
 
         <ViewStub
-            android:layout="@layout/notification_material_reply_text"
-            android:id="@+id/notification_2025_reply_container"
+            android:layout="@layout/notification_2025_reply_history_container"
+            android:id="@+id/notification_material_reply_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
diff --git a/core/res/res/layout/notification_2025_template_expanded_big_text.xml b/core/res/res/layout/notification_2025_template_expanded_big_text.xml
index c9dd868795de..4a807cb674c6 100644
--- a/core/res/res/layout/notification_2025_template_expanded_big_text.xml
+++ b/core/res/res/layout/notification_2025_template_expanded_big_text.xml
@@ -73,8 +73,8 @@
         </com.android.internal.widget.RemeasuringLinearLayout>
 
         <ViewStub
-            android:layout="@layout/notification_material_reply_text"
-            android:id="@+id/notification_2025_reply_container"
+            android:layout="@layout/notification_2025_reply_history_container"
+            android:id="@+id/notification_material_reply_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
diff --git a/core/res/res/layout/notification_2025_template_expanded_inbox.xml b/core/res/res/layout/notification_2025_template_expanded_inbox.xml
index 8434b3644f81..ccab02e312cc 100644
--- a/core/res/res/layout/notification_2025_template_expanded_inbox.xml
+++ b/core/res/res/layout/notification_2025_template_expanded_inbox.xml
@@ -116,10 +116,12 @@
                 android:layout_weight="1"
                 />
         </LinearLayout>
-        <ViewStub android:layout="@layout/notification_material_reply_text"
-                android:id="@+id/notification_2025_reply_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+        <ViewStub
+            android:layout="@layout/notification_2025_reply_history_container"
+            android:id="@+id/notification_material_reply_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            />
         <include layout="@layout/notification_template_smart_reply_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/core/res/res/layout/notification_2025_template_expanded_progress.xml b/core/res/res/layout/notification_2025_template_expanded_progress.xml
index 5d4fc4c87fac..87ded8975cb0 100644
--- a/core/res/res/layout/notification_2025_template_expanded_progress.xml
+++ b/core/res/res/layout/notification_2025_template_expanded_progress.xml
@@ -103,8 +103,8 @@
         </FrameLayout>
 
         <ViewStub
-            android:layout="@layout/notification_material_reply_text"
-            android:id="@+id/notification_2025_reply_container"
+            android:layout="@layout/notification_2025_reply_history_container"
+            android:id="@+id/notification_material_reply_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />