From f8ed3520f57cd6d419488c18258aba46bc166a42 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 23 Sep 2022 11:45:34 +0200
Subject: [PATCH] Applayout: disable applayout by default

---
 CHANGES.md                                                    | 4 +---
 .../java/im/vector/app/VerifySessionInteractiveTest.kt        | 4 ++--
 .../androidTest/java/im/vector/app/ui/robot/ElementRobot.kt   | 2 +-
 vector-config/src/main/res/values/config-settings.xml         | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f0ecb5fc04b..65e1616e2d8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-Changes in Element v1.5.0 (2022-09-21)
+Changes in Element v1.5.0 (2022-09-23)
 ======================================
 
 Features ✨
@@ -33,8 +33,6 @@ Other changes
  - Exclude legacy android support annotation library ([#7140](https://github.com/vector-im/element-android/issues/7140))
  - Pulling no longer hosted im.dlg:android-dialer directly into the repository and removing legacy support library usages ([#7142](https://github.com/vector-im/element-android/issues/7142))
  - Fixing build cache misses when compiling the vector module ([#7157](https://github.com/vector-im/element-android/issues/7157))
- - New App Layout is now enabled by default! Go to the Settings > Labs to toggle this ([#7166](https://github.com/vector-im/element-android/issues/7166))
-
 
 Changes in Element v1.4.36 (2022-09-10)
 =======================================
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 901ef8e4c17..da13e49e84e 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.roomListContainer))
-                    .check(matches(isDisplayed()))
+            onView(withId(R.id.groupToolbarAvatarImageView))
+                    .perform(click())
         }
     }
 
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 d9dfb0facf6..86709a75a57 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(true)
+        private val labsPreferences: LabFeaturesPreferences = LabFeaturesPreferences(false)
 ) {
     fun onboarding(block: OnboardingRobot.() -> Unit) {
         block(OnboardingRobot())
diff --git a/vector-config/src/main/res/values/config-settings.xml b/vector-config/src/main/res/values/config-settings.xml
index c69452e3d01..d7017375d5f 100755
--- a/vector-config/src/main/res/values/config-settings.xml
+++ b/vector-config/src/main/res/values/config-settings.xml
@@ -40,7 +40,7 @@
     <bool name="settings_labs_deferred_dm_visible">true</bool>
     <bool name="settings_labs_deferred_dm_default">true</bool>
     <bool name="settings_labs_thread_messages_default">false</bool>
-    <bool name="settings_labs_new_app_layout_default">true</bool>
+    <bool name="settings_labs_new_app_layout_default">false</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 -->