Snap for 10515480 from 2f01441a4e to udc-qpr1-release

Change-Id: Ibc2fda7ba1c9d7202a49478f1a061a13ee952481

felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Lock pattern view size, align sysui biometric_auth_pattern_view_size -->
+    <dimen name="biometric_auth_pattern_view_size">290dp</dimen>
+
+</resources>

thermal_info_config_charge_felix.json

@@ -60,23 +60,26 @@
             "Multiplier":1
         },
         {
-            "Name":"IS_OPEN",
+            "Name":"OPEN_WEIGHT",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
+            "StepRatio":0.2,
             "Combination":["inner-disp"],
             "Coefficient":[1.0],
-            "Multiplier":1
+            "Multiplier":1,
+            "PassiveDelay":7000
         },
         {
-            "Name":"IS_CLOSE",
+            "Name":"CLOSE_WEIGHT",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
+            "Formula":"WEIGHTED_AVG",
-            "Combination":["inner-disp"],
+            "Combination":["1", "OPEN_WEIGHT"],
-            "Coefficient":[-1.0],
+            "CombinationType":["CONSTANT", "SENSOR"],
+            "Coefficient":[1.0, -1.0],
             "Multiplier":1
         },
         {
@@ -144,16 +147,6 @@
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
-        {
-            "Name":"VIRTUAL-SKIN-CLOSE",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["CLOSE-SUB-MAX", "IS_OPEN"],
-            "Coefficient":[1.0, -1000000],
-            "Multiplier":0.001
-        },
         {
             "Name":"OPEN-SUB1",
             "Type":"UNKNOWN",
@@ -204,9 +197,9 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
+            "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
-            "Coefficient":[0.15, 1.05, -0.65, 1, -0.55],
+            "Coefficient":[0.429, 0.314, 0.205],
-            "Offset":3540,
+            "Offset":2600,
             "Multiplier":0.001
         },
         {
@@ -219,16 +212,6 @@
             "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
-        {
-            "Name":"VIRTUAL-SKIN-OPEN",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["OPEN-SUB-MAX", "IS_CLOSE"],
-            "Coefficient":[1.0, -1000000],
-            "Multiplier":0.001
-        },
         {
             "Name":"VIRTUAL-SKIN-CHARGE",
             "Type":"UNKNOWN",
@@ -236,9 +219,10 @@
             "Hidden":true,
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm",
-            "Formula":"MAXIMUM",
+            "Formula":"WEIGHTED_AVG",
-            "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"],
+            "Combination":["OPEN-SUB-MAX", "CLOSE-SUB-MAX"],
-            "Coefficient":[1.0, 1.0],
+            "Coefficient":["OPEN_WEIGHT", "CLOSE_WEIGHT"],
+            "CoefficientType":["SENSOR", "SENSOR"],
             "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
             "Multiplier":0.001,

thermal_info_config_felix.json

@@ -66,23 +66,26 @@
             "Multiplier":1
         },
         {
-            "Name":"IS_OPEN",
+            "Name":"OPEN_WEIGHT",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
+            "StepRatio":0.2,
             "Combination":["inner-disp"],
             "Coefficient":[1.0],
-            "Multiplier":1
+            "Multiplier":1,
+            "PassiveDelay":7000
         },
         {
-            "Name":"IS_CLOSE",
+            "Name":"CLOSE_WEIGHT",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
+            "Formula":"WEIGHTED_AVG",
-            "Combination":["inner-disp"],
+            "Combination":["1", "OPEN_WEIGHT"],
-            "Coefficient":[-1.0],
+            "CombinationType":["CONSTANT", "SENSOR"],
+            "Coefficient":[1.0, -1.0],
             "Multiplier":1
         },
         {
@@ -150,16 +153,6 @@
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
-        {
-            "Name":"VIRTUAL-SKIN-CLOSE",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["CLOSE-SUB-MAX", "IS_OPEN"],
-            "Coefficient":[1.0, -1000000],
-            "Multiplier":0.001
-        },
         {
             "Name":"OPEN-SUB1",
             "Type":"UNKNOWN",
@@ -210,9 +203,9 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
+            "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
-            "Coefficient":[0.15, 1.05, -0.65, 1, -0.55],
+            "Coefficient":[0.429, 0.314, 0.205],
-            "Offset":3540,
+            "Offset":2600,
             "Multiplier":0.001
         },
         {
@@ -225,25 +218,16 @@
             "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
-        {
-            "Name":"VIRTUAL-SKIN-OPEN",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["OPEN-SUB-MAX", "IS_CLOSE"],
-            "Coefficient":[1.0, -1000000],
-            "Multiplier":0.001
-        },
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.5",
+            "Version":"6.2",
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm",
-            "Formula":"MAXIMUM",
+            "Formula":"WEIGHTED_AVG",
-            "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"],
+            "Combination":["OPEN-SUB-MAX", "CLOSE-SUB-MAX"],
-            "Coefficient":[1.0, 1.0],
+            "Coefficient":["OPEN_WEIGHT", "CLOSE_WEIGHT"],
+            "CoefficientType":["SENSOR", "SENSOR"],
             "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 51.0, 54.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,

thermal_info_config_proactive_skin_felix.json

@@ -66,23 +66,26 @@
             "Multiplier":1
         },
         {
-            "Name":"IS_OPEN",
+            "Name":"OPEN_WEIGHT",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
+            "StepRatio":0.2,
             "Combination":["inner-disp"],
             "Coefficient":[1.0],
-            "Multiplier":1
+            "Multiplier":1,
+            "PassiveDelay":7000
         },
         {
-            "Name":"IS_CLOSE",
+            "Name":"CLOSE_WEIGHT",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
+            "Formula":"WEIGHTED_AVG",
-            "Combination":["inner-disp"],
+            "Combination":["1", "OPEN_WEIGHT"],
-            "Coefficient":[-1.0],
+            "CombinationType":["CONSTANT", "SENSOR"],
+            "Coefficient":[1.0, -1.0],
             "Multiplier":1
         },
         {
@@ -150,16 +153,6 @@
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
-        {
-            "Name":"VIRTUAL-SKIN-CLOSE",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["CLOSE-SUB-MAX", "IS_OPEN"],
-            "Coefficient":[1.0, -1000000],
-            "Multiplier":0.001
-        },
         {
             "Name":"OPEN-SUB1",
             "Type":"UNKNOWN",
@@ -210,9 +203,9 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
+            "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
-            "Coefficient":[0.15, 1.05, -0.65, 1, -0.55],
+            "Coefficient":[0.429, 0.314, 0.205],
-            "Offset":3540,
+            "Offset":2600,
             "Multiplier":0.001
         },
         {
@@ -225,25 +218,16 @@
             "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
-        {
-            "Name":"VIRTUAL-SKIN-OPEN",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["OPEN-SUB-MAX", "IS_CLOSE"],
-            "Coefficient":[1.0, -1000000],
-            "Multiplier":0.001
-        },
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.5",
+            "Version":"6.2",
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm",
-            "Formula":"MAXIMUM",
+            "Formula":"WEIGHTED_AVG",
-            "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"],
+            "Combination":["OPEN-SUB-MAX", "CLOSE-SUB-MAX"],
-            "Coefficient":[1.0, 1.0],
+            "Coefficient":["OPEN_WEIGHT", "CLOSE_WEIGHT"],
+            "CoefficientType":["SENSOR", "SENSOR"],
             "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 51.0, 54.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
@@ -966,5 +950,25 @@
             "PowerSampleDelay":60000,
             "PowerSampleCount":1
         }
+    ],
+    "Stats": {
+        "Sensors": {
+            "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
+            "RecordWithThreshold": [
+                {
+                    "Name": "VIRTUAL-SKIN",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-USB-THROTTLING",
+                    "Thresholds": [2.0]
+                }
             ]
+        },
+        "CoolingDevices": {
+            "RecordVotePerSensor": {
+                "DefaultThresholdEnableAll": true
+            }
+        }
+    }
 }