TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 21:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make it possible to set a zero value for screen lock timeout

Browse Source 
Fixes #7485
This commit is contained in:
Moxie Marlinspike
2018-03-09 15:27:20 -08:00
parent 11ce4ee807
commit c8dd62cecf
4 changed files with 22 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/attrs.xml
View File

@@ -111,8 +111,6 @@
<attr name="pref_divider" format="reference" />
<attr name="app_protect_timeout_picker_color" format="reference"/>
<declare-styleable name="CustomDefaultPreference">
<attr name="custom_pref_toggle" format="string"/>
</declare-styleable>

4
res/values/themes.xml
View File

@@ -229,8 +229,6 @@
<item name="pref_divider">@drawable/preference_divider_light</item>
<item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment.Light</item>
<item name="group_members_dialog_icon">@drawable/ic_group_grey600_24dp</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
@@ -354,8 +352,6 @@
<item name="pref_divider">@drawable/preference_divider_dark</item>
<item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment</item>
<item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
<item name="search_toolbar_background">@color/black</item>