From dbd11c2e8d94d638e6a6d5407b32e6bd877d0c6d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 3 Sep 2021 16:20:46 +0200
Subject: [PATCH] Remove the useless merge tag

It was causing crash with `Missing required view with ID: im.vector.app.debug:id/waiting_view`, probably due to a recent change in AGP 7.X.X
---
 .../res/layout/merge_overlay_waiting_view.xml | 106 +++++++++---------
 1 file changed, 50 insertions(+), 56 deletions(-)

diff --git a/vector/src/main/res/layout/merge_overlay_waiting_view.xml b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
index 3e5fe1b85d..f41139502c 100644
--- a/vector/src/main/res/layout/merge_overlay_waiting_view.xml
+++ b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
@@ -1,72 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
+    android:id="@+id/waiting_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?vctr_waiting_background_color"
+    android:clickable="true"
+    android:focusable="true"
+    android:visibility="gone"
+    tools:visibility="visible">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/waiting_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?vctr_waiting_background_color"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="gone"
-        tools:visibility="visible">
+    <LinearLayout
+        android:id="@+id/waiting_view_content"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/layout_horizontal_margin"
+        android:background="?attr/colorBackgroundFloating"
+        android:orientation="vertical"
+        android:padding="@dimen/layout_horizontal_margin"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintWidth_percent="@dimen/dialog_width_ratio">
 
         <LinearLayout
-            android:id="@+id/waiting_view_content"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/layout_horizontal_margin"
-            android:background="?attr/colorBackgroundFloating"
-            android:orientation="vertical"
-            android:padding="@dimen/layout_horizontal_margin"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth_percent="@dimen/dialog_width_ratio">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <ProgressBar
-                    android:id="@+id/waitingCircularProgress"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginEnd="6dp" />
-
-                <TextView
-                    android:id="@+id/waitingStatusText"
-                    style="@style/Widget.Vector.TextView.Body"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="?vctr_content_secondary"
-                    android:visibility="gone"
-                    tools:text="Waiting status..."
-                    tools:visibility="visible" />
-
-            </LinearLayout>
+            android:orientation="horizontal">
 
             <ProgressBar
-                android:id="@+id/waitingHorizontalProgress"
-                style="@style/Widget.Vector.ProgressBar.Horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="20dp"
-                android:layout_marginTop="10dp"
+                android:id="@+id/waitingCircularProgress"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="6dp" />
+
+            <TextView
+                android:id="@+id/waitingStatusText"
+                style="@style/Widget.Vector.TextView.Body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
-                tools:max="100"
-                tools:progress="30"
+                tools:text="Waiting status..."
                 tools:visibility="visible" />
 
         </LinearLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <ProgressBar
+            android:id="@+id/waitingHorizontalProgress"
+            style="@style/Widget.Vector.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:layout_marginTop="10dp"
+            android:visibility="gone"
+            tools:max="100"
+            tools:progress="30"
+            tools:visibility="visible" />
 
-</merge>
\ No newline at end of file
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>