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

Commit 2533fb38 authored by Doris Ling's avatar Doris Ling Committed by android-build-merger
Browse files

Change Display->Ambient Display to Display->Quick screen check.

am: b727e9ca

Change-Id: I2bfd2c525f5d44a94eb56f489526fb6f7931412a
parents fd2baea4 b727e9ca
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@

        <PreferenceScreen
                android:key="doze"
                android:title="@string/doze_title"
                android:title="@string/ambient_display_title"
                android:summary="@string/doze_summary" >
                <intent
                    android:targetPackage="com.android.settings"
+12 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.support.v7.preference.DropDownPreference;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;

@@ -99,6 +100,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
    private SwitchPreference mTapToWakePreference;
    private SwitchPreference mAutoBrightnessPreference;
    private SwitchPreference mCameraGesturePreference;
    private PreferenceScreen mDozePreference;

    @Override
    protected int getMetricsCategory() {
@@ -144,6 +146,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements

        if (!isDozeAvailable(activity)) {
            removePreference(KEY_DOZE);
        } else {
            mDozePreference = (PreferenceScreen) findPreference(KEY_DOZE);
        }

        if (isTapToWakeAvailable(getResources())) {
@@ -425,6 +429,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
        return true;
    }

    @Override
    public boolean onPreferenceTreeClick(Preference preference) {
        if (preference == mDozePreference) {
            MetricsLogger.action(getActivity(), MetricsEvent.ACTION_AMBIENT_DISPLAY);
        }
        return super.onPreferenceTreeClick(preference);
    }

    @Override
    protected int getHelpResource() {
        return R.string.help_uri_display;