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

Commit 6326ee9b authored by Bruno Martins's avatar Bruno Martins
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 af85f3a6

res/values/cm_strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -61,4 +61,8 @@ 
    <!-- Touchscreen gesture settings -->

    <string name="touchscreen_gesture_settings_title">Touchscreen gestures</string>

    <string name="touchscreen_gesture_settings_summary">Perform various touchscreen gestures for quick actions</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

+8 −0
Original line number Diff line number Diff line
@@ -151,6 +151,14 @@ 
        android:summary="@string/status_bar_double_tap_to_sleep_summary"

        android:defaultValue="true" />



    <!-- 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
@@ -47,6 +47,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
@@ -110,6 +112,16 @@ public class DisplaySettings extends DashboardFragment { 
                    return result;

                }



                @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) {