summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Garnes <matt@cyngn.com>2015-02-09 13:14:09 -0800
committerMatt Garnes <matt@cyngn.com>2015-02-09 13:19:06 -0800
commit006f35ad423a4a8484d57e70d9f94489e69cda56 (patch)
treea890991d0af8386d63121492074b0e7a63a6afe3
parenta426812f58b320c191ed8427d145966724949d67 (diff)
downloadandroid_packages_apps_Trebuchet-006f35ad423a4a8484d57e70d9f94489e69cda56.zip
android_packages_apps_Trebuchet-006f35ad423a4a8484d57e70d9f94489e69cda56.tar.gz
android_packages_apps_Trebuchet-006f35ad423a4a8484d57e70d9f94489e69cda56.tar.bz2
Filter apps for app drawer only after mApps is completely populated.
If mPreInstallConfig is set to true, apps will be added to mApps for display in the drawer after mFilteredApps is filtered from mApps. This results in applications being hidden from view that should not be. Filter mApps into mFilteredApps only after addPreInstallApps has been called. Change-Id: Ic426c5e530ffa61e0cbca211a6a32fcba38fc08b
-rw-r--r--src/com/android/launcher3/AppsCustomizePagedView.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 8e25e02..a28cca82 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -1686,12 +1686,11 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
removePreInstallApps();
}
- filterAppsWithoutInvalidate();
-
if (mPreInstallConfig) {
addPreInstallApps();
}
+ filterAppsWithoutInvalidate();
sortByCustomization();
updatePageCountsAndInvalidateData();
}
@@ -1754,12 +1753,12 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
}
addAppsWithoutInvalidate(list);
- filterAppsWithoutInvalidate();
if (mPreInstallConfig) {
addPreInstallApps();
}
+ filterAppsWithoutInvalidate();
updatePageCountsAndInvalidateData();
}
}
@@ -1820,10 +1819,10 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
}
addAppsWithoutInvalidate(list);
- filterAppsWithoutInvalidate();
if (mPreInstallConfig) {
addPreInstallApps();
}
+ filterAppsWithoutInvalidate();
updatePageCountsAndInvalidateData();
}
}