Move batch size to a resource.
This way we can figure out how many apps to send to the grid
at a time even if the grid hasn't been instantiated yet.
Bug: 2599979
Change-Id: I7960fe1adae6976555334422335f3a4b28d0675e
diff --git a/res/values/config.xml b/res/values/config.xml
index 2822e95..15ec05b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,5 +1,6 @@
<resources>
<integer name="config_allAppsFadeInTime">700</integer>
<integer name="config_allAppsFadeOutTime">700</integer>
- <integer name="config_allAppsBatchLoadDelay">150</integer>
+ <integer name="config_allAppsBatchLoadDelay">0</integer>
+ <integer name="config_allAppsBatchSize">0</integer>
</resources>
diff --git a/src/com/android/launcher2/AllApps2D.java b/src/com/android/launcher2/AllApps2D.java
index eb7cd83..90c87fb 100644
--- a/src/com/android/launcher2/AllApps2D.java
+++ b/src/com/android/launcher2/AllApps2D.java
@@ -50,8 +50,6 @@
private static final String TAG = "Launcher.AllApps2D";
- private static final int BATCH_SIZE = 6; // give us a few apps at a time
-
private Launcher mLauncher;
private DragController mDragController;
@@ -302,10 +300,6 @@
return -1;
}
- public int getAppBatchSize() {
- return BATCH_SIZE;
- }
-
public void dumpState() {
ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList", mAllAppsList);
}
diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java
index be3b114..9c3b3e4 100644
--- a/src/com/android/launcher2/AllApps3D.java
+++ b/src/com/android/launcher2/AllApps3D.java
@@ -73,8 +73,6 @@
private static final int SELECTION_ICONS = 1;
private static final int SELECTION_HOME = 2;
- private static final int BATCH_SIZE = 0; // give us all the apps at once
-
private Launcher mLauncher;
private DragController mDragController;
@@ -1600,10 +1598,6 @@
}
}
- public int getAppBatchSize() {
- return BATCH_SIZE;
- }
-
public void dumpState() {
Log.d(TAG, "sRS=" + sRS);
Log.d(TAG, "sRollo=" + sRollo);
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 8888737..877c075 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -41,8 +41,6 @@
public void updateApps(ArrayList<ApplicationInfo> list);
- public int getAppBatchSize();
-
public void dumpState();
public void surrender();
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 5cfcac2..3522199 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2095,7 +2095,7 @@
* Implementation of the method from LauncherModel.Callbacks.
*/
public int getAppBatchSize() {
- return mAllAppsGrid.getAppBatchSize();
+ return getResources().getInteger(R.integer.config_allAppsBatchSize);
}
/**