Skip to content

Commit

Permalink
Opt-out of edge to edge enforcement on Android 15 (#5219)
Browse files Browse the repository at this point in the history
**Story:**
https://app.shortcut.com/simpledotorg/story/14491/handle-edge-to-edge-enforcement-in-android-15

## Description

Stop-gap until we handle window insets properly in all screens and
components
  • Loading branch information
msasikanth authored Jan 30, 2025
1 parent 68a1c42 commit e7557a6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
- Bump Sentry Android to v8.0.0
- Bump Gradle to v8.12.1
- Bump Sentry Gradle plugin to v5
- Opt out of edge-to-edge enforcement in Android 15

### Fixes

Expand Down
8 changes: 8 additions & 0 deletions common-ui/src/main/res/values-v35/theme.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Base.Theme.Simple" parent="Base.Theme.Simple.Global">
<!-- Platform -->
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
</style>
</resources>
4 changes: 3 additions & 1 deletion common-ui/src/main/res/values/theme.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Base.Theme.Simple" parent="Theme.MaterialComponents.Light.NoActionBar">
<style name="Base.Theme.Simple.Global" parent="Theme.MaterialComponents.Light.NoActionBar">
<!-- Dialog Themes -->
<item name="alertDialogTheme">@style/ThemeOverlay.Simple.Dialog.Alert</item>
<item name="android:datePickerDialogTheme">@style/ThemeOverlay.Simple.Dialog</item>
Expand Down Expand Up @@ -53,6 +53,8 @@
<item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.Simple.LargeComponent</item>
</style>

<style name="Base.Theme.Simple" parent="Base.Theme.Simple.Global" />

<style name="Theme.Simple" parent="Base.Theme.Simple">
<item name="colorPrimary">@color/simple_light_blue_500</item>
<item name="colorPrimaryVariant">@color/simple_light_blue_100</item>
Expand Down

0 comments on commit e7557a6

Please sign in to comment.