Android/lineage-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdk: Rework reading mode API

Browse Source 
* The current API makes no sense, and doesn't really
  fit with how the other boolean features work
* While we're at it, place AutoContrast properly

Change-Id: I81d7805411c281e435c7451c0b62689711dbb323
This commit is contained in:
Paul Keith
2018-08-08 18:28:58 +02:00
parent 39986a0a65
commit 505580e2dd
3 changed files with 10 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lineage/lib/main/java/org/lineageos/platform/internal/LineageHardwareService.java
View File

@@ -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);
}
};
}

2
sdk/src/java/lineageos/hardware/ILineageHardwareService.aidl
View File

@@ -65,6 +65,4 @@ interface ILineageHardwareService {
TouchscreenGesture[] getTouchscreenGestures();
boolean setTouchscreenGestureEnabled(in TouchscreenGesture gesture, boolean state);
boolean setGrayscale(boolean state);
}

18
sdk/src/java/lineageos/hardware/LineageHardwareManager.java
View File

@@ -160,12 +160,13 @@ public final class LineageHardwareManager {
private static final List<Integer> 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;
}
}