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 
am: b727e9caa5

Change-Id: I2bfd2c525f5d44a94eb56f489526fb6f7931412a
This commit is contained in:
Doris Ling
2016-08-04 23:46:47 +00:00
committed by android-build-merger
parent fd2baea4b8 b727e9caa5
commit 2533fb386d
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
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
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.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;