Merge 10952656

Merged-In: I6332ad1e501955b3a544ce5bad0713bbc1dc5b12
Change-Id: I060abeaf069373a781de7923193fff62270e5dff

2 files changed, 47 insertions, 0 deletions

diff --git a/srcs/android/sysprop/DisplayProperties.sysprop b/srcs/android/sysprop/DisplayProperties.sysprop
index 1d04723..cb3d259 100644
--- a/srcs/android/sysprop/DisplayProperties.sysprop
+++ b/srcs/android/sysprop/DisplayProperties.sysprop
@@ -49,3 +49,13 @@ prop {
     prop_name: "debug.layout"
 }
 
+# String to specify which package, if any,
+# should have additional logging.
+prop {
+    api_name: "debug_vri_package"
+    type: String
+    scope: Internal
+    access: ReadWrite
+    prop_name: "persist.debug.vri_package"
+}
+
diff --git a/srcs/android/sysprop/InputProperties.sysprop b/srcs/android/sysprop/InputProperties.sysprop
index 926278c..ec18e19 100644
--- a/srcs/android/sysprop/InputProperties.sysprop
+++ b/srcs/android/sysprop/InputProperties.sysprop
@@ -64,3 +64,40 @@ prop {
     prop_name: "persist.debug.input.force_enable_stylus_pointer_icon"
 }
 
+# A flag to enable the Keyboard backlight animations introduced in Android U-QPR.
+prop {
+    api_name: "enable_keyboard_backlight_animation"
+    type: Boolean
+    scope: Internal
+    access: Readonly
+    prop_name: "persist.input.keyboard.backlight_animation.enabled"
+}
+
+# A flag to start logging atoms relating into input device usage metrics. Requires restart.
+prop {
+    api_name: "enable_input_device_usage_metrics"
+    type: Boolean
+    scope: Internal
+    access: Readonly
+    prop_name: "persist.debug.input.enable_input_device_usage_metrics"
+}
+
+# A flag to enable the Custom levels provided via IDC files for Keyboard backlight
+# introduced in Android U-QPR1.
+prop {
+    api_name: "enable_keyboard_backlight_custom_levels"
+    type: Boolean
+    scope: Internal
+    access: Readonly
+    prop_name: "persist.input.keyboard.backlight_custom_levels.enabled"
+}
+
+
+# A flag to enable ALS based keyboard backlight control introduced in Android U-QPR1.
+prop {
+    api_name: "enable_ambient_keyboard_backlight_control"
+    type: Boolean
+    scope: Internal
+    access: Readonly
+    prop_name: "persist.input.keyboard.ambient_backlight_control.enabled"
+}