From 519885da4342f5aee74dd5b06ee3ed657d3aca73 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Wed, 18 Nov 2020 15:52:16 +0200
Subject: [PATCH] For #15788: Remove nested constraint layout in tabs tray.

---
 .../main/res/layout/component_tabstray.xml    | 183 +++++++++---------
 .../res/layout/tabstray_multiselect_items.xml |  14 +-
 2 files changed, 98 insertions(+), 99 deletions(-)

diff --git a/app/src/main/res/layout/component_tabstray.xml b/app/src/main/res/layout/component_tabstray.xml
index 20aff53f05..be2e438deb 100644
--- a/app/src/main/res/layout/component_tabstray.xml
+++ b/app/src/main/res/layout/component_tabstray.xml
@@ -47,105 +47,104 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/infoBanner" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <View
         android:id="@+id/topBar"
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:background="@color/foundation_normal_theme"
         android:importantForAccessibility="no"
-        app:layout_constraintTop_toBottomOf="@+id/handle">
-
-        <ImageButton
-            android:id="@+id/exit_multi_select"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginStart="0dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/tab_tray_close_multiselect_content_description"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/multiselect_title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/multiselect_title"
-            app:srcCompat="@drawable/ic_close"
-            app:tint="@color/contrast_text_normal_theme" />
-
-        <TextView
-            android:id="@+id/multiselect_title"
+        app:layout_constraintTop_toBottomOf="@+id/handle" />
+
+    <ImageButton
+        android:id="@+id/exit_multi_select"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginStart="0dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/tab_tray_close_multiselect_content_description"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/multiselect_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/multiselect_title"
+        app:srcCompat="@drawable/ic_close"
+        app:tint="@color/contrast_text_normal_theme" />
+
+    <TextView
+        android:id="@+id/multiselect_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:focusableInTouchMode="true"
+        android:textColor="@color/contrast_text_normal_theme"
+        android:textSize="20sp"
+        app:fontFamily="@font/metropolis_semibold"
+        app:layout_constraintBottom_toBottomOf="@id/topBar"
+        app:layout_constraintEnd_toStartOf="@id/collect_multi_select"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@+id/exit_multi_select"
+        app:layout_constraintTop_toTopOf="@id/topBar"
+        tools:text="3 selected" />
+
+    <include layout="@layout/tabstray_multiselect_items" />
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tab_layout"
+        android:layout_width="0dp"
+        android:layout_height="80dp"
+        android:background="@color/foundation_normal_theme"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/handle"
+        app:layout_constraintWidth_percent="0.5"
+        app:tabGravity="fill"
+        app:tabIconTint="@color/tab_icon"
+        app:tabIndicatorColor="@color/accent_normal_theme"
+        app:tabMaxWidth="0dp"
+        app:tabRippleColor="@android:color/transparent">
+
+        <com.google.android.material.tabs.TabItem
+            android:id="@+id/default_tab_item"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:textColor="@color/contrast_text_normal_theme"
-            android:textSize="20sp"
-            app:fontFamily="@font/metropolis_semibold"
-            android:focusableInTouchMode="true"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/collect_multi_select"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toEndOf="@+id/exit_multi_select"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="3 selected" />
-
-        <include layout="@layout/tabstray_multiselect_items" />
-
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/tab_layout"
+            android:layout_height="match_parent"
+            android:contentDescription="@string/tab_header_label"
+            android:layout="@layout/tabs_tray_tab_counter"
+            app:tabIconTint="@color/tab_icon" />
+
+        <com.google.android.material.tabs.TabItem
+            android:id="@+id/private_tab_item"
             android:layout_width="0dp"
-            android:layout_height="80dp"
-            android:background="@color/foundation_normal_theme"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth_percent="0.5"
-            app:tabGravity="fill"
-            app:tabIconTint="@color/tab_icon"
-            app:tabIndicatorColor="@color/accent_normal_theme"
-            app:tabMaxWidth="0dp"
-            app:tabRippleColor="@android:color/transparent">
-
-            <com.google.android.material.tabs.TabItem
-                android:id="@+id/default_tab_item"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/tab_header_label"
-                android:layout="@layout/tabs_tray_tab_counter"
-                app:tabIconTint="@color/tab_icon" />
-
-            <com.google.android.material.tabs.TabItem
-                android:id="@+id/private_tab_item"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/tabs_header_private_tabs_title"
-                android:icon="@drawable/ic_private_browsing" />
-
-        </com.google.android.material.tabs.TabLayout>
-
-        <ImageButton
-            android:id="@+id/tab_tray_new_tab"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/add_tab"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/tab_layout"
-            app:layout_constraintEnd_toStartOf="@id/tab_tray_overflow"
-            app:layout_constraintTop_toTopOf="@id/tab_layout"
-            app:srcCompat="@drawable/ic_new"
-            app:tint="@color/primary_text_normal_theme" />
-
-        <ImageButton
-            android:id="@+id/tab_tray_overflow"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginEnd="0dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/open_tabs_menu"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="@id/tab_layout"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/tab_layout"
-            app:srcCompat="@drawable/ic_menu"
-            app:tint="@color/tab_tray_heading_icon_menu_normal_theme" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:layout_height="match_parent"
+            android:contentDescription="@string/tabs_header_private_tabs_title"
+            android:icon="@drawable/ic_private_browsing" />
+
+    </com.google.android.material.tabs.TabLayout>
+
+    <ImageButton
+        android:id="@+id/tab_tray_new_tab"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/add_tab"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/tab_layout"
+        app:layout_constraintEnd_toStartOf="@id/tab_tray_overflow"
+        app:layout_constraintTop_toTopOf="@id/tab_layout"
+        app:srcCompat="@drawable/ic_new"
+        app:tint="@color/primary_text_normal_theme" />
+
+    <ImageButton
+        android:id="@+id/tab_tray_overflow"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginEnd="0dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/open_tabs_menu"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="@id/tab_layout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/tab_layout"
+        app:srcCompat="@drawable/ic_menu"
+        app:tint="@color/tab_tray_heading_icon_menu_normal_theme" />
 
     <View
         android:id="@+id/divider"
diff --git a/app/src/main/res/layout/tabstray_multiselect_items.xml b/app/src/main/res/layout/tabstray_multiselect_items.xml
index d76d998159..795753f94e 100644
--- a/app/src/main/res/layout/tabstray_multiselect_items.xml
+++ b/app/src/main/res/layout/tabstray_multiselect_items.xml
@@ -16,9 +16,9 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/tab_tray_collection_button_multiselect_content_description"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/topBar"
         app:layout_constraintEnd_toStartOf="@id/share_multi_select"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@id/topBar"
         app:srcCompat="@drawable/ic_tab_collection"
         app:tint="@color/contrast_text_normal_theme" />
 
@@ -29,9 +29,9 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/tab_tray_multiselect_share_content_description"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/topBar"
         app:layout_constraintEnd_toStartOf="@id/menu_multi_select"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@id/topBar"
         app:srcCompat="@drawable/ic_share_filled"
         app:tint="@color/contrast_text_normal_theme" />
 
@@ -42,9 +42,9 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/tab_tray_multiselect_menu_content_description"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/topBar"
+        app:layout_constraintEnd_toEndOf="@id/topBar"
+        app:layout_constraintTop_toTopOf="@id/topBar"
         app:srcCompat="@drawable/ic_menu"
         app:tint="@color/contrast_text_normal_theme" />
 </merge>