diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-04-25 22:46:17 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-04-25 22:46:17 -0700 |
| commit | e77cc0ad3be72a35fe7b66813d91353b1b90bd2e (patch) | |
| tree | 3b1b52ae7b4e137313a130bbd203f6ec67b209d0 /src/com | |
| parent | 7de366bcca504a88ac29fa3f67164224d6243634 (diff) | |
| download | packages_apps_Settings-e77cc0ad3be72a35fe7b66813d91353b1b90bd2e.zip packages_apps_Settings-e77cc0ad3be72a35fe7b66813d91353b1b90bd2e.tar.gz packages_apps_Settings-e77cc0ad3be72a35fe7b66813d91353b1b90bd2e.tar.bz2 | |
settings: Remove LiveDisplay preferences if not available
* This really shouldn't be the case, but apparently some devices
are misconfigured and are overriding the GPU-based CMHW
implementation which would ensure the basic capabilities are
available.
Change-Id: I9f72cb58c9bbb63e0fdec4085b17a089f9d50174
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/DisplaySettings.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 97353a8..ef7f9c3 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -84,6 +84,8 @@ import java.util.ArrayList; import java.util.List; import com.android.settings.Utils; import com.android.settings.cyanogenmod.DisplayRotation; + +import cyanogenmod.hardware.LiveDisplayManager; import cyanogenmod.providers.CMSettings; public class DisplaySettings extends SettingsPreferenceFragment implements @@ -112,12 +114,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements private static final String KEY_WAKE_WHEN_PLUGGED_OR_UNPLUGGED = "wake_when_plugged_or_unplugged"; private static final String KEY_NOTIFICATION_LIGHT = "notification_light"; private static final String KEY_BATTERY_LIGHT = "battery_light"; + private static final String KEY_LIVEDISPLAY = "live_display"; private static final int DLG_GLOBAL_CHANGE_WARNING = 1; private ListPreference mLcdDensityPreference; private FontDialogPreference mFontSizePref; private PreferenceScreen mDisplayRotationPreference; + private PreferenceScreen mLiveDisplayPreference; private final Configuration mCurConfig = new Configuration(); @@ -172,6 +176,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements mAccelerometer.setPersistent(false); } + mLiveDisplayPreference = (PreferenceScreen) findPreference(KEY_LIVEDISPLAY); + if (!LiveDisplayManager.getInstance(getActivity()).getConfig().isAvailable()) { + displayPrefs.removePreference(mLiveDisplayPreference); + } + mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER); if (mScreenSaverPreference != null && getResources().getBoolean( |