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

Fix incorrect accessibility announcement on two panel home

Browse Source 
- Divide total pages by panelCount if two panel is active
- Increment target column when moving an item to right panel

Test: manual
Bug: 200009004
Change-Id: Ia8d2d760dc5e8b413e5b1150c049f7fa3ec26513
This commit is contained in:
Andras Kloczl
2022-02-21 16:53:28 +00:00
parent e424f57dcb
commit 2dacbee028
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/launcher3/CellLayout.java
View File

@@ -1169,9 +1169,7 @@ public class CellLayout extends ViewGroup {
// Apply local extracted color if the DragView is an AppWidgetHostViewDrawable.
View view = dragObject.dragView.getContentView();
if (view instanceof LauncherAppWidgetHostView) {
Launcher launcher = Launcher.getLauncher(getContext());
Workspace workspace = launcher.getWorkspace();
int screenId = workspace.getIdForScreen(this);
int screenId = getWorkspace().getIdForScreen(this);
cellToRect(targetCell[0], targetCell[1], spanX, spanY, mTempRect);
((LauncherAppWidgetHostView) view).handleDrag(mTempRect, this, screenId);
@@ -1184,11 +1182,24 @@ public class CellLayout extends ViewGroup {
return getContext().getString(R.string.move_to_hotseat_position,
Math.max(cellX, cellY) + 1);
} else {
return getContext().getString(R.string.move_to_empty_cell,
cellY + 1, cellX + 1);
Workspace workspace = getWorkspace();
int row = cellY + 1;
int col = workspace.mIsRtl ? mCountX - cellX : cellX + 1;
int panelCount = workspace.getPanelCount();
if (panelCount > 1) {
// Increment the column if the target is on the right side of a two panel home
int screenId = workspace.getIdForScreen(this);
int pageIndex = workspace.getPageIndexForScreenId(screenId);
col += (pageIndex % panelCount) * mCountX;
}
return getContext().getString(R.string.move_to_empty_cell, row, col);
}
}
private Workspace getWorkspace() {
return Launcher.cast(mActivity).getWorkspace();
}
public void clearDragOutlines() {
final int oldIndex = mDragOutlineCurrent;
mDragOutlineAnims[oldIndex].animateOut();
@@ -2243,7 +2254,7 @@ public class CellLayout extends ViewGroup {
private void commitTempPlacement(View dragView) {
mTmpOccupied.copyTo(mOccupied);
int screenId = Launcher.cast(mActivity).getWorkspace().getIdForScreen(this);
int screenId = getWorkspace().getIdForScreen(this);
int container = Favorites.CONTAINER_DESKTOP;
if (mContainerType == HOTSEAT) {

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

@@ -3398,7 +3398,10 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
// When the workspace is not loaded, we do not know how many screen will be bound.
return getContext().getString(R.string.home_screen);
}
return getContext().getString(R.string.workspace_scroll_format, page + 1, nScreens);
int panelCount = getPanelCount();
int currentPage = (page / panelCount) + 1;
int totalPages = nScreens / panelCount + nScreens % panelCount;
return getContext().getString(R.string.workspace_scroll_format, currentPage, totalPages);
}
/**