From e73541c30c51c793ed9f2ffa202f6253af68b032 Mon Sep 17 00:00:00 2001 From: Stefan Andonian Date: Thu, 16 Jan 2025 13:52:35 -0800 Subject: [PATCH] Fix Talkback Announcement for Workspace Pages Bug: 379649357 Test: Verified manually that the fixes work for announcements. Flag: EXEMPT bug fix Change-Id: I0a2e989eb34adbd975a7211d8334d264d64b3933 --- src/com/android/launcher3/Workspace.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index bc751d9365..79c67e72f6 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -3554,7 +3554,7 @@ public class Workspace extends PagedView int nScreens = getChildCount(); int extraScreenId = mScreenOrder.indexOf(EXTRA_EMPTY_SCREEN_ID); if (extraScreenId >= 0 && nScreens > 1) { - if (page == extraScreenId) { + if (page == extraScreenId || (isTwoPanelEnabled() && page == extraScreenId + 1)) { return getContext().getString(R.string.workspace_new_page); } nScreens--; @@ -3566,6 +3566,11 @@ public class Workspace extends PagedView int panelCount = getPanelCount(); int currentPage = (page / panelCount) + 1; int totalPages = nScreens / panelCount + nScreens % panelCount; + + // When dragging, a blank screen is added. This increases the total page count, but we still + // want to describe the original page count where icons are currently pinned + if (extraScreenId > 0) totalPages--; + return getContext().getString(R.string.workspace_scroll_format, currentPage, totalPages); }