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

Commit 911de7fa authored by John Spurlock's avatar John Spurlock
Browse files

Settings: Wire up new doze opt-out setting. 

Add an item in Display settings for enabling or disabling
dozing.  The setting will only appear on devices that have
configured a doze component.

Bug:16703536
Change-Id: Iba5f0a25cef68924f5be5f858b4c396234a7a355
parent 8c89e69b

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -2062,6 +2062,10 @@ 
    <string name="automatic_brightness">Automatic brightness</string>

    <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->

    <string name="lift_to_wake_title">Lift to wake</string>

    <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->

    <string name="doze_title">Ambient display</string>

    <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->

    <string name="doze_summary">Wake screen when device picked up or notifications arrive</string>

    <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->

    <string name="title_font_size">Font size</string>

    <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->

res/xml/display_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ 
                android:title="@string/lift_to_wake_title"

                android:persistent="false" />



        <SwitchPreference

                android:key="doze"

                android:title="@string/doze_title"

                android:summary="@string/doze_summary"

                android:persistent="false" />



        <com.android.settings.WarnedListPreference

                android:key="font_size"

                android:title="@string/title_font_size"

src/com/android/settings/DisplaySettings.java

+35 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings; 
import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;



import static android.provider.Settings.Secure.DOZE_ENABLED;

import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED;

import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;

import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
@@ -34,8 +35,10 @@ import android.content.res.Configuration; 
import android.content.res.Resources;

import android.hardware.Sensor;

import android.hardware.SensorManager;

import android.os.Build;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.preference.ListPreference;

import android.preference.Preference;

import android.preference.Preference.OnPreferenceClickListener;
@@ -43,6 +46,7 @@ import android.preference.PreferenceScreen; 
import android.preference.SwitchPreference;

import android.provider.SearchIndexableResource;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.Log;



import java.util.ArrayList;
@@ -59,6 +63,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
    private static final String KEY_FONT_SIZE = "font_size";

    private static final String KEY_SCREEN_SAVER = "screensaver";

    private static final String KEY_LIFT_TO_WAKE = "lift_to_wake";

    private static final String KEY_DOZE = "doze";

    private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";



    private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
@@ -70,6 +75,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
    private ListPreference mScreenTimeoutPreference;

    private Preference mScreenSaverPreference;

    private SwitchPreference mLiftToWakePreference;

    private SwitchPreference mDozePreference;

    private SwitchPreference mAutoBrightnessPreference;



    @Override
@@ -111,6 +117,13 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        } else {

            removePreference(KEY_LIFT_TO_WAKE);

        }



        if (isDozeAvailable(getActivity())) {

            mDozePreference = (SwitchPreference) findPreference(KEY_DOZE);

            mDozePreference.setOnPreferenceChangeListener(this);

        } else {

            removePreference(KEY_DOZE);

        }

    }



    private static boolean isLiftToWakeAvailable(Context context) {
@@ -118,6 +131,15 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        return sensors != null && sensors.getDefaultSensor(Sensor.TYPE_WAKE_GESTURE) != null;

    }



    private static boolean isDozeAvailable(Context context) {

        String name = Build.IS_DEBUGGABLE ? SystemProperties.get("debug.doze.component") : null;

        if (TextUtils.isEmpty(name)) {

            name = context.getResources().getString(

                    com.android.internal.R.string.config_dozeComponent);

        }

        return !TextUtils.isEmpty(name);

    }



    private static boolean isAutomaticBrightnessAvailable(Resources res) {

        return res.getBoolean(com.android.internal.R.bool.config_automatic_brightness_available);

    }
@@ -256,6 +278,12 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
            int value = Settings.Secure.getInt(getContentResolver(), WAKE_GESTURE_ENABLED, 0);

            mLiftToWakePreference.setChecked(value != 0);

        }



        // Update doze if it is available.

        if (mDozePreference != null) {

            int value = Settings.Secure.getInt(getContentResolver(), DOZE_ENABLED, 1);

            mDozePreference.setChecked(value != 0);

        }

    }



    private void updateScreenSaverSummary() {
@@ -303,6 +331,10 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
            boolean value = (Boolean) objValue;

            Settings.Secure.putInt(getContentResolver(), WAKE_GESTURE_ENABLED, value ? 1 : 0);

        }

        if (preference == mDozePreference) {

            boolean value = (Boolean) objValue;

            Settings.Secure.putInt(getContentResolver(), DOZE_ENABLED, value ? 1 : 0);

        }

        return true;

    }
@@ -347,6 +379,9 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
                    if (!isLiftToWakeAvailable(context)) {

                        result.add(KEY_LIFT_TO_WAKE);

                    }

                    if (!isDozeAvailable(context)) {

                        result.add(KEY_DOZE);

                    }

                    return result;

                }

            };