diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/LineageHardwareService.java b/lineage/lib/main/java/org/lineageos/platform/internal/LineageHardwareService.java index f40cec56..9d557489 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/LineageHardwareService.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/LineageHardwareService.java @@ -112,8 +112,6 @@ public class LineageHardwareService extends LineageSystemService { public TouchscreenGesture[] getTouchscreenGestures(); public boolean setTouchscreenGestureEnabled(TouchscreenGesture gesture, boolean state); - - public boolean setGrayscale(boolean state); } private class LegacyLineageHardware implements LineageHardwareInterface { @@ -165,18 +163,20 @@ public class LineageHardwareService extends LineageSystemService { switch(feature) { case LineageHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT: return AdaptiveBacklight.isEnabled(); + case LineageHardwareManager.FEATURE_AUTO_CONTRAST: + return AutoContrast.isEnabled(); case LineageHardwareManager.FEATURE_COLOR_ENHANCEMENT: return ColorEnhancement.isEnabled(); case LineageHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY: return HighTouchSensitivity.isEnabled(); case LineageHardwareManager.FEATURE_KEY_DISABLE: return KeyDisabler.isActive(); + case LineageHardwareManager.FEATURE_READING_ENHANCEMENT: + return ReadingEnhancement.isEnabled(); case LineageHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT: return SunlightEnhancement.isEnabled(); case LineageHardwareManager.FEATURE_TOUCH_HOVERING: return TouchscreenHovering.isEnabled(); - case LineageHardwareManager.FEATURE_AUTO_CONTRAST: - return AutoContrast.isEnabled(); default: Log.e(TAG, "feature " + feature + " is not a boolean feature"); return false; @@ -187,18 +187,20 @@ public class LineageHardwareService extends LineageSystemService { switch(feature) { case LineageHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT: return AdaptiveBacklight.setEnabled(enable); + case LineageHardwareManager.FEATURE_AUTO_CONTRAST: + return AutoContrast.setEnabled(enable); case LineageHardwareManager.FEATURE_COLOR_ENHANCEMENT: return ColorEnhancement.setEnabled(enable); case LineageHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY: return HighTouchSensitivity.setEnabled(enable); case LineageHardwareManager.FEATURE_KEY_DISABLE: return KeyDisabler.setActive(enable); + case LineageHardwareManager.FEATURE_READING_ENHANCEMENT: + return ReadingEnhancement.setEnabled(enable); case LineageHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT: return SunlightEnhancement.setEnabled(enable); case LineageHardwareManager.FEATURE_TOUCH_HOVERING: return TouchscreenHovering.setEnabled(enable); - case LineageHardwareManager.FEATURE_AUTO_CONTRAST: - return AutoContrast.setEnabled(enable); default: Log.e(TAG, "feature " + feature + " is not a boolean feature"); return false; @@ -373,10 +375,6 @@ public class LineageHardwareService extends LineageSystemService { public boolean setTouchscreenGestureEnabled(TouchscreenGesture gesture, boolean state) { return TouchscreenGestures.setGestureEnabled(gesture, state); } - - public boolean setGrayscale(boolean state) { - return ReadingEnhancement.setGrayscale(state); - } } private LineageHardwareInterface getImpl(Context context) { @@ -779,16 +777,5 @@ public class LineageHardwareService extends LineageSystemService { } return mLineageHwImpl.setTouchscreenGestureEnabled(gesture, state); } - - @Override - public boolean setGrayscale(boolean state) { - mContext.enforceCallingOrSelfPermission( - lineageos.platform.Manifest.permission.HARDWARE_ABSTRACTION_ACCESS, null); - if (!isSupported(LineageHardwareManager.FEATURE_READING_ENHANCEMENT)) { - Log.e(TAG, "Reading enhancement not supported"); - return false; - } - return mLineageHwImpl.setGrayscale(state); - } }; } diff --git a/sdk/src/java/lineageos/hardware/ILineageHardwareService.aidl b/sdk/src/java/lineageos/hardware/ILineageHardwareService.aidl index aaa1ce50..a223cff8 100644 --- a/sdk/src/java/lineageos/hardware/ILineageHardwareService.aidl +++ b/sdk/src/java/lineageos/hardware/ILineageHardwareService.aidl @@ -65,6 +65,4 @@ interface ILineageHardwareService { TouchscreenGesture[] getTouchscreenGestures(); boolean setTouchscreenGestureEnabled(in TouchscreenGesture gesture, boolean state); - - boolean setGrayscale(boolean state); } diff --git a/sdk/src/java/lineageos/hardware/LineageHardwareManager.java b/sdk/src/java/lineageos/hardware/LineageHardwareManager.java index c58b1c90..4b625df8 100644 --- a/sdk/src/java/lineageos/hardware/LineageHardwareManager.java +++ b/sdk/src/java/lineageos/hardware/LineageHardwareManager.java @@ -160,12 +160,13 @@ public final class LineageHardwareManager { private static final List BOOLEAN_FEATURES = Arrays.asList( FEATURE_ADAPTIVE_BACKLIGHT, + FEATURE_AUTO_CONTRAST, FEATURE_COLOR_ENHANCEMENT, FEATURE_HIGH_TOUCH_SENSITIVITY, FEATURE_KEY_DISABLE, FEATURE_SUNLIGHT_ENHANCEMENT, FEATURE_TOUCH_HOVERING, - FEATURE_AUTO_CONTRAST + FEATURE_READING_ENHANCEMENT ); private static LineageHardwareManager sLineageHardwareManagerInstance; @@ -874,19 +875,4 @@ public final class LineageHardwareManager { } return false; } - - /** - * Enables or disables reading mode - * - * @return true if success - */ - public boolean setGrayscale(boolean state) { - try { - if (checkService()) { - return sService.setGrayscale(state); - } - } catch (RemoteException e) { - } - return false; - } }