mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-24 18:36:21 +03:00
[merge] Re-enable new Element app layout
Change-Id: Ic777c319916e7474735f8afca86d8044b64e3910
This commit is contained in:
parent
b7faa69834
commit
49a9d17521
2 changed files with 0 additions and 4 deletions
|
@ -1416,8 +1416,6 @@ class VectorPreferences @Inject constructor(
|
|||
* Indicates whether or not new app layout is enabled.
|
||||
*/
|
||||
fun isNewAppLayoutEnabled(): Boolean {
|
||||
// SC: disabled for now (only crashes either way)
|
||||
if (true) return false
|
||||
return vectorFeatures.isNewAppLayoutFeatureEnabled() &&
|
||||
defaultPrefs.getBoolean(SETTINGS_LABS_NEW_APP_LAYOUT_KEY, getDefault(R.bool.settings_labs_new_app_layout_default))
|
||||
}
|
||||
|
|
|
@ -154,13 +154,11 @@
|
|||
android:summary="@string/labs_enable_element_call_permission_shortcuts_summary"
|
||||
android:title="@string/labs_enable_element_call_permission_shortcuts" />
|
||||
|
||||
<!--
|
||||
<im.vector.app.core.preference.VectorSwitchPreference
|
||||
android:defaultValue="@bool/settings_labs_new_app_layout_default"
|
||||
android:key="SETTINGS_LABS_NEW_APP_LAYOUT_KEY"
|
||||
android:summary="@string/labs_enable_new_app_layout_summary"
|
||||
android:title="@string/labs_enable_new_app_layout_title" />
|
||||
-->
|
||||
|
||||
</im.vector.app.core.preference.VectorPreferenceCategory>
|
||||
</androidx.preference.PreferenceScreen>
|
||||
|
|
Loading…
Reference in a new issue