summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/DeviceProfile.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-10-16 09:49:52 -0700
committerAdam Cohen <adamcohen@google.com>2014-10-17 01:33:55 +0000
commitcee8c66f9a688705f7880f2bffc9d2f95803eb81 (patch)
treed574c2abaeb0c2cb6e52778e9e21b5fdc4c199a6 /src/com/android/launcher3/DeviceProfile.java
parentd37a1f5abec5a442508d850a0e26c96ece225f91 (diff)
downloadandroid_packages_apps_Trebuchet-cee8c66f9a688705f7880f2bffc9d2f95803eb81.tar.gz
android_packages_apps_Trebuchet-cee8c66f9a688705f7880f2bffc9d2f95803eb81.tar.bz2
android_packages_apps_Trebuchet-cee8c66f9a688705f7880f2bffc9d2f95803eb81.zip
Adding ability to list folder items in separate file
-> remove all apps default layouts Bug 17569015 Change-Id: I39b899b61d5b1cff2d7801d281dacfc804c403c5
Diffstat (limited to 'src/com/android/launcher3/DeviceProfile.java')
-rw-r--r--src/com/android/launcher3/DeviceProfile.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index daf5556d4..b2366bb2b 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -75,7 +75,6 @@ public class DeviceProfile {
private float hotseatIconSize;
int defaultLayoutId;
- int defaultNoAllAppsLayoutId;
boolean isLandscape;
boolean isTablet;
@@ -136,7 +135,7 @@ public class DeviceProfile {
private ArrayList<DeviceProfileCallbacks> mCallbacks = new ArrayList<DeviceProfileCallbacks>();
DeviceProfile(String n, float w, float h, float r, float c,
- float is, float its, float hs, float his, int dlId, int dnalId) {
+ float is, float its, float hs, float his, int dlId) {
// Ensure that we have an odd number of hotseat items (since we need to place all apps)
if (!LauncherAppState.isDisableAllApps() && hs % 2 == 0) {
throw new RuntimeException("All Device Profiles must have an odd number of hotseat spaces");
@@ -152,7 +151,6 @@ public class DeviceProfile {
numHotseatIcons = hs;
hotseatIconSize = his;
defaultLayoutId = dlId;
- defaultNoAllAppsLayoutId = dnalId;
}
DeviceProfile() {
@@ -215,9 +213,6 @@ public class DeviceProfile {
// Snap to the closest default layout id
defaultLayoutId = closestProfile.defaultLayoutId;
- // Snap to the closest default no all-apps layout id
- defaultNoAllAppsLayoutId = closestProfile.defaultNoAllAppsLayoutId;
-
// Interpolate the icon size
points.clear();
for (DeviceProfile p : profiles) {