Remove CMHW tap to wake (4705f54a) · Commits · e / os / android_packages_apps_Settings

res/values/cm_strings.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -419,9 +419,6 @@
		<string name="advanced_settings">Advanced settings</string>
		<string name="advanced_settings_summary">Enable more settings options</string>

		<!--- Tap To Wake -->
		<string name="double_tap_to_wake_title">Double-tap to wake</string>

		<!-- tap-to-sleep -->
		<string name="double_tap_to_sleep_title">Double-tap to sleep</string>
		<string name="double_tap_to_sleep_summary">Double tap status bar or lock screen slider to put the device to sleep</string>

res/xml/display_settings.xml

+12 −16

Original line number	Diff line number	Diff line
		@@ -91,6 +91,18 @@
		android:summary="@string/tap_to_wake_summary"
		android:persistent="false" />

		<com.android.settings.cyanogenmod.SystemSettingSwitchPreference
		android:key="proximity_on_wake"
		android:title="@string/proximity_wake_title"
		android:summary="@string/proximity_wake_summary"
		android:defaultValue="true" />

		<com.android.settings.cyanogenmod.SystemSettingSwitchPreference
		android:key="double_tap_sleep_gesture"
		android:title="@string/double_tap_to_sleep_title"
		android:summary="@string/double_tap_to_sleep_summary"
		android:defaultValue="true" />

		<com.android.settings.FontDialogPreference
		android:key="font_size"
		android:title="@string/title_font_size"
		@@ -108,22 +120,6 @@
		android:key="advanced_display_prefs"
		android:title="@string/advanced_settings">

		<SwitchPreference
		android:key="double_tap_wake_gesture"
		android:title="@string/double_tap_to_wake_title" />

		<com.android.settings.cyanogenmod.SystemSettingSwitchPreference
		android:key="proximity_on_wake"
		android:title="@string/proximity_wake_title"
		android:summary="@string/proximity_wake_summary"
		android:defaultValue="true" />

		<com.android.settings.cyanogenmod.SystemSettingSwitchPreference
		android:key="double_tap_sleep_gesture"
		android:title="@string/double_tap_to_sleep_title"
		android:summary="@string/double_tap_to_sleep_summary"
		android:defaultValue="true" />

		<SwitchPreference
		android:key="wake_when_plugged_or_unplugged"
		android:title="@string/wake_when_plugged_or_unplugged_title"

src/com/android/settings/DisplaySettings.java

