Reverted cutout and fix rotations #439

hugleo · 2023-09-24T04:04:39Z

This change is

This reverts commit a9d36a0.

hugleo · 2023-09-24T13:12:15Z

Wondering why the changes for Android 14 don't work for me after I merged the changes with the checks and then I went to logging.

09-24 09:50:34.558 20926 20926 V Android_Version: onAttachedToWindow Android version is: 33
09-24 09:50:34.595 20926 20926 V Android_Version: surfaceChanged Android version is: 33
09-24 09:50:34.649 20926 20959 V Android_Version: getScreenWidth Android version is: 33
09-24 09:50:34.649 20926 20959 V Android_Version: getScreenHeight Android version is: 33

It is because my device is Android 13. DUH, DUH, DUH. I feel so dumb. That Xiaomi version screen really tricks me out."

Now the discussion about Android 14 doesn't make any sense since I actually have an Android 13 device.

@pazos Should I then apply my working changes to Android 13 then since I simulate the problem now on a real device?

Oh boy....

pazos · 2023-09-24T13:41:27Z

app/src/main/java/org/koreader/launcher/MainActivity.kt

+        }
+        // ONLY FOR ANDROID 14
+        else if (android.os.Build.VERSION.SDK_INT == 34) {
+            val cut = windowManager.defaultDisplay.cutout


Does this chunk of code works for android 9 - 12?

It would be wonderful to have a single codepath for all versions.

Does this chunk of code works for android 9 - 12?

It would be wonderful to have a single codepath for all versions.

That's what I would like to show you!

for android <= 12 as you say so works.
val cut: DisplayCutout? = window.decorView.rootWindowInsets.displayCutout

for android 13 this seems to be the secret:
windowManager.defaultDisplay.cutout
Following the doc this method should work for >= P

For now I've tested on devices without the hole on some devices < 13 and works.
But I can test some more on the emulator enabling holes in the dev options.

Did you remember to try the method windowManager.defaultDisplay.cutout before?

Did you remember to try the method windowManager.defaultDisplay.cutout before?

I actually don't remember. I think I didn't try anything. Just read the documentation, find something useful, went with that and pushed an APK for others to test. Since the test were ok I never bothered again :)

So please go with that for everything.

Did you remember to try the method windowManager.defaultDisplay.cutout before?

I actually don't remember. I think I didn't try anything. Just read the documentation, find something useful, went with that and pushed an APK for others to test. Since the test were ok I never bothered again :)

So please go with that for everything.

Tested on emulator and doesn't work for Android 9. Need Android >= 10

Ok, thanks!.

Then from 9 up to 12 the legacy method and from 13 onwards the new one.

Ok, thanks!.

Then from 9 up to 12 the legacy method and from 13 onwards the new one.

Already there ;-)

pazos · 2023-09-24T13:43:22Z

app/src/main/java/org/koreader/launcher/MainActivity.kt

+        else if (android.os.Build.VERSION.SDK_INT == 34) {
+            val cut = windowManager.defaultDisplay.cutout
+            if (cut != null && cut.boundingRects.isNotEmpty()) {
+                // TODO: we can handle various kinds of cutouts: getSafeInsetLeft, getSafeInsetRight, getSafeInsetTop, getSafeInsetBottom


Not a fan of random TODO lists.

Do you have something in mind to do with those cutouts?

Not a fan of random TODO lists.

Do you have something in mind to do with those cutouts?

Yes. Today we only deal with topInsetHeight when the hole is at the top.
On the emulator, we can enable holes in any direction: top, bottom, left, or right.
When you guys changed surfaceWidth = width; surfaceHeight = height inside the surfaceChanged method, it enabled support for all kinds of holes.
When I reverted the changes I realized that it was not implemented in the old version ;-)

Ok, so remove the TODO and add a NOTE instead.
Somebody else that reads the code in the future might find that useful.

Not so with a TODO.

Clean up the code and implement cutout InsetBottom

pazos · 2023-12-15T20:36:30Z

@hugleo: sorry for the delay.

two nitpicks and this can be merged.

Please add a log statement in the new condition, too. Use exactly the same string, so logs provide the same feedback in all android versions.

Please fix https://app.codacy.com/gh/koreader/android-luajit-launcher/pullRequest?prid=12685762

hugleo · 2023-12-15T22:51:36Z

@pazos nitpicks addressed

pazos · 2023-12-15T23:54:01Z

app/src/main/java/org/koreader/launcher/MainActivity.kt

+        if (Build.VERSION.SDK_INT >= 33) {
+            val cut = windowManager.defaultDisplay.cutout
+            if (cut != null && cut.boundingRects.isNotEmpty()) {
+                insetsHeight = cut.safeInsetTop + cut.safeInsetBottom


any reason to take in account safeInsetBottom?. Did you find a device (I mean any device outside an emulator with fake cutouts) where it is not 0?.

It's not a vetto. Just trying to figure out what's the best option:

a) ignore cut.safeInsetBottom on both branches.
b) count cut.safeInsetBottom on both branches.

Anyhow, I'm fine if you go with b* but then please use the same log statement.

any reason to take in account safeInsetBottom?. Did you find a device (I mean any device outside an emulator with fake cutouts) where it is not 0?.

It's not a vetto. Just trying to figure out what's the best option:

a) ignore cut.safeInsetBottom on both branches. b) count cut.safeInsetBottom on both branches.

Anyhow, I'm fine if you go with b* but then please use the same log statement.

No, see only in the emulator. Fine with a) since it makes more sense for the log as well.

I think can get rid of cut.boundingRects.isNotEmpty() as well since I don't remember if it's needed and it would save some duplication

pazos

Looks much better, thanks!

