From acf62bc171e3b5bf30def5ea8b56d8d78c693de5 Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Fri, 7 Jan 2022 17:09:27 +0000 Subject: [PATCH 1/3] Add PWLE notification vibration patterns for P21 devices Add the PWLE vibration pattern to the config.xml overlays for Pixel 2021 devices that support frequency control. The patterns use the amplitude and frequency hand-designed for both raven and oriole devices. The amplitude is using the maximum supported value of 0.4, to allow scaling based on user settings. Bug: 212366218 Test: manual Change-Id: I73a2f3e50901b80aef299f4c8e9807a551170bbc --- .../base/core/res/res/values/config.xml | 82 +++++++++++++++++++ .../base/core/res/res/values/config.xml | 82 +++++++++++++++++++ 2 files changed, 164 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 f2bc440..cafb93d 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -227,6 +227,88 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 + + + 0.0 + 60.0 + 0.0 + + 0.4 + 120.0 + 100.0 + + 0.4 + 120.0 + 100.0 + + 0.0 + 60.0 + 100.0 + + 0.0 + 60.0 + 100.0 + + 0.4 + 120.0 + 100.0 + + 0.4 + 120.0 + 100.0 + + 0.0 + 60.0 + 100.0 + + + + + 0.0 + 60.0 + 0.0 + + 0.4 + 120.0 + 50.0 + + 0.4 + 120.0 + 100.0 + + 0.0 + 60.0 + 50.0 + + 0.0 + 60.0 + 100.0 + + 0.4 + 120.0 + 50.0 + + 0.4 + 120.0 + 100.0 + + 0.0 + 60.0 + 50.0 + + 64 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 c68e625..9c9e945 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -195,6 +195,88 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 + + + 0.0 + 60.0 + 0.0 + + 0.4 + 120.0 + 100.0 + + 0.4 + 120.0 + 100.0 + + 0.0 + 60.0 + 100.0 + + 0.0 + 60.0 + 100.0 + + 0.4 + 120.0 + 100.0 + + 0.4 + 120.0 + 100.0 + + 0.0 + 60.0 + 100.0 + + + + + 0.0 + 60.0 + 0.0 + + 0.4 + 120.0 + 50.0 + + 0.4 + 120.0 + 100.0 + + 0.0 + 60.0 + 50.0 + + 0.0 + 60.0 + 100.0 + + 0.4 + 120.0 + 50.0 + + 0.4 + 120.0 + 100.0 + + 0.0 + 60.0 + 50.0 + + From aa73129ab37a1c4f14096d24a35e171e3d3cfd0b Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Fri, 7 Jan 2022 17:09:27 +0000 Subject: [PATCH 2/3] Add PWLE notification vibration patterns for P21 devices Add the PWLE vibration pattern to the config.xml overlays for Pixel 2021 devices that support frequency control. The patterns use the amplitude and frequency hand-designed for both raven and oriole devices. The amplitude is using the maximum supported value of 0.4, to allow scaling based on user settings. Bug: 212366218 Test: manual Change-Id: I73a2f3e50901b80aef299f4c8e9807a551170bbc Merged-In: I73a2f3e50901b80aef299f4c8e9807a551170bbc --- .../base/core/res/res/values/config.xml | 82 +++++++++++++++++++ .../base/core/res/res/values/config.xml | 82 +++++++++++++++++++ 2 files changed, 164 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 f2bc440..cf57ec0 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -227,6 +227,88 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 + + + 0.0 + -0.85 + 0.0 + + 0.4 + -0.25 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 100.0 + + 0.0 + -0.85 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 100.0 + + + + + 0.0 + -0.85 + 0.0 + + 0.4 + -0.25 + 50.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 50.0 + + 0.0 + -0.85 + 100.0 + + 0.4 + -0.25 + 50.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 50.0 + + 64 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 7da850b..491a4cc 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -195,6 +195,88 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 + + + 0.0 + -0.85 + 0.0 + + 0.4 + -0.25 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 100.0 + + 0.0 + -0.85 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 100.0 + + + + + 0.0 + -0.85 + 0.0 + + 0.4 + -0.25 + 50.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 50.0 + + 0.0 + -0.85 + 100.0 + + 0.4 + -0.25 + 50.0 + + 0.4 + -0.25 + 100.0 + + 0.0 + -0.85 + 50.0 + + From db13b85d51e5b6c5327423e04401affa801d0cb1 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 7 Jan 2022 16:03:00 -0800 Subject: [PATCH 3/3] Inline usages of LOCAL_STEM Having no variables in include/inherit-product statements makes the conversion to starlark cleaner. Bug: 211659921 Test: Presubmits Change-Id: Icf9126f27d81486847d07224a49f92c19e4a49d5 --- self-extractors_oriole/root/proprietary/BoardConfigVendor.mk | 4 +--- self-extractors_oriole/root/proprietary/device-vendor.mk | 4 +--- self-extractors_raven/root/proprietary/BoardConfigVendor.mk | 4 +--- self-extractors_raven/root/proprietary/device-vendor.mk | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk b/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk index fa00b92..a632ec4 100644 --- a/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk +++ b/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := oriole/BoardConfigPartial.mk - --include vendor/google_devices/$(LOCAL_STEM) +-include vendor/google_devices/oriole/BoardConfigPartial.mk diff --git a/self-extractors_oriole/root/proprietary/device-vendor.mk b/self-extractors_oriole/root/proprietary/device-vendor.mk index aa3ae50..2c4443b 100644 --- a/self-extractors_oriole/root/proprietary/device-vendor.mk +++ b/self-extractors_oriole/root/proprietary/device-vendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := oriole/device-partial.mk - -$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/google_devices/oriole/BoardConfigPartial.mk) diff --git a/self-extractors_raven/root/proprietary/BoardConfigVendor.mk b/self-extractors_raven/root/proprietary/BoardConfigVendor.mk index 25a880e..6e788fc 100644 --- a/self-extractors_raven/root/proprietary/BoardConfigVendor.mk +++ b/self-extractors_raven/root/proprietary/BoardConfigVendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := raven/BoardConfigPartial.mk - --include vendor/google_devices/$(LOCAL_STEM) +-include vendor/google_devices/raven/BoardConfigPartial.mk diff --git a/self-extractors_raven/root/proprietary/device-vendor.mk b/self-extractors_raven/root/proprietary/device-vendor.mk index 4877f39..2be1993 100644 --- a/self-extractors_raven/root/proprietary/device-vendor.mk +++ b/self-extractors_raven/root/proprietary/device-vendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := raven/device-partial.mk - -$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/google_devices/raven/device-partial.mk)