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

Commit f85657f3 authored by Bruno Martins's avatar Bruno Martins Committed by Michael Bestas
Browse files

Settings: Add proximity check on wake preference 

Splitted from commit 5aa2f34b, adapted to the Lineage SDK
and squashed with commit c6dc6887.

Change-Id: I7516c833ff39de6bdb36c815a5292606cbaa0533
parent 559b102c

res/values/cm_strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -29,4 +29,8 @@ 


    <!-- Hostname setting -->

    <string name="device_hostname">Device hostname</string>



    <!-- Proximity wake -->

    <string name="proximity_wake_title">Prevent accidental wake-up</string>

    <string name="proximity_wake_summary">Check the proximity sensor prior to waking up screen</string>

</resources>

res/xml/display_settings.xml

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:lineage="http://schemas.android.com/apk/res/lineageos.platform"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="display_settings_screen"

    android:title="@string/display_settings"
@@ -145,6 +146,14 @@ 
        android:title="@string/tap_to_wake"

        android:summary="@string/tap_to_wake_summary" />



    <!-- Prevent accidental wake-up -->

    <lineageos.preference.LineageSystemSettingSwitchPreference

        android:key="proximity_on_wake"

        android:title="@string/proximity_wake_title"

        android:summary="@string/proximity_wake_summary"

        android:defaultValue="false"

        lineage:requiresConfig="@*lineageos.platform:bool/config_proximityCheckOnWake" />



    <ListPreference

        android:key="theme"

        android:title="@string/device_theme"

src/com/android/settings/DisplaySettings.java

+12 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ import java.util.List; 
public class DisplaySettings extends DashboardFragment {

    private static final String TAG = "DisplaySettings";



    public static final String KEY_PROXIMITY_ON_WAKE = "proximity_on_wake";



    private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";



    @Override
@@ -96,6 +98,16 @@ public class DisplaySettings extends DashboardFragment { 
    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.display_settings) {



                @Override

                public List<String> getNonIndexableKeys(Context context) {

                    List<String> keys = super.getNonIndexableKeys(context);

                    if (!context.getResources().getBoolean(

                            org.lineageos.platform.internal.R.bool.config_proximityCheckOnWake)) {

                        keys.add(KEY_PROXIMITY_ON_WAKE);

                    }

                    return keys;

                }



                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(

                        Context context) {