From a09defa3c908589ad47cac7cd0de80c02832d532 Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Tue, 10 Nov 2015 18:10:54 -0800 Subject: [PATCH] cmsdk: Move LiveDisplay settings and resources. Change-Id: I6d0c3f8b645e2c8cca059ff343a774eab1933a9b --- cm/res/res/drawable/ic_livedisplay_notif.xml | 29 ++++++++ cm/res/res/values/arrays.xml | 27 +++++++- cm/res/res/values/config.xml | 4 ++ cm/res/res/values/strings.xml | 14 ++++ cm/res/res/values/symbols.xml | 19 +++++ .../cmsettings/CMSettingsProvider.java | 69 +++++++++++++++++++ .../cyanogenmod/providers/CMSettings.java | 49 +++++++++++++ 7 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 cm/res/res/drawable/ic_livedisplay_notif.xml diff --git a/cm/res/res/drawable/ic_livedisplay_notif.xml b/cm/res/res/drawable/ic_livedisplay_notif.xml new file mode 100644 index 0000000..a7cb8c6 --- /dev/null +++ b/cm/res/res/drawable/ic_livedisplay_notif.xml @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file diff --git a/cm/res/res/values/arrays.xml b/cm/res/res/values/arrays.xml index 2b78750..ec3fceb 100644 --- a/cm/res/res/values/arrays.xml +++ b/cm/res/res/values/arrays.xml @@ -24,7 +24,7 @@ @string/perf_profile_perf - @@ -35,4 +35,29 @@ 4 2 + + + + @string/live_display_auto + @string/live_display_off + @string/live_display_day + @string/live_display_night + @string/live_display_outdoor + + + + @string/live_display_auto_summary + @string/live_display_off_summary + @string/live_display_day_summary + @string/live_display_night_summary + @string/live_display_outdoor_summary + + + + 2 + 0 + 4 + 1 + 3 + diff --git a/cm/res/res/values/config.xml b/cm/res/res/values/config.xml index de167c3..e655322 100644 --- a/cm/res/res/values/config.xml +++ b/cm/res/res/values/config.xml @@ -51,4 +51,8 @@ 250 false + + 6500 + 4500 + 9000 diff --git a/cm/res/res/values/strings.xml b/cm/res/res/values/strings.xml index 5260650..3284321 100644 --- a/cm/res/res/values/strings.xml +++ b/cm/res/res/values/strings.xml @@ -103,4 +103,18 @@ Efficiency Quick + + LiveDisplay + Automatic + Automatically adjust color temperature of screen after sunset and sunrise + Off + Disable all adjustments + Day + Use day settings only + Night + Use night settings only + Outdoor (bright sun) + Use outdoor settings only + LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out! + diff --git a/cm/res/res/values/symbols.xml b/cm/res/res/values/symbols.xml index 8bff9c3..e8a61a6 100644 --- a/cm/res/res/values/symbols.xml +++ b/cm/res/res/values/symbols.xml @@ -50,4 +50,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java index 00b3574..979be3f 100644 --- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java +++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java @@ -580,6 +580,59 @@ public class CMSettingsProvider extends ContentProvider { */ public static final String WIFI_AUTO_CONNECT_TYPE = CMSettings.System.WIFI_AUTO_CONNECT_TYPE; + + /** + * Color temperature of the display during the day + * @hide + */ + public static final String DISPLAY_TEMPERATURE_DAY = + CMSettings.System.DISPLAY_TEMPERATURE_DAY; + + /** + * Color temperature of the display at night + * @hide + */ + public static final String DISPLAY_TEMPERATURE_NIGHT = + CMSettings.System.DISPLAY_TEMPERATURE_NIGHT; + + /** + * Display color temperature adjustment mode, one of DAY (default), NIGHT, or AUTO. + * @hide + */ + public static final String DISPLAY_TEMPERATURE_MODE = + CMSettings.System.DISPLAY_TEMPERATURE_MODE; + + /** + * Automatic outdoor mode + * @hide + */ + public static final String DISPLAY_AUTO_OUTDOOR_MODE = + CMSettings.System.DISPLAY_AUTO_OUTDOOR_MODE; + + /** + * Use display power saving features such as CABC or CABL + * @hide + */ + public static final String DISPLAY_LOW_POWER = CMSettings.System.DISPLAY_LOW_POWER; + + /** + * Use color enhancement feature of display + * @hide + */ + public static final String DISPLAY_COLOR_ENHANCE = CMSettings.System.DISPLAY_COLOR_ENHANCE; + + /** + * Manual display color adjustments (RGB values as floats, separated by spaces) + * @hide + */ + public static final String DISPLAY_COLOR_ADJUSTMENT = + CMSettings.System.DISPLAY_COLOR_ADJUSTMENT; + + /** + * Did we tell about how they can stop breaking their eyes? + * @hide + */ + public static final String LIVE_DISPLAY_HINTED = CMSettings.System.LIVE_DISPLAY_HINTED; } /** @@ -664,6 +717,22 @@ public class CMSettingsProvider extends ContentProvider { CMSettings.System.DIALER_OPENCNAM_AUTH_TOKEN); systemToCmSettingsMap.put(LegacyCMSettings.WIFI_AUTO_CONNECT_TYPE, CMSettings.System.WIFI_AUTO_CONNECT_TYPE); + systemToCmSettingsMap.put(LegacyCMSettings.DISPLAY_TEMPERATURE_DAY, + CMSettings.System.DISPLAY_TEMPERATURE_DAY); + systemToCmSettingsMap.put(LegacyCMSettings.DISPLAY_TEMPERATURE_NIGHT, + CMSettings.System.DISPLAY_TEMPERATURE_NIGHT); + systemToCmSettingsMap.put(LegacyCMSettings.DISPLAY_TEMPERATURE_MODE, + CMSettings.System.DISPLAY_TEMPERATURE_MODE); + systemToCmSettingsMap.put(LegacyCMSettings.DISPLAY_AUTO_OUTDOOR_MODE, + CMSettings.System.DISPLAY_AUTO_OUTDOOR_MODE); + systemToCmSettingsMap.put(LegacyCMSettings.DISPLAY_LOW_POWER, + CMSettings.System.DISPLAY_LOW_POWER); + systemToCmSettingsMap.put(LegacyCMSettings.DISPLAY_COLOR_ENHANCE, + CMSettings.System.DISPLAY_COLOR_ENHANCE); + systemToCmSettingsMap.put(LegacyCMSettings.DISPLAY_COLOR_ADJUSTMENT, + CMSettings.System.DISPLAY_COLOR_ADJUSTMENT); + systemToCmSettingsMap.put(LegacyCMSettings.LIVE_DISPLAY_HINTED, + CMSettings.System.LIVE_DISPLAY_HINTED); int rowsMigrated = migrateCMSettingsForTable(userId, CMDatabaseHelper.CMTableNames.TABLE_SYSTEM, systemToCmSettingsMap); diff --git a/src/java/cyanogenmod/providers/CMSettings.java b/src/java/cyanogenmod/providers/CMSettings.java index a143fa2..a71295f 100644 --- a/src/java/cyanogenmod/providers/CMSettings.java +++ b/src/java/cyanogenmod/providers/CMSettings.java @@ -977,6 +977,55 @@ public final class CMSettings { * @hide */ public static final String WIFI_AUTO_CONNECT_TYPE = "wifi_auto_connect_type"; + + /** + * Color temperature of the display during the day + * @hide + */ + public static final String DISPLAY_TEMPERATURE_DAY = "display_temperature_day"; + + /** + * Color temperature of the display at night + * @hide + */ + public static final String DISPLAY_TEMPERATURE_NIGHT = "display_temperature_night"; + + /** + * Display color temperature adjustment mode, one of DAY (default), NIGHT, or AUTO. + * @hide + */ + public static final String DISPLAY_TEMPERATURE_MODE = "display_temperature_mode"; + + /** + * Automatic outdoor mode + * @hide + */ + public static final String DISPLAY_AUTO_OUTDOOR_MODE = "display_auto_outdoor_mode"; + + /** + * Use display power saving features such as CABC or CABL + * @hide + */ + public static final String DISPLAY_LOW_POWER = "display_low_power"; + + /** + * Use color enhancement feature of display + * @hide + */ + public static final String DISPLAY_COLOR_ENHANCE = "display_color_enhance"; + + /** + * Manual display color adjustments (RGB values as floats, separated by spaces) + * @hide + */ + public static final String DISPLAY_COLOR_ADJUSTMENT = "display_color_adjustment"; + + /** + * Did we tell about how they can stop breaking their eyes? + * @hide + */ + public static final String LIVE_DISPLAY_HINTED = "live_display_hinted"; + } /**