From 7d716fef5919f5ef15797ccfdabea3c8824a2bbf Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Thu, 1 Jul 2021 11:40:25 +0800
Subject: [PATCH 1/4] audio: waves: update R4 tuning table (20210701)

+ Bass management improves the frequency response at
  volume steps 23 and below.
+ Improved gain staging for clarity, dynamics and removal
  of distortion artefacts
+ Improved stereo balance and bass in landscape
+ Removes tuning bug that applied too much gain correction
  on quiet audio.

The portrait and landscape stereo tunings are retuned, but there
is no change to the speaker-safe tuning for notifications and
ringtones which are performing well.

Bug: 179089856
Test: playback mute on/off, bypass on/off, lr swap/mixed.

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: I85c9347435a5baa43c20b4eb5dbd630efb502a4c
---
 audio/raven/tuning/waves/waves_preset.mps | Bin 183917 -> 186599 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/raven/tuning/waves/waves_preset.mps b/audio/raven/tuning/waves/waves_preset.mps
index f29b7df02b3ad74220f0856a2b19ac686998d4a8..9a6ca1f81b563762220d1128347adbdcd7527902 100644
GIT binary patch
literal 186599
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
XR1?T;vDQrp1rpT++7a0?YJ&d{t(0_r

delta 2815
zcmcJRdrXs86u|HO1Z}B6QNU7LD2DQyxPl0A>b`@C&Ic-0(TKPS;W1wklIa*Mic_-T
z+{E2wR~D!E0!^mUHCfR;_%OQ7#0M-U&c(SBGxrBFF+`%7n%&b6`qj9&&28t8w!d@E
zJ>PkJ_oTnN483~{=IMDk^GYvDB#ID1M~DwHOd`}kNa!x}%_v8Dx?@tw1&IV%NxF?n
zXs=>X)XBa5)XaN3X(m^yq)ck`>^do33gxk5XbRs~CROXoeDX;4#FtCgjP6|fwx|_^
ze4!^g4C0e71L3Pc_&N~U13?LdjzC~(Q%qTeoC(yO4TNt3;oCsqt{i&NJ$vdzz1|!h
z?5on{uA9*o<({+rdXy(`opdZje<W7aZzQCEU9ZV`O8xKiSKgL%kJWD<&ThHmJaIdv
z@p}DHjAIjV_;wv_c%prObv)aaF*t_zI+i{qjXxcOC_<e6Pl^z6{!I}RpS=iA`vO`F
zBT9UQREcR=JjeT~!KQ!SCUhdHD(tLPRr1^GX>gFJ_;JV5CmcO-4YUaKE}RbFbm}|l
z?teNRPi;S)Y!g95cb+-Ouxwk2XKO#rvgxOd6^V*K(Y(H&E(x#AfnXvo(8rBJR;}mV
zoirxwMG!Y?@KSx`Vd;f2G?jN$NoEQxXP=4cSl-N-ump(kdy&Q5>7oU!CDF`!X2uwy
z7*hRV8?Ux=TN=%vGnlhUW`#*Q-G%c)avi|dCYkuDG`fHr2dKg7T@5d4$3`nMLS2uu
zEw;`8JbeN!we(fNEY$iUoYyI{5mE|wp1zwrlC|!)TWdMY(_-9jpO0{;Vp_<RgI<|!
z2}&5-wgVQTQr#!f$|3{|P`Hz&A1JqYITWI5qEBKJv1EoeOa$vVYqvDK0Y#`&b4XK)
zH3t*FbD7$$P0diIc|<Ga2)D3~o`*7rdo&@nq6XFkoP)IpY9ZI;b(*D5X3o?xR>wxD
zK&6^=yi$oUAW}YkcNDM_a}rY9-hvIN^o_DnuWZy}nBa8{`ebgrPsdn3bVIe~e@?DJ
zP)iD7j=AP!*feyg)~di}1oi2|p%&rBl+9&(n+9ZF8AfB+yK@beuw$@IbBk2!5Y)~N
zu<oM7a0k?*N=@;8JG*npB#8oPu8BDghlV*}H=2E-EMgVKupkxoqUy>)oZt<4AA*|2
zfZT+jz8=5J`w`SR-;)m@)I=VCsk{2Jd=Nn$W)F{0q|xze--4hSEvnd*7C%5f`*C~*
zO<<vENvw72JgaRzoJ6adMZbJXi+H1*?M;)Dvq145Crh9MVODpw$RHd}YnCLoWt$xC
zEraj02>ra_f#_dTOJ;JPe97;-vIsg6)RMxW%Wom^EWT8hU^|y5(Sl?nT=$z`1^kTQ
zt31*OUcZG*;2o2wY;=DHH&I!M7ovg!H)c^23(w0;c0jM+TUiFbA*indf!lry$z~BF
zWn=YWxQn`l_)0qou&$#fi4f*-WF*V*KyxpLhX}q_bcetr&63D-uF-;UuRNRzhausu
z*)+rbX?hUl-k)fqG@*t4kg+VK)(I(ox7t~diZJx>=lm98<_(iYGaD8~GViKjsnN=u
z;qyZwTk{}1?gd(4F+#qkTMA1M)YtNAJ8SB+v;B*wv)*F{>wzP%QuB;diV%GJrZ5<o
z%V=kge6T9zuv+sPrL56lwD9VRVa@ru7P1vyLxcLDP-O#xx)$_o<&H93O`A|Rw3;>}
z46df`9lq7{4yx3-n3Q@1RU&wVnU>+^`9O;hqA-M^&BMCZm0H9m*`pncR6ao%+$7BA
zDzl2k(2P1Y%X4xI!r)>6=Dk;tL{9hvh%4WUpk^GYxDW=fyoa8l-_w^xe*g2Iw3NU7
zCyh;8Zeq78KWDS2u4c;AS3OM?(m5$C7I=urTa|Il)fOYx67LvC?JO%N6Mx^iEM*Q$
XCX^eqr4;^4mh`5e5+Bi0{7U)*kDCgn


