From b8b2601e0b2534c2c0e9b3e3de0bae06281e652e Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Sat, 17 Sep 2022 13:12:45 -0400
Subject: [PATCH 1/4] Enables app layout by default in labs

---
 vector-config/src/main/res/values/config-settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector-config/src/main/res/values/config-settings.xml b/vector-config/src/main/res/values/config-settings.xml
index 1701fd45b0..8953138e5e 100755
--- a/vector-config/src/main/res/values/config-settings.xml
+++ b/vector-config/src/main/res/values/config-settings.xml
@@ -38,7 +38,7 @@
 
     <!-- Level 1: Labs -->
     <bool name="settings_labs_thread_messages_default">false</bool>
-    <bool name="settings_labs_new_app_layout_default">false</bool>
+    <bool name="settings_labs_new_app_layout_default">true</bool>
     <bool name="settings_timeline_show_live_sender_info_visible">true</bool>
     <bool name="settings_timeline_show_live_sender_info_default">false</bool>
     <!-- Level 1: Advanced settings -->

From 57c9161e00f19569cd94267fdd1339b01c8f8f20 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Sat, 17 Sep 2022 13:17:39 -0400
Subject: [PATCH 2/4] Adds changelog file

---
 changelog.d/7166.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/7166.misc

diff --git a/changelog.d/7166.misc b/changelog.d/7166.misc
new file mode 100644
index 0000000000..d223208853
--- /dev/null
+++ b/changelog.d/7166.misc
@@ -0,0 +1 @@
+New App Layout is now enabled by default! Go to the Settings > Labs to toggle this

From 298aaece01acab6c44afedf4988839abfcbcb170 Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Sun, 18 Sep 2022 18:02:45 +0200
Subject: [PATCH 3/4] fixed checkVerifyPopup test fail

---
 .../java/im/vector/app/VerifySessionInteractiveTest.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector-app/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt b/vector-app/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
index da13e49e84..901ef8e4c1 100644
--- a/vector-app/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
@@ -225,8 +225,8 @@ class VerifySessionInteractiveTest : VerificationTestBase() {
 
         // Wait until local secrets are known (gossip)
         withIdlingResource(allSecretsKnownIdling(uiSession)) {
-            onView(withId(R.id.groupToolbarAvatarImageView))
-                    .perform(click())
+            onView(withId(R.id.roomListContainer))
+                    .check(matches(isDisplayed()))
         }
     }
 

From 237da2ce2273019c4310213aab03d3deb478272b Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Mon, 19 Sep 2022 11:08:25 +0200
Subject: [PATCH 4/4] changed app layout flag for all_test

---
 .../src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
index b70fcfec25..9fb7fceebf 100644
--- a/vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
@@ -50,7 +50,7 @@ import im.vector.app.withIdlingResource
 import timber.log.Timber
 
 class ElementRobot(
-        private val labsPreferences: LabFeaturesPreferences = LabFeaturesPreferences(false)
+        private val labsPreferences: LabFeaturesPreferences = LabFeaturesPreferences(true)
 ) {
     fun onboarding(block: OnboardingRobot.() -> Unit) {
         block(OnboardingRobot())