Skip to content

android: fix getRotationMode() to return canonical DEVICE_ROTATED_* values #2393

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.

Sign up for GitHub

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

Open
chofuhoyu wants to merge 5 commits into
base: master
Choose a base branch
from
Open

android: fix getRotationMode() to return canonical DEVICE_ROTATED_* values #2393

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55f9fae
android: fix getRotationMode() to return canonical DEVICE_ROTATED_* v…
chofuhoyu Jun 8, 2026
70d0d35
chore: simplify getRotationMode fallback with idiomatic or
chofuhoyu Jun 12, 2026
ca797da
fix: remove stale ANDROID_ORIENTATION_TO_ROTATION mapping table
chofuhoyu Jun 12, 2026
97e98e2
debug: add AROT_DIAG logging to framebuffer setRotationMode/getRotati…
chofuhoyu Jun 12, 2026
3283f9e
fix: override getTouchRotation to return 0 on Android native rotation
chofuhoyu Jun 12, 2026
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
23 changes: 22 additions & 1 deletion ffi/framebuffer_android.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@ local full, partial, full_ui, partial_ui, fast, delay_page, delay_ui, delay_fast

local framebuffer = {}

-- Android ActivityInfo SCREEN_ORIENTATION_* to framebuffer DEVICE_ROTATED_* mapping
-- c.f., https://developer.android.com/reference/android/content/pm/ActivityInfo
local ANDROID_ORIENTATION_TO_ROTATION = {
[0] = 1, -- ASCREEN_ORIENTATION_LANDSCAPE → DEVICE_ROTATED_CLOCKWISE
[1] = 0, -- ASCREEN_ORIENTATION_PORTRAIT → DEVICE_ROTATED_UPRIGHT
[6] = 1, -- ASCREEN_ORIENTATION_SENSOR_LANDSCAPE → DEVICE_ROTATED_CLOCKWISE
[7] = 0, -- ASCREEN_ORIENTATION_SENSOR_PORTRAIT → DEVICE_ROTATED_UPRIGHT
[8] = 3, -- ASCREEN_ORIENTATION_REVERSE_LANDSCAPE → DEVICE_ROTATED_COUNTER_CLOCKWISE
[9] = 2, -- ASCREEN_ORIENTATION_REVERSE_PORTRAIT → DEVICE_ROTATED_UPSIDE_DOWN
[10] = 0, -- ASCREEN_ORIENTATION_FULL_SENSOR → default to UPRIGHT
}

-- update a region of the screen
function framebuffer:_updatePartial(mode, delay, x, y, w, h)
local bb = self.full_bb or self.bb
Expand Down Expand Up @@ -69,7 +81,15 @@ end

function framebuffer:getRotationMode()
if android.hasNativeRotation() then
return android.orientation.get()
local ao = android.orientation.get()
local mapped = ANDROID_ORIENTATION_TO_ROTATION[ao]
if mapped ~= nil then
return mapped
else
-- For UNSPECIFIED(-1), USER(2), BEHIND(3), SENSOR(4), NOSENSOR(5)
-- fall back to cached value
return self.cur_rotation_mode
end
Comment thread
chofuhoyu marked this conversation as resolved.
Outdated
else
return self.cur_rotation_mode
end
Expand All @@ -84,6 +104,7 @@ function framebuffer:setRotationMode(mode)
elseif mode == 3 then key = "REVERSE_LANDSCAPE" end
if key then
android.orientation.set(C["ASCREEN_ORIENTATION_" .. key])
self.cur_rotation_mode = mode
end
else
framebuffer.parent.setRotationMode(self, mode)
Expand Down