From a17c45af94c34049a55fcc47d328f58414c09e93 Mon Sep 17 00:00:00 2001
From: lbill <lbill@google.com>
Date: Thu, 1 Jul 2021 13:39:17 +0000
Subject: [PATCH 2/4] Adjust status bar rounded corner and display cutout
 region

- Customize status_bar_height_portrait/landscape/keyguard
- Adjust punch hole display cutout region
- Adjust rounded radius for window corner

Test: atest SystemUITests
Test: atest android.systemui.cts.WindowInsetsBehaviorTests
Test: manual check visual
Bug: 190381022
Change-Id: If98f721f3e20270c5edfdc3b2f34ff8b8af41de4
---
 .../base/core/res/res/values/config.xml       | 19 +++++++++++++++----
 .../packages/SystemUI/res/values/dimens.xml   |  6 ++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index b39b485..b2b1360 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -33,17 +33,17 @@
     </string>
 
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
-        M 655,0
-        h 126
+        M 653,0
+        h 130
         v 130
-        h -126
+        h -130
         Z
         @left
     </string>
 
 
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">25px</dimen>
+    <dimen name="rounded_corner_radius">38px</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>
@@ -168,4 +168,15 @@
 
     <!-- The max vibration strength allowed in audio haptic channels. -->
     <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.3</item>
+
+    <!-- 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">145px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
+
+    <!-- Height of area above QQS where battery/time go (equal to status bar) -->
+    <dimen name="quick_qs_offset_height">145px</dimen>
+
+    <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
 </resources>
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 9de5e14..68c8115 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -17,7 +17,10 @@
 -->
 <resources>
     <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">5px</dimen>
+    <dimen name="rounded_corner_content_padding">50px</dimen>
+
+    <!-- the padding on the top of the statusbar (usually 0) -->
+    <dimen name="status_bar_padding_top">1px</dimen>
 
     <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
     The icons always have a 4dp padding in the container so we only need 56 extra px of padding
