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

Commit c971ae3f authored by Roman Birg's avatar Roman Birg
Browse files

Settings: show warning in lock screen settings when disabled by qs 



Tapping the setting will re-enable the lock screen.

Ref: CYNGNOS-1513

Change-Id: Ifbd53fb3d1cd199c85dedb0d96b01e8f29e7c024
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent 19aa1dc6

res/values/cm_strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -865,6 +865,11 @@ 
    <!-- lock screen visualizer -->

    <string name="lockscreen_visualizer_title">Display music visualizer</string>



    <!-- lock screen disabled by QS tile warning -->

    <string name="lockscreen_disabled_by_qs_tile_title">Disabled by quick settings tile</string>

    <string name="lockscreen_disabled_by_qs_tile_summary">Tap to enable the lock screen</string>

    <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Lock screen enabled!</string>



    <!-- Battery saver -->

    <string name="battery_saver_threshold">Battery saver threshold</string>

    <string name="battery_saver_summary">Reduce performance and limit background data</string>

src/com/android/settings/SecuritySettings.java

+23 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import com.android.settings.search.BaseSearchIndexProvider; 
import com.android.settings.search.Index;

import com.android.settings.search.Indexable;

import com.android.settings.search.SearchIndexableRaw;

import cyanogenmod.providers.CMSettings;



import java.util.ArrayList;

import java.util.List;
@@ -94,6 +95,8 @@ public class SecuritySettings extends SettingsPreferenceFragment 
    private static final String KEY_MANAGE_TRUST_AGENTS = "manage_trust_agents";

    private static final String KEY_FINGERPRINT_SETTINGS = "fingerprint_settings";



    private static final String KEY_LOCKSCREEN_ENABLED_INTERNAL = "lockscreen_enabled_internally";



    private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;

    private static final int CHANGE_TRUST_AGENT_SETTINGS = 126;
@@ -150,6 +153,8 @@ public class SecuritySettings extends SettingsPreferenceFragment 
    private Preference mOwnerInfoPref;

    private int mFilterType = TYPE_SECURITY_EXTRA;



    private Preference mLockscreenDisabledPreference;



    @Override

    protected int getMetricsCategory() {

        return MetricsLogger.SECURITY;
@@ -234,6 +239,16 @@ public class SecuritySettings extends SettingsPreferenceFragment 
        // Add options for device encryption

        mIsPrimary = MY_USER_ID == UserHandle.USER_OWNER;



        if (CMSettings.Secure.getIntForUser(getContentResolver(),

                CMSettings.Secure.LOCKSCREEN_INTERNALLY_ENABLED, 1, UserHandle.USER_OWNER) != 1) {

            // lock screen is disabled by quick settings tile, let the user know!~

            mLockscreenDisabledPreference = new Preference(getActivity());

            mLockscreenDisabledPreference.setKey(KEY_LOCKSCREEN_ENABLED_INTERNAL);

            mLockscreenDisabledPreference.setTitle(R.string.lockscreen_disabled_by_qs_tile_title);

            mLockscreenDisabledPreference.setSummary(R.string.lockscreen_disabled_by_qs_tile_summary);

            root.addPreference(mLockscreenDisabledPreference);

        }



        if (mFilterType == TYPE_LOCKSCREEN_EXTRA) {

            // Add options for lock/unlock screen

            final int resid = getResIdForLockUnlockScreen(getActivity(), mLockPatternUtils);
@@ -710,6 +725,13 @@ public class SecuritySettings extends SettingsPreferenceFragment 
                startActivity(mTrustAgentClickIntent);

                mTrustAgentClickIntent = null;

            }

        } else if (KEY_LOCKSCREEN_ENABLED_INTERNAL.equals(key)) {

            CMSettings.Secure.putIntForUser(getActivity().getContentResolver(),

                    CMSettings.Secure.LOCKSCREEN_INTERNALLY_ENABLED,

                    1, UserHandle.USER_CURRENT);

            mLockscreenDisabledPreference.setEnabled(false);

            mLockscreenDisabledPreference.setSummary(

                    R.string.lockscreen_disabled_by_qs_tile_summary_enabled);

        } else {

            // If we didn't handle it, let preferences handle it.

            return super.onPreferenceTreeClick(preferenceScreen, preference);