Snap for 6746904 from d8889a6e91783e3143dda924c305c05c82416d7a to rvc-qpr1-release

Change-Id: I028e2ba2181224aeb4be3fc74deb9b989732ef5b
diff --git a/bramble/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/bramble/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index b06c535..9f6fab0 100644
--- a/bramble/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/bramble/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -17,9 +17,6 @@
 -->
 
 <resources>
-    <!-- Don't need the left side padding due to being inset from the cutout -->
-    <dimen name="status_bar_padding_start">0dp</dimen>
-
     <!-- for 20dp of padding at 3.5px/dp at default density -->
     <dimen name="rounded_corner_content_padding">50px</dimen>
 
diff --git a/bramble/overlay_packages/SettingsOverlayG025E/Android.bp b/bramble/overlay_packages/SettingsOverlayG025E/Android.bp
new file mode 100644
index 0000000..8b917cc
--- /dev/null
+++ b/bramble/overlay_packages/SettingsOverlayG025E/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "SettingsOverlayG025E",
+    product_specific: true,
+}
diff --git a/bramble/overlay_packages/SettingsOverlayG025E/AndroidManifest.xml b/bramble/overlay_packages/SettingsOverlayG025E/AndroidManifest.xml
new file mode 100644
index 0000000..ac25f1f
--- /dev/null
+++ b/bramble/overlay_packages/SettingsOverlayG025E/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.g025e">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="G025E"
+             android:isStatic="true"
+             android:priority="10" />
+</manifest>
diff --git a/bramble/overlay_packages/SettingsOverlayG025E/res/drawable/regulatory_info.png b/bramble/overlay_packages/SettingsOverlayG025E/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..085a349
--- /dev/null
+++ b/bramble/overlay_packages/SettingsOverlayG025E/res/drawable/regulatory_info.png
Binary files differ
diff --git a/bramble/overlay_packages/SettingsOverlayG6QU3/Android.bp b/bramble/overlay_packages/SettingsOverlayG6QU3/Android.bp
new file mode 100644
index 0000000..e04c26b
--- /dev/null
+++ b/bramble/overlay_packages/SettingsOverlayG6QU3/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "SettingsOverlayG6QU3",
+    product_specific: true,
+}
diff --git a/bramble/overlay_packages/SettingsOverlayG6QU3/AndroidManifest.xml b/bramble/overlay_packages/SettingsOverlayG6QU3/AndroidManifest.xml
new file mode 100644
index 0000000..0260f31
--- /dev/null
+++ b/bramble/overlay_packages/SettingsOverlayG6QU3/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.g6qu3">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="G6QU3"
+             android:isStatic="true"
+             android:priority="10" />
+</manifest>
diff --git a/bramble/overlay_packages/SettingsOverlayG6QU3/res/drawable/regulatory_info.png b/bramble/overlay_packages/SettingsOverlayG6QU3/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..b2acff7
--- /dev/null
+++ b/bramble/overlay_packages/SettingsOverlayG6QU3/res/drawable/regulatory_info.png
Binary files differ
diff --git a/device-bramble.mk b/device-bramble.mk
index bee7dda..169eaf6 100644
--- a/device-bramble.mk
+++ b/device-bramble.mk
@@ -191,4 +191,6 @@
 PRODUCT_PACKAGES += \
     SettingsOverlayG025H \
     FrameworkOverlayG6QU3 \
-    SettingsOverlayG025I
+    SettingsOverlayG025I \
+    SettingsOverlayG6QU3 \
+    SettingsOverlayG025E
diff --git a/vibrator/drv2624/Vibrator.cpp b/vibrator/drv2624/Vibrator.cpp
index 8129dcf..c2658df 100644
--- a/vibrator/drv2624/Vibrator.cpp
+++ b/vibrator/drv2624/Vibrator.cpp
@@ -75,6 +75,7 @@
 #define SENSOR_DATA_NUM 20
 // Set sensing period to 2s
 #define SENSING_PERIOD 2000000000
+#define VIBRATION_MOTION_TIME_THRESHOLD 100
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
 int GSensorCallback(__attribute__((unused)) int fd, __attribute__((unused)) int events,
@@ -464,7 +465,9 @@
         if (temperature > TEMP_UPPER_BOUND) {
             mSteadyConfig->odClamp = &mSteadyTargetOdClamp[0];
             mSteadyConfig->olLraPeriod = mSteadyOlLraPeriod;
-            if (!motionAwareness()) {
+            // TODO: b/162346934 This a compromise way to bypass the motion
+            // awareness delay
+            if ((timeoutMs > VIBRATION_MOTION_TIME_THRESHOLD) && (!motionAwareness())) {
                 return on(timeoutMs, RTP_MODE, mSteadyConfig, 2);
             }
         } else if (temperature < TEMP_LOWER_BOUND) {