Change Display->Ambient Display to Display->Quick screen check.
Update the preference title for Ambient display and add metrics logging
when user selects it.
Bug: 29994493
Change-Id: Ibeaa60889d3f4394c924471b21baa929d469db71
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 2821eb2..87634fc 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -41,6 +41,7 @@
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 @@
private SwitchPreference mTapToWakePreference;
private SwitchPreference mAutoBrightnessPreference;
private SwitchPreference mCameraGesturePreference;
+ private PreferenceScreen mDozePreference;
@Override
protected int getMetricsCategory() {
@@ -144,6 +146,8 @@
if (!isDozeAvailable(activity)) {
removePreference(KEY_DOZE);
+ } else {
+ mDozePreference = (PreferenceScreen) findPreference(KEY_DOZE);
}
if (isTapToWakeAvailable(getResources())) {
@@ -426,6 +430,14 @@
}
@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;
}