diff options
author | Winson Chung <winsonc@google.com> | 2016-07-26 16:47:50 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-26 16:47:50 +0000 |
commit | 2f88ef34fb47b2ef96055ed2234a696fb83c1019 (patch) | |
tree | e2eb7bf21201b9470f9a51e2ae63bac3a3f84b73 /src/com/android/launcher3/folder/FolderPagedView.java | |
parent | 6f155340b93483168b5ed129e653289e8eedf11c (diff) | |
parent | 8f288aac99a11d52fd9747f360a8ce3bb521b17a (diff) | |
download | android_packages_apps_Trebuchet-2f88ef34fb47b2ef96055ed2234a696fb83c1019.tar.gz android_packages_apps_Trebuchet-2f88ef34fb47b2ef96055ed2234a696fb83c1019.tar.bz2 android_packages_apps_Trebuchet-2f88ef34fb47b2ef96055ed2234a696fb83c1019.zip |
Merge "Ensure that we update the preview layout rule when not animating." into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/folder/FolderPagedView.java')
-rw-r--r-- | src/com/android/launcher3/folder/FolderPagedView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java index 82c79a9ec..3df1d2438 100644 --- a/src/com/android/launcher3/folder/FolderPagedView.java +++ b/src/com/android/launcher3/folder/FolderPagedView.java @@ -197,7 +197,7 @@ public class FolderPagedView extends PagedView { */ public int allocateRankForNewItem(ShortcutInfo info) { int rank = getItemCount(); - ArrayList<View> views = new ArrayList<View>(mFolder.getItemsInReadingOrder()); + ArrayList<View> views = new ArrayList<>(mFolder.getItemsInReadingOrder()); views.add(rank, null); arrangeChildren(views, views.size(), false); setCurrentPage(rank / mMaxItemsPerPage); |