diff options
Diffstat (limited to 'src/com/android/settings/DisplaySettings.java')
-rw-r--r-- | src/com/android/settings/DisplaySettings.java | 59 |
1 files changed, 13 insertions, 46 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 6d4f94d..6d716f0 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -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; } }; |