aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix Talkback Announcement for Workspace Pages" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-01-16 17:21:33 -08:00
committed by Android (Google) Code Review
parent 3c4c268b4c e73541c30c
commit 47b4339df5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/launcher3/Workspace.java
View File

@@ -3572,7 +3572,7 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
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--;
@@ -3584,6 +3584,11 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
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);
}