@@ -44,7 +47,6 @@
 
     <bool name="config_enableDisplayCutoutProtection">true</bool>
 
-
     <!-- Location on the screen of the center of the physical power button. -->
     <dimen name="physical_power_button_center_screen_location_y">940px</dimen>
 

From 3dbd9530be8a2c627e57a28bc7a13d8d2c565ce5 Mon Sep 17 00:00:00 2001
From: Lais Andrade <lsandrade@google.com>
Date: Thu, 1 Jul 2021 16:52:15 +0100
Subject: [PATCH 3/4] Set vibrator ramp down duration

Bug: 188431691
Test: manual
Change-Id: Id029afe5c0d6fa59425c4407da56fed69f083bc1
---
 oriole/overlay/frameworks/base/core/res/res/values/config.xml | 4 ++++
 raven/overlay/frameworks/base/core/res/res/values/config.xml  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index e96e8e0..38e875c 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -214,4 +214,8 @@
 
     <!-- The max vibration strength allowed in audio haptic channels. -->
     <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.3</item>
+
+    <!-- The duration (in milliseconds) that should be applied to waveform vibrations that ends in
+         non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
+    <integer name="config_vibrationWaveformRampDownDuration">50</integer>
 </resources>
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index b39b485..aec5d38 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -168,4 +168,8 @@
 
     <!-- The max vibration strength allowed in audio haptic channels. -->
     <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.3</item>
+
+    <!-- The duration (in milliseconds) that should be applied to waveform vibrations that ends in
+         non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
+    <integer name="config_vibrationWaveformRampDownDuration">50</integer>
 </resources>

From b0c9a1ae1b63b87bc0981cb2e5d8e4ed751df038 Mon Sep 17 00:00:00 2001
From: Frank Luo <luofrank@google.com>
Date: Wed, 30 Jun 2021 15:08:19 +0800
Subject: [PATCH 4/4] Set config_suspendWhenScreenOffDueToProximity true

This config indicate whether to allow the device to suspend
when the screen is off due to the proximity sensor.  This
resource should only be set to true if the sensor HAL correctly
handles the proximity sensor as a wake-up source. Otherwise,
the device may fail to wake out of suspend reliably.

Bug: 192324731
Test: 1. Unplug USB. 2. make a phone call.
Test: 3. Cover p-sensor, the screen turns off for 10 seconds
Test: 4. Uncover p-sensor. 5. Plug USB.
Test: 6. 'adb shell dmesg | grep suspend' to check if AP ever suspend in calls.
Change-Id: I90c0ef56211908b5a211d9f887bbfc6693a3be40
---
 .../overlay/frameworks/base/core/res/res/values/config.xml | 7 +++++++
 .../overlay/frameworks/base/core/res/res/values/config.xml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 38e875c..f0a2ee4 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -18,6 +18,13 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Indicate whether to allow the device to suspend when the screen is off
+         due to the proximity sensor.  This resource should only be set to true
+         if the sensor HAL correctly handles the proximity sensor as a wake-up source.
+         Otherwise, the device may fail to wake out of suspend reliably.
+         The default is false. -->
+    <bool name="config_suspendWhenScreenOffDueToProximity">true</bool>
+
     <!-- Flag indicating whether the we should enable the automatic brightness in Settings.
          Software implementation will be used if config_hardware_auto_brightness_available is not set -->
     <bool name="config_automatic_brightness_available">true</bool>
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index aec5d38..06da015 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -54,6 +54,13 @@
     <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
     <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
 
+    <!-- Indicate whether to allow the device to suspend when the screen is off
+         due to the proximity sensor.  This resource should only be set to true
+         if the sensor HAL correctly handles the proximity sensor as a wake-up source.
+         Otherwise, the device may fail to wake out of suspend reliably.
+         The default is false. -->
+    <bool name="config_suspendWhenScreenOffDueToProximity">true</bool>
+
     <!-- Flag indicating whether the we should enable the automatic brightness in Settings.
          Software implementation will be used if config_hardware_auto_brightness_available is not set -->
     <bool name="config_automatic_brightness_available">true</bool>