From 04e2c9ef5663262fc9dd08ffc4b59fe305a017f3 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Fri, 30 Oct 2015 18:04:48 -0700 Subject: [PATCH] Stop clearing focus when snapping to a new workspace page. Clearing the focus was causing the first child in the new page to immediately take focus, which caused FocusIndicatorView jank when using a keyboard. Bug: 25256728 Change-Id: I5ab31ebc3fe370d7ac9e9792b30dab3467023738 --- src/com/android/launcher3/FocusHelper.java | 1 - src/com/android/launcher3/PagedView.java | 5 ----- 2 files changed, 6 deletions(-) diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java index 6872d5b0a..d5eac9b2e 100644 --- a/src/com/android/launcher3/FocusHelper.java +++ b/src/com/android/launcher3/FocusHelper.java @@ -397,7 +397,6 @@ public class FocusHelper { if (newIconIndex == FocusLogic.PREVIOUS_PAGE_LEFT_COLUMN) { newPageIndex = pageIndex - 1; } - workspace.snapToPage(newPageIndex); row = ((CellLayout.LayoutParams) v.getLayoutParams()).cellY; parent = getCellLayoutChildrenForIndex(workspace, newPageIndex); if (parent != null) { diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 2579ea363..9258360fa 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -2078,11 +2078,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc whichPage = validateNewPage(whichPage); mNextPage = whichPage; - View focusedChild = getFocusedChild(); - if (focusedChild != null && whichPage != mCurrentPage && - focusedChild == getPageAt(mCurrentPage)) { - focusedChild.clearFocus(); - } pageBeginMoving(); awakenScrollBars(duration); -- 2.11.0