filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[merge] Re-enable new Element app layout 

Change-Id: Ic777c319916e7474735f8afca86d8044b64e3910
This commit is contained in:
SpiritCroc 2022-09-14 10:09:29 +02:00
parent b7faa69834
commit 49a9d17521
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
View File

@ -1416,8 +1416,6 @@ class VectorPreferences @Inject constructor(
* Indicates whether or not new app layout is enabled. * Indicates whether or not new app layout is enabled.
*/ */
fun isNewAppLayoutEnabled(): Boolean { fun isNewAppLayoutEnabled(): Boolean {
// SC: disabled for now (only crashes either way)
if (true) return false
return vectorFeatures.isNewAppLayoutFeatureEnabled() && return vectorFeatures.isNewAppLayoutFeatureEnabled() &&
defaultPrefs.getBoolean(SETTINGS_LABS_NEW_APP_LAYOUT_KEY, getDefault(R.bool.settings_labs_new_app_layout_default)) defaultPrefs.getBoolean(SETTINGS_LABS_NEW_APP_LAYOUT_KEY, getDefault(R.bool.settings_labs_new_app_layout_default))
} }

2
vector/src/main/res/xml/vector_settings_labs.xml
View File

@ -154,13 +154,11 @@
android:summary="@string/labs_enable_element_call_permission_shortcuts_summary" android:summary="@string/labs_enable_element_call_permission_shortcuts_summary"
android:title="@string/labs_enable_element_call_permission_shortcuts" /> android:title="@string/labs_enable_element_call_permission_shortcuts" />
<!--
<im.vector.app.core.preference.VectorSwitchPreference <im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="@bool/settings_labs_new_app_layout_default" android:defaultValue="@bool/settings_labs_new_app_layout_default"
android:key="SETTINGS_LABS_NEW_APP_LAYOUT_KEY" android:key="SETTINGS_LABS_NEW_APP_LAYOUT_KEY"
android:summary="@string/labs_enable_new_app_layout_summary" android:summary="@string/labs_enable_new_app_layout_summary"
android:title="@string/labs_enable_new_app_layout_title" /> android:title="@string/labs_enable_new_app_layout_title" />
-->
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>