<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.livedisplay.LiveDisplay" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
- android:resource="@id/display_and_lights_settings" />
+ android:resource="@id/display_settings" />
</activity>
<activity-alias android:name=".livedisplay.LiveDisplay"
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.livedisplay.LiveDisplay" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
- android:resource="@id/display_and_lights_settings" />
+ android:resource="@id/display_settings" />
</activity-alias>
<!-- CyanogenMod activities End -->
<PreferenceCategory
android:key="camera_key"
- android:title="@string/hardware_keys_camera_key_title"
- settings:advanced="true">
+ android:title="@string/hardware_keys_camera_key_title">
<com.android.settings.cyanogenmod.SystemSettingSwitchPreference
android:key="camera_wake_screen"
<com.android.settings.cyanogenmod.SecureSettingSwitchPreference
android:key="volume_keys_control_ring_stream"
android:title="@string/volume_keys_control_ring_stream_title"
- android:summary="@string/volume_keys_control_ring_stream_summary"
- settings:advanced="true" />
+ android:summary="@string/volume_keys_control_ring_stream_summary"/>
<ListPreference
android:key="volume_key_cursor_control"
android:key="live_display_low_power"
android:title="@string/live_display_low_power_title"
android:summary="@string/live_display_low_power_summary"
- android:defaultValue="true"
- settings:advanced="true" />
+ android:defaultValue="true" />
<!-- Color enhancement -->
<com.android.settings.cyanogenmod.SystemSettingSwitchPreference
android:key="live_display_color_enhance"
android:title="@string/live_display_enhance_color_title"
android:summary="@string/live_display_enhance_color_summary"
- android:defaultValue="true"
- settings:advanced="true" />
+ android:defaultValue="true"/>
</PreferenceCategory>
<PreferenceCategory
android:key="calibration"
- android:title="@string/category_calibration"
- settings:advanced="true">
+ android:title="@string/category_calibration">
<!-- screen color -->
<PreferenceScreen
android:persistent="false"
android:key="screencolor_settings"
android:title="@string/screencolor"
- android:summary="@string/screencolor_summary"
- settings:advanced="true">
+ android:summary="@string/screencolor_summary">
<intent
android:action="com.qualcomm.display.PPService"
android:targetPackage="com.android.settings"
android:title="@string/color_calibration_title"
android:dialogTitle="@string/color_calibration_title"
android:summary="@string/color_calibration_summary"
- android:persistent="false"
- settings:advanced="true"/>
+ android:persistent="false"/>
<com.android.settings.livedisplay.DisplayGamma
android:key="gamma_tuning"
android:title="@string/gamma_tuning_title_head"
android:dialogTitle="@string/gamma_tuning_title_head"
android:summary="@string/gamma_tuning_summary_head"
- android:persistent="false"
- settings:advanced="true"/>
+ android:persistent="false"/>
</PreferenceCategory>
private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
private static final String KEY_AUTO_ROTATE = "auto_rotate";
private static final String KEY_NIGHT_MODE = "night_mode";
- private static final String KEY_TAP_TO_WAKE = "double_tap_wake_gesture";
private static final String KEY_PROXIMITY_WAKE = "proximity_on_wake";
private static final String KEY_DISPLAY_ROTATION = "display_rotation";
private static final String KEY_WAKE_WHEN_PLUGGED_OR_UNPLUGGED = "wake_when_plugged_or_unplugged";
private SwitchPreference mDozePreference;
private SwitchPreference mTapToWakePreference;
private SwitchPreference mAutoBrightnessPreference;
- private SwitchPreference mTapToWake;
private SwitchPreference mWakeWhenPluggedOrUnplugged;
private CMHardwareManager mHardware;
mAutoBrightnessPreference.setOnPreferenceChangeListener(this);
} else {
if (mAutoBrightnessPreference != null) {
- removePreference(mAutoBrightnessPreference);
+ removePreference(KEY_AUTO_BRIGHTNESS);
mAutoBrightnessPreference = null;
}
}
mLiftToWakePreference.setOnPreferenceChangeListener(this);
} else {
if (mLiftToWakePreference != null) {
- removePreference(mLiftToWakePreference);
+ removePreference(KEY_LIFT_TO_WAKE);
mLiftToWakePreference = null;
}
}
removePreference(KEY_DOZE);
}
- if (isTapToWakeAvailable(getResources())) {
+ if (isTapToWakeAvailable(getResources()) || mHardware.isSupported(FEATURE_TAP_TO_WAKE)) {
mTapToWakePreference = (SwitchPreference) findPreference(KEY_TAP_TO_WAKE);
mTapToWakePreference.setOnPreferenceChangeListener(this);
} else {
mNightModePreference.setOnPreferenceChangeListener(this);
}
- mTapToWake = (SwitchPreference) findPreference(KEY_TAP_TO_WAKE);
- if (mTapToWake != null
- && !mHardware.isSupported(FEATURE_TAP_TO_WAKE)) {
- advancedPrefs.removePreference(mTapToWake);
- mTapToWake = null;
- }
-
boolean proximityCheckOnWait = getResources().getBoolean(
com.android.internal.R.bool.config_proximityCheckOnWake);
if (!proximityCheckOnWait) {
super.onResume();
updateDisplayRotationPreferenceDescription();
- if (mTapToWake != null) {
- mTapToWake.setChecked(mHardware.get(FEATURE_TAP_TO_WAKE));
- }
-
RotationPolicy.registerRotationPolicyListener(getActivity(),
mRotationPolicyListener);
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
- if (preference == mTapToWake) {
- return mHardware.set(FEATURE_TAP_TO_WAKE, mTapToWake.isChecked());
- } else if (preference == mWakeWhenPluggedOrUnplugged) {
+ if (preference == mWakeWhenPluggedOrUnplugged) {
Settings.Global.putInt(getContentResolver(),
Settings.Global.WAKE_WHEN_PLUGGED_OR_UNPLUGGED,
mWakeWhenPluggedOrUnplugged.isChecked() ? 1 : 0);
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
+import com.android.internal.logging.MetricsLogger;
+
public class DisplayRotation extends SettingsPreferenceFragment {
private static final String TAG = "DisplayRotation";
}
@Override
+ protected int getMetricsCategory() {
+ return MetricsLogger.DONT_TRACK_ME_BRO;
+ }
+
+ @Override
public void onResume() {
super.onResume();
.setTitle(R.string.profile_reset_title)
.setIcon(R.drawable.ic_navbar_restore)
.setMessage(R.string.navigation_bar_reset_message)
- .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+ .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
if (mEditMode) {
toggleEditMode(false, false);
.setTitle(R.string.profile_reset_title)
.setIcon(R.drawable.ic_navbar_restore)
.setMessage(R.string.navigation_bar_reset_message)
- .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+ .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
for (int i = 0; i < 3; i++) {
Settings.Secure.putString(getActivity().getContentResolver(),
import android.preference.Preference.OnPreferenceChangeListener;
import android.provider.Settings;
+import com.android.internal.logging.MetricsLogger;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.internal.util.cm.PowerMenuConstants;
}
@Override
+ protected int getMetricsCategory() {
+ return MetricsLogger.DONT_TRACK_ME_BRO;
+ }
+
+ @Override
public void onStart() {
super.onStart();
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
+import com.android.internal.logging.MetricsLogger;
+
import java.util.Collections;
import java.util.List;
mSwipeDouble = setupGesturePref(KEY_SPEN_DOUBLE, Settings.System.GESTURES_DOUBLE_TAP);
}
+ @Override
+ protected int getMetricsCategory() {
+ return MetricsLogger.DONT_TRACK_ME_BRO;
+ }
+
private ListPreference setupGesturePref(String key, String settingName) {
ListPreference pref = (ListPreference) findPreference(key);
String setting = Settings.System.getString(mResolver, settingName);
import android.provider.Settings;
import com.android.internal.util.ArrayUtils;
+import com.android.internal.logging.MetricsLogger;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
}
@Override
+ protected int getMetricsCategory() {
+ return MetricsLogger.DONT_TRACK_ME_BRO;
+ }
+
+ @Override
public void onResume() {
super.onResume();
updateModeSummary();
TYPE_SYSTEM, KEY_VIBRATION_INTENSITY, System.HAPTIC_FEEDBACK_ENABLED, DEFAULT_ON) {
@Override
public boolean isApplicable(Context context) {
- return VibratorIntensity.isSupported();
+ return false; //VibratorIntensity.isSupported();
}
};