Skip to content

[FIX] Infinite edges Android 15 #4581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ ownCloud admins and users.
* Bugfix - Side menu collapses info in landscape: [#4513](https://github.com/owncloud/android/issues/4513)
* Bugfix - Content in Spaces not shown from third-party apps: [#4522](https://github.com/owncloud/android/issues/4522)
* Bugfix - Add bottom margin for used quota in account dialog: [#4566](https://github.com/owncloud/android/issues/4566)
* Bugfix - Infinite edges in Android 15: [#4576](https://github.com/owncloud/android/issues/4576)
* Change - Bump target SDK to 35: [#4529](https://github.com/owncloud/android/issues/4529)
* Change - Replace dav4android location: [#4536](https://github.com/owncloud/android/issues/4536)
* Change - Modify biometrics fail source string: [#4572](https://github.com/owncloud/android/issues/4572)
Expand Down Expand Up @@ -72,6 +73,14 @@ ownCloud admins and users.
https://github.com/owncloud/android/issues/4566
https://github.com/owncloud/android/pull/4567

* Bugfix - Infinite edges in Android 15: [#4576](https://github.com/owncloud/android/issues/4576)

Infinite edges feature, enabled by default starting from Android 15, has been
disabled in the app.

https://github.com/owncloud/android/issues/4576
https://github.com/owncloud/android/pull/4581

* Change - Bump target SDK to 35: [#4529](https://github.com/owncloud/android/issues/4529)

Target SDK has been upgraded to 35 in order to fulfill Android platform
Expand Down
6 changes: 6 additions & 0 deletions changelog/unreleased/4581
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Infinite edges in Android 15

Infinite edges feature, enabled by default starting from Android 15, has been disabled in the app.

https://github.com/owncloud/android/issues/4576
https://github.com/owncloud/android/pull/4581
15 changes: 14 additions & 1 deletion owncloudApp/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">

<style name="Animations" />

Expand Down Expand Up @@ -45,11 +45,13 @@

<!-- style for search view -->
<item name="searchViewStyle">@style/ownCloud.SearchView</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<!-- Splash Screen -->
<style name="Theme.ownCloud.Splash">
<item name="android:windowBackground">@drawable/splash_screen</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<!-- Extends Theme.ownCloud to remove legacy ActionBar from the window and add, via layouts, a Toolbar -->
Expand All @@ -58,18 +60,21 @@
<item name="windowActionBar">false</item>
<!-- (status/nav)BarColor are set by the Activity, not the system -->
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<!-- Extends Theme.ownCloud.Toolbar for Drawer activities including Drawer -->
<style name="Theme.ownCloud.Toolbar.Drawer">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowAnimationStyle">@null</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<!-- Extends Theme.ownCloud to make LEGACY ActionBar both OVERLAY and TRANSPARENT -->
<style name="Theme.ownCloud.Overlay">
<item name="windowActionBarOverlay">true</item>
<item name="actionBarTheme">@style/ownCloud.Appbar.Transparent</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<!-- Extends Theme.ownCloud for video in full screen mode -->
Expand All @@ -78,6 +83,7 @@
<item name="android:windowLayoutInDisplayCutoutMode">never</item>
<item name="actionBarTheme">@style/ownCloud.Appbar.Transparent</item>
<item name="android:windowBackground">@android:color/background_dark</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<!-- DIALOG THEMES: styles for DIALOGs -->
Expand All @@ -89,11 +95,13 @@
<item name="searchViewStyle">@style/ownCloud.SearchView</item>
<item name="buttonBarButtonStyle">@style/Theme.ownCloud.Dialog.ButtonBar.Button</item>
<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<!-- USED IN SHAREACTIVITY!! !! -->
<style name="Theme.ownCloud.AlertDialog.NoTitle">
<item name="windowNoTitle">true</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<!-- APP BAR styles -->
Expand All @@ -105,6 +113,7 @@
<style name="ownCloud.Appbar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="colorPrimary">@color/actionbar_start_color</item>
<item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<style name="Toolbar.Button.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
Expand All @@ -114,6 +123,7 @@
<!-- Transparent style for the app bar -->
<style name="ownCloud.Appbar.Transparent" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="colorPrimary">@color/owncloud_blue_transparent</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<!-- MORE styles -->
Expand Down Expand Up @@ -279,6 +289,7 @@
<!-- properties for action mode -->
<item name="windowActionModeOverlay">true</item>
<item name="actionModeBackground">@color/action_mode_background</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<style name="Button.Authenticator" parent="Widget.AppCompat.Button.Colored">
Expand All @@ -295,12 +306,14 @@
<style name="Theme.ownCloud.Authenticator.EditText" parent="Theme.ownCloud.Authenticator">
<item name="colorControlNormal">@color/login_text_color</item>
<item name="colorControlActivated">@color/login_text_color</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>

<!-- SortBottomSheetFragment -->
<style name="Theme.ownCloud.SortBottomSheetFragment" />

<style name="Theme.ownCloud.SortBottomSheetFragment.Item">
<item name="android:textAppearance">@style/TextAppearance.OwnCloud.SortBottomSheetFragment.Item</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
</style>
</resources>
Loading