diff options
author | Adrian DC <radian.dc@gmail.com> | 2017-10-14 14:18:27 +0200 |
---|---|---|
committer | Adrian DC <radian.dc@gmail.com> | 2017-10-14 14:18:27 +0200 |
commit | af41414b769f311bcf3bf14bf1ab8131725b77b9 (patch) | |
tree | 74cbc3cda67a8f9bb9838310d4331868d556b8a0 | |
parent | 0c7a70373036372a5346f748f664579c1072902c (diff) | |
download | lineage-sdk-af41414b769f311bcf3bf14bf1ab8131725b77b9.tar.gz lineage-sdk-af41414b769f311bcf3bf14bf1ab8131725b77b9.tar.bz2 lineage-sdk-af41414b769f311bcf3bf14bf1ab8131725b77b9.zip |
Multiple LEDs [2/2]: Remove feature support
* The feature was used only on Huashan since 2015
* It serves only for a small part of the users
who wanted to restrict to one light instead
of three lights from the LEDs bar
* Due to Oreo's new HIDL interfaces stack,
the additional data holder would need
a custom lights interface which is useless
for a single device and a rare use case
Change-Id: Ie08a1d625c7ce00fefff5bc1159522207be69dbc
Signed-off-by: Adrian DC <radian.dc@gmail.com>
7 files changed, 1 insertions, 34 deletions
diff --git a/api/lineage_current.txt b/api/lineage_current.txt index ba1d5b37..3a90fa85 100644 --- a/api/lineage_current.txt +++ b/api/lineage_current.txt @@ -1118,7 +1118,6 @@ package lineageos.providers { field public static final java.lang.String NAVIGATION_BAR_MENU_ARROW_KEYS = "navigation_bar_menu_arrow_keys"; field public static final java.lang.String NAV_BUTTONS = "nav_buttons"; field public static final java.lang.String NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL = "notification_light_brightness_level"; - field public static final java.lang.String NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE = "notification_light_multiple_leds_enable"; field public static final java.lang.String NOTIFICATION_LIGHT_PULSE_CALL_COLOR = "notification_light_pulse_call_color"; field public static final java.lang.String NOTIFICATION_LIGHT_PULSE_CALL_LED_OFF = "notification_light_pulse_call_led_off"; field public static final java.lang.String NOTIFICATION_LIGHT_PULSE_CALL_LED_ON = "notification_light_pulse_call_led_on"; diff --git a/host/migration/src/LineageSettings.java b/host/migration/src/LineageSettings.java index 28c18969..0005fb3f 100644 --- a/host/migration/src/LineageSettings.java +++ b/host/migration/src/LineageSettings.java @@ -552,13 +552,6 @@ public final class LineageSettings { "notification_light_brightness_level"; /** - * Whether to use the all the LEDs for the notifications or just one. - * @hide - */ - public static final String NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE = - "notification_light_multiple_leds_enable"; - - /** * Whether to allow notifications with the screen on or DayDreams. * The value is boolean (1 or 0). Default will always be false. * @hide @@ -708,7 +701,6 @@ public final class LineageSettings { LineageSettings.System.STATUS_BAR_NOTIF_COUNT, LineageSettings.System.CALL_RECORDING_FORMAT, LineageSettings.System.NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL, - LineageSettings.System.NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE, LineageSettings.System.NOTIFICATION_LIGHT_SCREEN_ON, LineageSettings.System.NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR, LineageSettings.System.NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_ON, diff --git a/lineage/res/res/values/config.xml b/lineage/res/res/values/config.xml index 9bffb896..9eee021f 100644 --- a/lineage/res/res/values/config.xml +++ b/lineage/res/res/values/config.xml @@ -92,7 +92,7 @@ LIGHTS_RGB_NOTIFICATION_LED = 1 LIGHTS_RGB_BATTERY_LED = 2 - LIGHTS_MULTIPLE_NOTIFICATION_LED = 4 + LIGHTS_MULTIPLE_NOTIFICATION_LED = 4 (deprecated) LIGHTS_PULSATING_LED = 8 LIGHTS_SEGMENTED_BATTERY_LED = 16 LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS = 32 diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml index 59b40065..1ecad4d4 100644 --- a/packages/LineageSettingsProvider/res/values/defaults.xml +++ b/packages/LineageSettingsProvider/res/values/defaults.xml @@ -93,10 +93,6 @@ on devices equiped with configurable LED controller --> <integer name="def_notification_brightness_level">255</integer> - <!-- Default value for whether or not to use multiple notification LEDs - on devices equiped with more than one LED --> - <bool name="def_notification_multiple_leds">false</bool> - <!-- Default value for notification LED customization --> <bool name="def_notification_pulse_custom_enable">false</bool> <string name="def_notification_pulse_custom_value"></string> diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java index 033385d5..e81f55a8 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java @@ -405,9 +405,6 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ loadIntegerSetting(stmt, LineageSettings.System.NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL, R.integer.def_notification_brightness_level); - loadBooleanSetting(stmt, LineageSettings.System.NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE, - R.bool.def_notification_multiple_leds); - loadBooleanSetting(stmt, LineageSettings.System.SYSTEM_PROFILES_ENABLED, R.bool.def_profiles_enabled); diff --git a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java index 702a92d7..f5c7ba37 100644 --- a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java +++ b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java @@ -65,9 +65,6 @@ public class LineageSettingsProviderDefaultsTest extends AndroidTestCase { LineageSettings.System.ENABLE_REVERSE_LOOKUP, "R.integer.def_reverse_lookup")); SYSTEM_SETTINGS_DEFAULTS.add(new Setting( - LineageSettings.System.NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE, - "R.bool.def_notification_multiple_leds")); - SYSTEM_SETTINGS_DEFAULTS.add(new Setting( LineageSettings.System.SYSTEM_PROFILES_ENABLED, "R.bool.def_profiles_enabled")); SYSTEM_SETTINGS_DEFAULTS.add(new Setting( diff --git a/sdk/src/java/lineageos/providers/LineageSettings.java b/sdk/src/java/lineageos/providers/LineageSettings.java index f12c5ec7..e4013802 100644 --- a/sdk/src/java/lineageos/providers/LineageSettings.java +++ b/sdk/src/java/lineageos/providers/LineageSettings.java @@ -1669,17 +1669,6 @@ public final class LineageSettings { new InclusiveIntegerRangeValidator(1, 255); /** - * Whether to use the all the LEDs for the notifications or just one. - * 0 = 0ff, 1 = on - */ - public static final String NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE = - "notification_light_multiple_leds_enable"; - - /** @hide */ - public static final Validator NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE_VALIDATOR = - sBooleanValidator; - - /** * Whether to allow notifications with the screen on or DayDreams. * The value is boolean (1 or 0). Default will always be false. */ @@ -1995,7 +1984,6 @@ public final class LineageSettings { LineageSettings.System.STATUS_BAR_NOTIF_COUNT, LineageSettings.System.CALL_RECORDING_FORMAT, LineageSettings.System.NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL, - LineageSettings.System.NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE, LineageSettings.System.NOTIFICATION_LIGHT_SCREEN_ON, LineageSettings.System.NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR, LineageSettings.System.NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_ON, @@ -2156,8 +2144,6 @@ public final class LineageSettings { VALIDATORS.put(CALL_RECORDING_FORMAT, CALL_RECORDING_FORMAT_VALIDATOR); VALIDATORS.put(NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL, NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL_VALIDATOR); - VALIDATORS.put(NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE, - NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE_VALIDATOR); VALIDATORS.put(NOTIFICATION_LIGHT_SCREEN_ON, NOTIFICATION_LIGHT_SCREEN_ON_VALIDATOR); VALIDATORS.put(NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR, |