Redfin corner updates
Bottom corners on this device are non-square, so rounded_corner_bottom
reflects that.
- Status bar set to 145px (52dp)
- Updated bottom and top paths
- Status bar top padding set to 2dp for better centering of icons
Test: visual
Bug: 156017682
Bug: 156017028
Bug: 156016494
Bug: 157612517
Change-Id: I0883b97569e7174bf2a67611ca03137da2f37894
diff --git a/redfin/overlay/frameworks/base/core/res/res/values/config.xml b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
index 121aa85..fdd43dc 100755
--- a/redfin/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
@@ -213,12 +213,10 @@
<!-- 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">136px</dimen>
+ <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">136px</dimen>
- <!-- Total height of QQS (quick_qs_offset_height + 128) -->
- <dimen name="quick_qs_total_height">488px</dimen>
+ <dimen name="quick_qs_offset_height">145px</dimen>
<!-- Not allow to switch to higher refresh rate when display brightness setting is
equal or less than this value -->
diff --git a/redfin/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/redfin/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
new file mode 100644
index 0000000..e62f04f
--- /dev/null
+++ b/redfin/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
@@ -0,0 +1,23 @@
+<!--
+ Copyright (C) 2020 The Android Open Source Project
+
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="260px"
+ android:height="237px"
+ android:viewportWidth="260.0"
+ android:viewportHeight="237.0">
+
+ <path
+ android:pathData="M259.51,0C226.69,0 180.55,-0.1 147.73,0.89C137.84,1.19 127.96,1.6 118.09,2.3C109.36,2.92 100.68,3.76 92.02,5.14C73.26,8.13 56.11,13.49 40.55,25.27C32.5,31.36 25.5,38.72 19.83,47.06C14.93,54.25 11.23,61.78 8.47,70.03C5.73,78.23 4.15,86.55 3.09,95.11C1.86,105.12 1.33,115.14 0.96,125.21C-0.11,154.31 0,207.89 0,237L0,0L259.51,0Z"
+ android:fillColor="#000000" />
+</vector>
diff --git a/redfin/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml b/redfin/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
new file mode 100644
index 0000000..a9d8302
--- /dev/null
+++ b/redfin/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
@@ -0,0 +1,23 @@
+<!--
+ Copyright (C) 2020 The Android Open Source Project
+
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="216px"
+ android:height="216px"
+ android:viewportWidth="216.0"
+ android:viewportHeight="216.0">
+
+ <path
+ android:pathData="M0,216C0,187.36 -0.13,148.14 1.23,119.51C1.64,110.9 2.2,102.32 3.16,93.76C3.99,86.31 5.11,78.95 6.9,71.65C8.66,64.49 11.01,57.69 14.35,51.09C18.34,43.19 23.47,36.1 29.74,29.84C36,23.58 43.09,18.46 50.99,14.47C57.6,11.14 64.4,8.79 71.56,7.04C78.86,5.25 86.22,4.13 93.68,3.3C102.25,2.34 110.83,1.78 119.44,1.37C148.1,0.01 187.34,0.15 216,0.15L0.07,0L0,216Z"
+ android:fillColor="#000000" />
+</vector>
diff --git a/redfin/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml b/redfin/overlay/frameworks/base/packages/SystemUI/res/values-land/dimens.xml
similarity index 100%
rename from redfin/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml
rename to redfin/overlay/frameworks/base/packages/SystemUI/res/values-land/dimens.xml
diff --git a/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 089bd08..0e34711 100644
--- a/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -30,7 +30,7 @@
brightness, suitable to listen to while the device is asleep (e.g. during
always-on display) -->
<string name="doze_brightness_sensor_type" translatable="false">com.google.sensor.binned_brightness</string>
-
+
<!-- Override value to use for proximity sensor. -->
<string name="proximity_sensor_type" translatable="false">android.sensor.light</string>
@@ -54,6 +54,9 @@
<!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
<bool name="doze_double_tap_reports_touch_coordinates">true</bool>
+ <!-- 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>
+
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
to brightness values; -1 means keeping the current brightness. -->
<integer-array name="config_doze_brightness_sensor_to_brightness">
@@ -96,5 +99,9 @@
<!-- Camera 1 is the front camera on bramble -->
<string translatable="false" name="config_protectedCameraId">1</string>
+ <!-- Comma-separated list of packages to exclude from camera protection. In our case,
+ ignore the gaze detection package -->
+ <string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string>
+
<bool name="config_enableDisplayCutoutProtection">true</bool>
</resources>
diff --git a/redfin/overlay/frameworks/base/packages/SystemUI/res/values/dimen.xml b/redfin/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
similarity index 96%
rename from redfin/overlay/frameworks/base/packages/SystemUI/res/values/dimen.xml
rename to redfin/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index bb9b2b8..f552865 100644
--- a/redfin/overlay/frameworks/base/packages/SystemUI/res/values/dimen.xml
+++ b/redfin/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -21,7 +21,7 @@
<!-- for 20dp of padding at 3.5px/dp at default density -->
<dimen name="rounded_corner_content_padding">50px</dimen>
<!-- the padding on the top of the statusbar (usually 0) -->
- <dimen name="status_bar_padding_top">1dp</dimen>
+ <dimen name="status_bar_padding_top">2dp</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
for the corners -->
