jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into develop

This commit is contained in:
ganfra 2022-09-23 12:20:00 +02:00
parent 56189a2d5d 8d112a47d7
commit 92be6d1b49
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -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)
=======================================

4
vector-app/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
View File

@ -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())
}
}

2
vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
View File

@ -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())

2
vector-config/src/main/res/values/config-settings.xml
View File

@ -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 -->