From 17c867d4fe61bb0aca1f67c079317c2f6861093b Mon Sep 17 00:00:00 2001
From: Marc Bourgoin <themard85@gmail.com>
Date: Sun, 4 Sep 2022 07:31:06 -0600
Subject: [PATCH] dubai: Import framework values from stock vendor

Also rename all entries of interger-array to just array

Change-Id: If12ecb6b0b4344ec491d15480a741d527c692e6c
---
 .../dubai/Frameworks/res/values/config.xml    | 121 +++++++++---------
 .../dubai/Frameworks/res/values/dimens.xml    |   6 +-
 2 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/resource-overlay/dubai/Frameworks/res/values/config.xml b/resource-overlay/dubai/Frameworks/res/values/config.xml
index 8350c69..0f8a8a5 100644
--- a/resource-overlay/dubai/Frameworks/res/values/config.xml
+++ b/resource-overlay/dubai/Frameworks/res/values/config.xml
@@ -24,7 +24,10 @@
          backlight values for LUX levels between these control points.
 
          Must be overridden in platform specific overlays -->
-    <integer-array name="config_autoBrightnessLevels">
+    <array name="config_autoBrightnessLevels">
+        <item>2</item>
+        <item>4</item>
+        <item>5</item>
         <item>10</item>
         <item>40</item>
         <item>100</item>
@@ -32,7 +35,7 @@
         <item>1250</item>
         <item>3500</item>
         <item>5500</item>
-    </integer-array>
+    </array>
 
     <!-- Array of desired screen brightness in nits corresponding to the lux values
          in the config_autoBrightnessLevels array. As with config_screenBrightnessMinimumNits and
@@ -48,31 +51,37 @@
          array. The brightness values must be non-negative and non-decreasing. This must be
          overridden in platform specific overlays -->
     <array name="config_autoBrightnessDisplayValuesNits">
+        <item>2</item>
+        <item>7</item>
         <item>10</item>
-        <item>20</item>
-        <item>80</item>
-        <item>93</item>
-        <item>125</item>
-        <item>161</item>
-        <item>212</item>
-        <item>420</item>
+        <item>12</item>
+        <item>24</item>
+        <item>95</item>
+        <item>111</item>
+        <item>149</item>
+        <item>192</item>
+        <item>252</item>
+        <item>500</item>
     </array>
 
     <!-- An array describing the screen's backlight values corresponding to the brightness
          values in the config_screenBrightnessNits array.
 
          This array should be equal in size to config_screenBrightnessBacklight. -->
-    <integer-array name="config_screenBrightnessBacklight">
+    <array name="config_screenBrightnessBacklight">
         <item>0</item>
-        <item>8</item>
+        <item>1</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
         <item>12</item>
         <item>48</item>
-        <item>56</item>
-        <item>78</item>
-        <item>99</item>
-        <item>122</item>
+        <item>57</item>
+        <item>76</item>
+        <item>98</item>
+        <item>129</item>
         <item>255</item>
-    </integer-array>
+    </array>
 
     <!-- An array of floats describing the screen brightness in nits corresponding to the backlight
          values in the config_screenBrightnessBacklight array.  On OLED displays these  values
@@ -83,14 +92,17 @@
          This array should be equal in size to config_screenBrightnessBacklight -->
     <array name="config_screenBrightnessNits">
         <item>0</item>
+        <item>2</item>
+        <item>7</item>
         <item>10</item>
-        <item>20</item>
-        <item>80</item>
-        <item>93</item>
-        <item>125</item>
-        <item>161</item>
-        <item>212</item>
-        <item>420</item>
+        <item>12</item>
+        <item>24</item>
+        <item>95</item>
+        <item>111</item>
+        <item>149</item>
+        <item>192</item>
+        <item>252</item>
+        <item>500</item>
     </array>
 
     <!-- Stability requirements in milliseconds for accepting a new brightness level.  This is used
@@ -98,8 +110,8 @@
          when adapting to brighter or darker environments.  This parameter controls how quickly
          brightness changes occur in response to an observed change in light level that exceeds the
          hysteresis threshold. -->
-    <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
-    <integer name="config_autoBrightnessDarkeningLightDebounce">8000</integer>
+    <integer name="config_autoBrightnessBrighteningLightDebounce">500</integer>
+    <integer name="config_autoBrightnessDarkeningLightDebounce">500</integer>
 
     <!-- The bounding path of the cutout region of the main built-in display.
          Must either be empty if there is no cutout region, or a string that is parsable by
