summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-12-08 13:13:08 -0800
committerXin Li <delphij@google.com>2023-12-08 13:13:08 -0800
commit8c97f923fff8f9c764f7038c589e1aa2caf6be13 (patch)
tree051bb5a58a248249674e79ee0fa49d0ff35f8d58
parent67caafe89052bbe73ee2dfa280952050fa11095f (diff)
parentd5f0022d182334ee856ff1c07b95b442586412c9 (diff)
downloadgoldfish-8c97f923fff8f9c764f7038c589e1aa2caf6be13.tar.gz
Merge Android 14 QPR1
Merged-In: I5e7233f63e3eaea97d998b10f7d7bddbe6d4fd73 Bug: 315507370 Change-Id: If80f9686e43ac6ab1b3398d288b2d84980ae1081
-rw-r--r--MultiDisplayProvider/AndroidManifest.xml1
-rw-r--r--overlay/frameworks/base/packages/overlays/pixel_8/SystemUIOverlay/res/values/dimens.xml2
-rw-r--r--overlay/frameworks/base/packages/overlays/pixel_8_pro/SystemUIOverlay/res/values/dimens.xml1
3 files changed, 3 insertions, 1 deletions
diff --git a/MultiDisplayProvider/AndroidManifest.xml b/MultiDisplayProvider/AndroidManifest.xml
index 3b3b1e34..27886537 100644
--- a/MultiDisplayProvider/AndroidManifest.xml
+++ b/MultiDisplayProvider/AndroidManifest.xml
@@ -32,6 +32,7 @@
<service android:name=".MultiDisplayService"
android:label="@string/app_name"
+ android:singleUser="true"
android:exported="true">
</service>
diff --git a/overlay/frameworks/base/packages/overlays/pixel_8/SystemUIOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_8/SystemUIOverlay/res/values/dimens.xml
index 01422a6a..dbb961d1 100644
--- a/overlay/frameworks/base/packages/overlays/pixel_8/SystemUIOverlay/res/values/dimens.xml
+++ b/overlay/frameworks/base/packages/overlays/pixel_8/SystemUIOverlay/res/values/dimens.xml
@@ -17,7 +17,7 @@
-->
<resources>
<!-- Don't need the left side padding due to being inset from the cutout -->
- <dimen name="status_bar_padding_start">0dp</dimen>
+ <dimen name="status_bar_padding_start">16dp</dimen>
<!-- the padding on the top of the statusbar (usually 0) -->
<dimen name="status_bar_padding_top">1px</dimen>
diff --git a/overlay/frameworks/base/packages/overlays/pixel_8_pro/SystemUIOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_8_pro/SystemUIOverlay/res/values/dimens.xml
index 7b628bc9..fe55c16d 100644
--- a/overlay/frameworks/base/packages/overlays/pixel_8_pro/SystemUIOverlay/res/values/dimens.xml
+++ b/overlay/frameworks/base/packages/overlays/pixel_8_pro/SystemUIOverlay/res/values/dimens.xml
@@ -16,6 +16,7 @@
*/
-->
<resources>
+ <dimen name="status_bar_padding_start">16dp</dimen>
<!-- Location on the screen of the center of the physical power button. -->
<dimen name="physical_power_button_center_screen_location_y">774px</dimen>