[automerge] Update Crosshatch SVN to 62 2p: 4c29ec651f am: aa179e43bd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/16521006
Change-Id: I2c27ac2665a03e5839d37b7d41e2018f90360448
diff --git a/blueline/overlay/frameworks/base/core/res/res/values/config.xml b/blueline/overlay/frameworks/base/core/res/res/values/config.xml
index 1686dda..701a67a 100755
--- a/blueline/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/blueline/overlay/frameworks/base/core/res/res/values/config.xml
@@ -689,4 +689,6 @@
<item>G013B</item>
</string-array>
+ <!-- the number of the max cached processes in the system. -->
+ <integer name="config_customizedMaxCachedProcesses">64</integer>
</resources>
diff --git a/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml b/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml
index 4712362..31bd5a4 100644
--- a/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -24,10 +24,10 @@
<!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
<dimen name="rounded_corner_radius_adjustment">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">28dp</dimen>
- <dimen name="status_bar_height_landscape">24dp</dimen>
+ <!-- Height of the status bar.
+ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+ -->
+ <dimen name="status_bar_height">28dp</dimen>
<dimen name="quick_qs_offset_height">28dp</dimen>
</resources>
diff --git a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index ebfdcb1..f9bd6ad 100644
--- a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -21,8 +21,8 @@
<!-- the padding on the top of the statusbar (usually 0) -->
<dimen name="status_bar_padding_top">1px</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>
+ <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
+ <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
<!-- Margin on the right side of the system icon group on Keyguard. -->
<dimen name="system_icons_keyguard_padding_end">9dp</dimen>
diff --git a/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml b/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml
index 2501aff..516e0ba 100755
--- a/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml
@@ -729,14 +729,10 @@
-->
<bool name="config_fillMainBuiltInDisplayCutout">true</bool>
- <!-- Height of the status bar -->
- <dimen name="status_bar_height_portrait">171px</dimen>
- <dimen name="status_bar_height_landscape">28dp</dimen>
- <!-- Height of area above QQS where battery/time go (equal to status bar height if > 48dp) -->
- <dimen name="quick_qs_offset_height">171px</dimen>
- <!-- Total height of QQS (quick_qs_offset_height + 128dp) -->
- <dimen name="quick_qs_total_height">177dp</dimen>
-
+ <!-- Height of the status bar.
+ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+ -->
+ <dimen name="status_bar_height">28dp</dimen>
<dimen name="rounded_corner_radius_top">133px</dimen>
<dimen name="rounded_corner_radius_bottom">70px</dimen>
@@ -751,4 +747,7 @@
<string-array name="config_disableApkUnlessMatchedSku_skus_list" translatable="false">
<item>G013D</item>
</string-array>
+
+ <!-- the number of the max cached processes in the system. -->
+ <integer name="config_customizedMaxCachedProcesses">64</integer>
</resources>
diff --git a/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index c0fe31b..3752f76 100644
--- a/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -20,8 +20,8 @@
<dimen name="display_cutout_margin_consumption">0px</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>
+ <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
+ <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
<!-- Margin on the right side of the system icon group on Keyguard. -->
<dimen name="system_icons_keyguard_padding_end">9dp</dimen>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 1cbe1e5..7e9d21d 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -43,7 +43,4 @@
<!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
<bool name="doze_double_tap_reports_touch_coordinates">true</bool>
-
- <!-- Whether global actions should show an informational message about changes in S -->
- <bool name="global_actions_show_change_info">true</bool>
</resources>