@@ -123,11 +135,10 @@
          @see https://www.w3.org/TR/SVG/paths.html#PathData
          -->
     <string translatable="false" name="config_mainBuiltInDisplayCutout">
-        M 0,0
-        h -35
-		v 90
-		h 70
-		v -90
+        M -35,0
+        L 35,0
+		L 35,105
+		L -35,105
 		Z
 	</string>
 
@@ -183,50 +194,44 @@
     <!-- Screen brightness used to dim the screen when the user activity
          timeout expires.  May be less than the minimum allowed brightness setting
          that can be set by the user. -->
-    <integer name="config_screenBrightnessDim">10</integer>
+    <integer name="config_screenBrightnessDim">2</integer>
 
     <!-- Minimum screen brightness setting allowed by the power manager.
          The user is forbidden from setting the brightness below this level. -->
-    <integer name="config_screenBrightnessSettingMinimum">10</integer>
+    <integer name="config_screenBrightnessSettingMinimum">2</integer>
 
     <!-- Vibrator pattern for feedback about a long screen/key press -->
-    <integer-array name="config_longPressVibePattern">
+    <array name="config_longPressVibePattern">
         <item>0</item>
-        <item>1</item>
-        <item>20</item>
-        <item>21</item>
-    </integer-array>
+        <item>67</item>
+    </array>
 
     <!-- Vibrator pattern for feedback about touching a virtual key -->
-    <integer-array name="config_virtualKeyVibePattern">
+    <array name="config_virtualKeyVibePattern">
         <item>0</item>
-        <item>10</item>
-        <item>20</item>
-        <item>30</item>
-    </integer-array>
+        <item>67</item>
+    </array>
 
     <!-- Vibrator pattern for a very short but reliable vibration for soft keyboard tap -->
-    <integer-array name="config_keyboardTapVibePattern">
-        <item>40</item>
-    </integer-array>
+    <array name="config_keyboardTapVibePattern">
+        <item>0</item>
+        <item>30</item>
+    </array>
 
     <!-- Vibrator pattern for feedback about booting with safe mode enabled -->
-    <integer-array name="config_safeModeEnabledVibePattern">
+    <array name="config_safeModeEnabledVibePattern">
         <item>0</item>
-        <item>1</item>
-        <item>20</item>
-        <item>21</item>
-        <item>500</item>
-        <item>600</item>
-    </integer-array>
+        <item>0</item>
+        <item>94</item>
+    </array>
 
     <!-- Vibrator pattern for feedback about hitting a scroll barrier -->
-    <integer-array name="config_scrollBarrierVibePattern">
+    <array name="config_scrollBarrierVibePattern">
         <item>0</item>
         <item>15</item>
-        <item>10</item>
-        <item>10</item>
-    </integer-array>
+        <item>30</item>
+        <item>15</item>
+    </array>
 
     <!-- True if the device supports system navigation keys. -->
     <bool name="config_supportSystemNavigationKeys">true</bool>
@@ -276,10 +281,10 @@
     <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motov1/Profile/motov1.rdf</string>
 
     <!-- List supported color modes. -->
-    <integer-array name="config_availableColorModes">
+    <array name="config_availableColorModes">
         <item>0</item> <!-- COLOR_MODE_NATURAL -->     <!-- This uses colorimetric render intents-->
         <item>1</item> <!-- COLOR_MODE_BOOSTED -->     <!-- This applies a 10% boost using the PCC-->
         <item>2</item> <!-- COLOR_MODE_SATURATED -->
         <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->   <!-- This uses enhanced render intents-->
-    </integer-array>
+    </array>
 </resources>
diff --git a/resource-overlay/dubai/Frameworks/res/values/dimens.xml b/resource-overlay/dubai/Frameworks/res/values/dimens.xml
index 40f04fc..06a5743 100644
--- a/resource-overlay/dubai/Frameworks/res/values/dimens.xml
+++ b/resource-overlay/dubai/Frameworks/res/values/dimens.xml
@@ -5,11 +5,11 @@
 -->
 <resources>
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">24.0dip</dimen>
+    <dimen name="rounded_corner_radius">95.0px</dimen>
 
     <!-- Height of the status bar in portrait. The height should be
          Max((status bar content height + waterfall top size), top cutout size) -->
-    <dimen name="status_bar_height_portrait">24.0dip</dimen>
+    <dimen name="status_bar_height_portrait">105.0px</dimen>
 
-    <dimen name="status_bar_padding_top_portrait">0.0px</dimen>
+    <dimen name="status_bar_padding_top_portrait">20.0px</dimen>
 </resources>