diff options
author | Tony Wickham <twickham@google.com> | 2015-11-03 22:07:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-03 22:07:57 +0000 |
commit | 38b122076775983aa3cd8d7cbca8f8a73bebb509 (patch) | |
tree | 2b25dc42b80b0958c5b4c65a15f972cbaa363da5 | |
parent | 1bd9a430edd15a540cb62b5141ebfa29456add3f (diff) | |
parent | 04e2c9ef5663262fc9dd08ffc4b59fe305a017f3 (diff) | |
download | android_packages_apps_Trebuchet-38b122076775983aa3cd8d7cbca8f8a73bebb509.tar.gz android_packages_apps_Trebuchet-38b122076775983aa3cd8d7cbca8f8a73bebb509.tar.bz2 android_packages_apps_Trebuchet-38b122076775983aa3cd8d7cbca8f8a73bebb509.zip |
Stop clearing focus when snapping to a new workspace page.
am: 04e2c9ef56
* commit '04e2c9ef5663262fc9dd08ffc4b59fe305a017f3':
Stop clearing focus when snapping to a new workspace page.
-rw-r--r-- | src/com/android/launcher3/FocusHelper.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java index 099194ca5..ad4fdc75a 100644 --- a/src/com/android/launcher3/FocusHelper.java +++ b/src/com/android/launcher3/FocusHelper.java @@ -398,7 +398,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 e90ec1476..d053d4dd5 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -2047,11 +2047,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); |