From a2e9c533136679d3e703444b65762394cf3b2d66 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 18 Feb 2019 14:10:18 +0100 Subject: [PATCH] Change default lock timeout to 1 minute Signed-off-by: Mario Danic --- .../com/nextcloud/talk/utils/preferences/AppPreferences.java | 2 +- app/src/main/res/layout/controller_settings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java index d14322e28..b141ba523 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java +++ b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java @@ -247,7 +247,7 @@ public interface AppPreferences { void removeLinkPreviews(); @KeyByString("screen_lock_timeout") - @DefaultValue(R.string.nc_screen_lock_timeout_thirty) + @DefaultValue(R.string.nc_screen_lock_timeout_sixty) String getScreenLockTimeout(); @KeyByString("screen_lock_timeout") diff --git a/app/src/main/res/layout/controller_settings.xml b/app/src/main/res/layout/controller_settings.xml index f8321d02b..ea75eb8e4 100644 --- a/app/src/main/res/layout/controller_settings.xml +++ b/app/src/main/res/layout/controller_settings.xml @@ -161,7 +161,7 @@ android:id="@+id/settings_screen_lock_timeout" android:layout_width="match_parent" android:layout_height="wrap_content" - apc:mp_default_value="@string/nc_screen_lock_timeout_thirty" + apc:mp_default_value="@string/nc_screen_lock_timeout_sixty" apc:mp_entry_values="@array/screen_lock_timeout_entry_values" apc:mp_entry_descriptions="@array/screen_lock_timeout_descriptions" apc:mp_key="@string/nc_settings_screen_lock_timeout_key"