+13 −46

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
		import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
		import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
		import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
		import static cyanogenmod.hardware.CMHardwareManager.FEATURE_TAP_TO_WAKE;

		import android.app.Activity;
		import android.app.ActivityManagerNative;
		@@ -44,7 +43,6 @@ import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.content.SharedPreferences;
		import android.hardware.Sensor;
		import android.hardware.SensorManager;
		import android.os.Build;
		@@ -71,8 +69,6 @@ import java.util.List;
		import com.android.settings.Utils;
		import com.android.settings.cyanogenmod.DisplayRotation;

		import cyanogenmod.hardware.CMHardwareManager;

		public class DisplaySettings extends SettingsPreferenceFragment implements
		Preference.OnPreferenceChangeListener, OnPreferenceClickListener, Indexable {
		private static final String TAG = "DisplaySettings";
		@@ -93,8 +89,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		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 static final String CATEGORY_ADVANCED = "advanced_display_prefs";

		private static final int DLG_GLOBAL_CHANGE_WARNING = 1;

		private FontDialogPreference mFontSizePref;
		@@ -111,8 +105,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		private SwitchPreference mAutoBrightnessPreference;
		private SwitchPreference mWakeWhenPluggedOrUnplugged;

		private CMHardwareManager mHardware;

		private ContentObserver mAccelerometerRotationObserver =
		new ContentObserver(new Handler()) {
		@Override
		@@ -140,7 +132,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		final Activity activity = getActivity();
		final ContentResolver resolver = activity.getContentResolver();
		addPreferencesFromResource(R.xml.display_settings);
		mHardware = CMHardwareManager.getInstance(activity);

		mDisplayRotationPreference = (PreferenceScreen) findPreference(KEY_DISPLAY_ROTATION);

		@@ -183,7 +174,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		mLiftToWakePreference = null;
		}
		}
		PreferenceCategory advancedPrefs = (PreferenceCategory) findPreference(CATEGORY_ADVANCED);

		mDozePreference = (SwitchPreference) findPreference(KEY_DOZE);
		if (mDozePreference != null && Utils.isDozeAvailable(activity)) {
		mDozePreference.setOnPreferenceChangeListener(this);
		@@ -191,13 +182,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		removePreference(KEY_DOZE);
		}

		if (isTapToWakeAvailable(getResources()) \|\| mHardware.isSupported(FEATURE_TAP_TO_WAKE)) {
		mTapToWakePreference = (SwitchPreference) findPreference(KEY_TAP_TO_WAKE);
		mTapToWakePreference.setOnPreferenceChangeListener(this);
		} else {
		removePreference(KEY_TAP_TO_WAKE);
		}

		mNightModePreference = (ListPreference) findPreference(KEY_NIGHT_MODE);
		if (mNightModePreference != null) {
		final UiModeManager uiManager = (UiModeManager) getSystemService(
		@@ -207,10 +191,17 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		mNightModePreference.setOnPreferenceChangeListener(this);
		}

		mTapToWakePreference = (SwitchPreference) findPreference(KEY_TAP_TO_WAKE);
		if (mTapToWakePreference != null && isTapToWakeAvailable(getResources())) {
		mTapToWakePreference.setOnPreferenceChangeListener(this);
		} else {
		removePreference(KEY_TAP_TO_WAKE);
		}

		boolean proximityCheckOnWait = getResources().getBoolean(
		com.android.internal.R.bool.config_proximityCheckOnWake);
		if (!proximityCheckOnWait) {
		advancedPrefs.removePreference(findPreference(KEY_PROXIMITY_WAKE));
		removePreference(KEY_PROXIMITY_WAKE);
		Settings.System.putInt(getContentResolver(), Settings.System.PROXIMITY_ON_WAKE, 1);
		}

		@@ -539,26 +530,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		return R.string.help_uri_display;
		}

		/**
		* Restore the properties associated with this preference on boot
		*
		* @param ctx A valid context
		*/
		public static void restore(Context ctx) {
		final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
		CMHardwareManager cmHardwareManager = CMHardwareManager.getInstance(ctx);
		if (cmHardwareManager.isSupported(FEATURE_TAP_TO_WAKE)) {
		final boolean enabled = prefs.getBoolean(KEY_TAP_TO_WAKE,
		cmHardwareManager.get(FEATURE_TAP_TO_WAKE));

		if (!cmHardwareManager.set(FEATURE_TAP_TO_WAKE, enabled)) {
		Log.e(TAG, "Failed to restore tap-to-wake settings.");
		} else {
		Log.d(TAG, "Tap-to-wake settings restored.");
		}
		}
		}

		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {

		@@ -577,19 +548,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements

		@Override
		public List<String> getNonIndexableKeys(Context context) {
		CMHardwareManager cmHardwareManager = CMHardwareManager.getInstance(context);
		ArrayList<String> result = new ArrayList<String>();
		if (!context.getResources().getBoolean(
		com.android.internal.R.bool.config_dreamsSupported)) {
		result.add(KEY_SCREEN_SAVER);
		}
		if (!context.getResources().getBoolean(
		com.android.internal.R.bool.config_proximityCheckOnWake)) {
		result.add(KEY_PROXIMITY_WAKE);
		}
		if (!cmHardwareManager.isSupported(FEATURE_TAP_TO_WAKE)) {
		result.add(KEY_TAP_TO_WAKE);
		}
		if (!isAutomaticBrightnessAvailable(context.getResources())) {
		result.add(KEY_AUTO_BRIGHTNESS);
		}
		@@ -602,6 +565,10 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		if (!isTapToWakeAvailable(context.getResources())) {
		result.add(KEY_TAP_TO_WAKE);
		}
		if (!context.getResources().getBoolean(
		com.android.internal.R.bool.config_proximityCheckOnWake)) {
		result.add(KEY_PROXIMITY_WAKE);
		}
		return result;
		}
		};

src/com/android/settings/cyanogenmod/BootReceiver.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import com.android.settings.ButtonSettings;
		import com.android.settings.DisplaySettings;
		import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settings.hardware.VibratorIntensity;
		@@ -35,11 +34,9 @@ public class BootReceiver extends BroadcastReceiver {
		@Override
		public void onReceive(Context ctx, Intent intent) {
		/* Restore the hardware tunable values */
		DisplaySettings.restore(ctx);
		ButtonSettings.restoreKeyDisabler(ctx);
		DisplayGamma.restore(ctx);
		VibratorIntensity.restore(ctx);
		DisplaySettings.restore(ctx);
		InputMethodAndLanguageSettings.restore(ctx);
		LocationSettings.restore(ctx);
		}