koreader/android-luajit-launcher#451 koreader/android-luajit-launcher#431 koreader/android-luajit-launcher#439 koreader/android-luajit-launcher#452

jospalau · 2024-02-14T18:09:39Z

This broke the screen for my Xiaomi. I don't read on the phone. Just letting you know. MIUI 14 too.

I am using the patch I used to use previously to the original fix that this is reverting to add the missing height.

hugleo · 2024-02-14T19:02:28Z

Do you have a screenshot of the problem?

jospalau · 2024-02-14T19:12:41Z

Sure.

hugleo · 2024-02-14T19:22:30Z

If you rotate to landscape in KOReader options and then back to portrait, does the problem go away?

hugleo · 2024-02-14T19:25:49Z

Also tell which device model

jospalau · 2024-02-14T19:26:58Z

No. In landscape mode the cut is on the right side.

hugleo · 2024-02-14T19:42:25Z

This device has a hole at the top just like mine. The black bar is supposed to fill the hole and should be drawn at the top. However, on yours, it is being drawn at the bottom. Unless, of course, you have a rotation configured like the picture below, this should be the normal behavior.

jospalau · 2024-02-14T19:51:31Z

I have it by default but I don't know why the order of the icons is different than in yours.

I think I know what you mean but I want it full screen like the rests of the apps.

Previous code reverted and the patch makes it work:
local screen = require("android").screen
screen.height = screen.height +90

hugleo · 2024-02-14T20:06:50Z

I have it by default but I don't know why the order of the icons is different than in yours.

I think I know what you mean but I want it full screen like the rests of the apps.

Previous code reverted and the patch makes it work: local screen = require("android").screen screen.height = screen.height +90

Your default setting is correct; in my case, I intentionally changed it. Your black bar should be at the top for this rotation mode.

jospalau · 2024-02-14T20:22:12Z

It is not a problem to be honest. Just curious.
Thanks

hugleo added 2 commits September 23, 2023 22:59

Revert "android 13 cutout"

7eba2bc

This reverts commit a9d36a0.

merge changes

ac84107

hugleo marked this pull request as draft September 24, 2023 04:04

pazos reviewed Sep 24, 2023

View reviewed changes

hugleo added 2 commits September 24, 2023 18:30

clean up

475ca95

Clean up the code and implement cutout InsetBottom

missed one

e263f96

hugleo mentioned this pull request Oct 6, 2023

Screen rotation broken on Onyx Poke 5 koreader/koreader#10983

Open

hugleo marked this pull request as ready for review October 15, 2023 13:57

hugleo mentioned this pull request Nov 22, 2023

Android [Pixel 5] controls issue, wrong screen size detection koreader/koreader#10808

Closed

address nitpicks

9c57506

remove leftovers from my personal build

9bb9154

pazos reviewed Dec 15, 2023

View reviewed changes

hugleo added 2 commits December 15, 2023 23:05

Remove the possibly unneeded inset bottom

25b2d11

remove and deduplicated

19adfe1

pazos approved these changes Dec 17, 2023

View reviewed changes

pazos mentioned this pull request Dec 17, 2023

Trying to get rid of the black area #430

Closed

pazos merged commit 7461b57 into koreader:master Dec 22, 2023
1 check passed

NiLuJe added a commit to NiLuJe/koreader that referenced this pull request Dec 22, 2023

Bump android/luajit-launcher

1efdd3d

koreader/android-luajit-launcher#451 koreader/android-luajit-launcher#431 koreader/android-luajit-launcher#439 koreader/android-luajit-launcher#452

NiLuJe added a commit to koreader/koreader that referenced this pull request Dec 22, 2023

Bump android/luajit-launcher

e7ee900

koreader/android-luajit-launcher#451 koreader/android-luajit-launcher#431 koreader/android-luajit-launcher#439 koreader/android-luajit-launcher#452

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reverted cutout and fix rotations #439

Reverted cutout and fix rotations #439

hugleo commented Sep 24, 2023 •

edited by Frenzie

hugleo commented Sep 24, 2023

pazos Sep 24, 2023

hugleo Sep 24, 2023

pazos Sep 24, 2023

hugleo Sep 24, 2023

pazos Sep 24, 2023

hugleo Sep 24, 2023

pazos Sep 24, 2023

hugleo Sep 24, 2023

pazos Sep 24, 2023

pazos commented Dec 15, 2023

hugleo commented Dec 15, 2023

pazos Dec 15, 2023

hugleo Dec 16, 2023

hugleo Dec 16, 2023

pazos left a comment

jospalau commented Feb 14, 2024

hugleo commented Feb 14, 2024

jospalau commented Feb 14, 2024

hugleo commented Feb 14, 2024

hugleo commented Feb 14, 2024

jospalau commented Feb 14, 2024

hugleo commented Feb 14, 2024

jospalau commented Feb 14, 2024

hugleo commented Feb 14, 2024

jospalau commented Feb 14, 2024

Reverted cutout and fix rotations #439

Reverted cutout and fix rotations #439

Conversation

hugleo commented Sep 24, 2023 • edited by Frenzie

hugleo commented Sep 24, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pazos commented Dec 15, 2023

hugleo commented Dec 15, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pazos left a comment

Choose a reason for hiding this comment

jospalau commented Feb 14, 2024

hugleo commented Feb 14, 2024

jospalau commented Feb 14, 2024

hugleo commented Feb 14, 2024

hugleo commented Feb 14, 2024

jospalau commented Feb 14, 2024

hugleo commented Feb 14, 2024

jospalau commented Feb 14, 2024

hugleo commented Feb 14, 2024

jospalau commented Feb 14, 2024

hugleo commented Sep 24, 2023 •

edited by Frenzie