Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6663cc33 authored by Michael Bestas's avatar Michael Bestas
Browse files

Forward port CM Screen Security settings (2/2)

* Lockscreen Vibrate
* Slide Lock Delay
* Menu Unlock
* Home Unlock
* Variable size pattern lockscreen
* Toggle dots/error pattern visibility

Forward port from cm-10.2, adjusted for 4.4

Change-Id: I0dda524830d8dce571910eb1fbd66d5b5af11bff
parent c5a1bdcc
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,8 @@
            android:excludeFromRecents="true"
        />

        <activity android:name="ChooseLockPatternSize" android:exported="false"/>

        <activity android:name="ChooseLockPattern" android:exported="false"/>

        <activity android:name="ChooseLockPassword" android:exported="false"
+26 −0
Original line number Diff line number Diff line
@@ -79,6 +79,32 @@
        <item>mute</item>
    </string-array>

    <string-array name="lockscreen_delay_entries" translatable="false">
        <item>@string/slide_lock_delay_none</item>
        <item>@string/slide_lock_delay_1s</item>
        <item>@string/slide_lock_delay_5s</item>
        <item>@string/slide_lock_delay_10s</item>
        <item>@string/slide_lock_delay_15s</item>
        <item>@string/slide_lock_delay_30s</item>
        <item>@string/slide_lock_delay_1m</item>
        <item>@string/slide_lock_delay_5m</item>
        <item>@string/slide_lock_delay_10m</item>
        <item>@string/slide_lock_delay_30m</item>
    </string-array>

    <string-array name="lockscreen_delay_values" translatable="false">
        <item>0</item>
        <item>1000</item>
        <item>5000</item>
        <item>10000</item>
        <item>15000</item>
        <item>30000</item>
        <item>60000</item>
        <item>300000</item>
        <item>600000</item>
        <item>1800000</item>
    </string-array>

    <string-array name="lockscreen_icon_picker_labels" translatable="false">
        <item>@string/icon_picker_alarm</item>
        <item>@string/icon_picker_browser</item>
+43 −0
Original line number Diff line number Diff line
@@ -229,6 +229,49 @@
    <!-- Sound settings screen -->
    <string name="volume_ring_only_description">Ringtone</string>

    <!-- Sizes for pattern lockscreen -->
    <string name="lock_pattern_size_3">3x3</string>
    <string name="lock_pattern_size_4">4x4</string>
    <string name="lock_pattern_size_5">5x5</string>
    <string name="lock_pattern_size_6">6x6</string>

    <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
    <string name="lockpattern_settings_enable_error_path_title">Show pattern error</string>
    <!-- Whether the dots will be drawn when using the lockscreen pattern -->
    <string name="lockpattern_settings_enable_dots_title">Show pattern dots</string>

    <!-- Lock screen vibrate settings -->
    <string name="lockscreen_vibrate_enabled_title">Vibrate</string>
    <string name="lockscreen_vibrate_enabled_head">Vibrate when unlocking</string>

    <!-- Screen security -->
    <string name="screen_security_category">Screen security</string>
    <string name="screen_security_title">Lock screen</string>
    <string name="screen_security_summary">View or change lock screen security, delay and timeout settings</string>
    <string name="additional_options_title">Additional options</string>
    <string name="unlock_menu_unlock_title">Menu unlock</string>
    <string name="unlock_menu_unlock_summary">Pressing the menu button unlocks the device</string>
    <string name="unlock_home_unlock_title">Home unlock</string>
    <string name="unlock_home_unlock_summary">Pressing the home button unlocks the device</string>
    <string name="unlock_quick_unlock_control_title">Quick unlock</string>
    <string name="unlock_quick_unlock_control_summary">Unlock automatically when the correct PIN/password is entered</string>

    <!-- Slide lock delay -->
    <string name="delay_and_timeout_title">Lock delay</string>
    <string name="slide_lock_delay_title">Delay screen lock</string>
    <string name="slide_lock_timeout_delay_title">Delay after timeout</string>
    <string name="slide_lock_screenoff_delay_title">Delay after turned off</string>
    <string name="slide_lock_delay_none">None</string>
    <string name="slide_lock_delay_1s">1 second</string>
    <string name="slide_lock_delay_5s">5 seconds</string>
    <string name="slide_lock_delay_10s">10 seconds</string>
    <string name="slide_lock_delay_15s">15 seconds</string>
    <string name="slide_lock_delay_30s">30 seconds</string>
    <string name="slide_lock_delay_1m">1 minute</string>
    <string name="slide_lock_delay_5m">5 minutes</string>
    <string name="slide_lock_delay_10m">10 minutes</string>
    <string name="slide_lock_delay_30m">30 minutes</string>

    <!-- Lock screen widgets -->
    <string name="lockscreen_widgets_category_title">Widgets</string>
    <string name="lockscreen_maximize_widgets_title">Maximize widgets</string>
+21 −6
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 The CyanogenMod Project
<!--
     Copyright (C) 2012-2013 The CyanogenMod Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,12 +18,26 @@
    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
    android:title="@string/themes_settings_title" >

    <PreferenceCategory
        android:title="@string/title_general"
        android:key="lockscreen_general_category" >

        <PreferenceScreen
            android:key="screen_security"
            android:fragment="com.android.settings.SecuritySettings"
            android:title="@string/screen_security_category"
            android:summary="@string/screen_security_summary">
            <extra android:name="cm_security" android:value="true" />
        </PreferenceScreen>

        <Preference
            android:fragment="com.android.settings.cyanogenmod.LockscreenTargets"
            android:key="lockscreen_targets"
            android:summary="@string/lockscreen_target_summary"
            android:title="@string/lockscreen_target_title" />

    </PreferenceCategory>

    <PreferenceCategory
        android:title="@string/lockscreen_widgets_category_title"
        android:key="lockscreen_widgets_category" >
+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@
     limitations under the License.
-->

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
<PreferenceScreen
        xmlns:android="http://schemas.android.com/apk/res/android"
        android:title="@string/security_settings_title">

</PreferenceScreen>
Loading