Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Refactor display color transforms\" into nyc-mr1-dev

Browse Source 
am: 94673f0b7c

Change-Id: I7fdf83db6cbf26cdc5b8a9971fa48b7f8458474d
This commit is contained in:
Justin Klaassen
2016-07-14 19:33:35 +00:00
committed by android-build-merger
parent 1072978c6a 94673f0b7c
commit 5f3bf63121
7 changed files with 228 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/Settings.java
View File

@@ -5294,15 +5294,6 @@ public final class Settings {
public static final String ACCESSIBILITY_DISPLAY_DALTONIZER =
"accessibility_display_daltonizer";
/**
* Float list that specifies the color matrix to apply to
* the display. Valid values are defined in AccessibilityManager.
*
* @hide
*/
public static final String ACCESSIBILITY_DISPLAY_COLOR_MATRIX =
"accessibility_display_color_matrix";
/**
* Setting that specifies whether automatic click when the mouse pointer stops moving is
* enabled.
@@ -6334,7 +6325,6 @@ public final class Settings {
USB_MASS_STORAGE_ENABLED, // moved to global
ACCESSIBILITY_DISPLAY_INVERSION_ENABLED,
ACCESSIBILITY_DISPLAY_DALTONIZER,
ACCESSIBILITY_DISPLAY_COLOR_MATRIX,
ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,