PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Update the preference title for Ambient display and add metrics logging
when user selects it.

Bug: 29994493
Change-Id: Ibeaa60889d3f4394c924471b21baa929d469db71
This commit is contained in:
Doris Ling
2016-08-01 14:56:26 -07:00
parent dfe576b3e4
commit b727e9caa5
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/display_settings.xml
View File

@@ -81,7 +81,7 @@
<PreferenceScreen <PreferenceScreen
android:key="doze" android:key="doze"
android:title="@string/doze_title" android:title="@string/ambient_display_title"
android:summary="@string/doze_summary" > android:summary="@string/doze_summary" >
<intent <intent
android:targetPackage="com.android.settings" android:targetPackage="com.android.settings"

12
src/com/android/settings/DisplaySettings.java
View File

@@ -41,6 +41,7 @@ import android.support.v7.preference.DropDownPreference;
import android.support.v7.preference.ListPreference; import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -99,6 +100,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private SwitchPreference mTapToWakePreference; private SwitchPreference mTapToWakePreference;
private SwitchPreference mAutoBrightnessPreference; private SwitchPreference mAutoBrightnessPreference;
private SwitchPreference mCameraGesturePreference; private SwitchPreference mCameraGesturePreference;
private PreferenceScreen mDozePreference;
@Override @Override
protected int getMetricsCategory() { protected int getMetricsCategory() {
@@ -144,6 +146,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
if (!isDozeAvailable(activity)) { if (!isDozeAvailable(activity)) {
removePreference(KEY_DOZE); removePreference(KEY_DOZE);
} else {
mDozePreference = (PreferenceScreen) findPreference(KEY_DOZE);
} }
if (isTapToWakeAvailable(getResources())) { if (isTapToWakeAvailable(getResources())) {
@@ -425,6 +429,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
return true; return true;
} }
@Override
public boolean onPreferenceTreeClick(Preference preference) {
if (preference == mDozePreference) {
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_AMBIENT_DISPLAY);
}
return super.onPreferenceTreeClick(preference);
}
@Override @Override
protected int getHelpResource() { protected int getHelpResource() {
return R.string.help_uri_display; return R.string.help_uri_display;