diff options
| author | Nilesh Agrawal <nileshagrawal@google.com> | 2013-12-09 20:39:28 +0000 |
|---|---|---|
| committer | Nilesh Agrawal <nileshagrawal@google.com> | 2013-12-09 20:39:28 +0000 |
| commit | d85ee9b994e21cb500c89349ce31ce89e564b513 (patch) | |
| tree | ec485fbf3adc58ab9bba7ff1e52b67c3264a60e6 /src | |
| parent | f4ed1be4ef22c87b002c3bca90d130eb77fe5535 (diff) | |
| download | android_packages_apps_Trebuchet-d85ee9b994e21cb500c89349ce31ce89e564b513.tar.gz android_packages_apps_Trebuchet-d85ee9b994e21cb500c89349ce31ce89e564b513.tar.bz2 android_packages_apps_Trebuchet-d85ee9b994e21cb500c89349ce31ce89e564b513.zip | |
Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."
This reverts commit f4ed1be4ef22c87b002c3bca90d130eb77fe5535.
This broke the build:
packages/apps/Launcher3/src/com/android/launcher3/LauncherProvider.java:292: cannot find symbol
symbol : variable default_workspace_no_all_apps
location: class com.android.launcher3.R.xml
return R.xml.default_workspace_no_all_apps;
Change-Id: I40e80494f06f08de3d827c6816075ac4d269ea6a
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/DynamicGrid.java | 12 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 11 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index dc01c6933..ce7855362 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -60,17 +60,17 @@ public class DynamicGrid { DEFAULT_ICON_SIZE_PX = pxFromDp(DEFAULT_ICON_SIZE_DP, dm); // Our phone profiles include the bar sizes in each orientation deviceProfiles.add(new DeviceProfile("Super Short Stubby", - 255, 300, 2, 3, 48, 13, (hasAA ? 5 : 5), 48)); + 255, 300, 2, 3, 48, 13, (hasAA ? 5 : 4), 48)); deviceProfiles.add(new DeviceProfile("Shorter Stubby", - 255, 400, 3, 3, 48, 13, (hasAA ? 5 : 5), 48)); + 255, 400, 3, 3, 48, 13, (hasAA ? 5 : 4), 48)); deviceProfiles.add(new DeviceProfile("Short Stubby", - 275, 420, 3, 4, 48, 13, (hasAA ? 5 : 5), 48)); + 275, 420, 3, 4, 48, 13, (hasAA ? 5 : 4), 48)); deviceProfiles.add(new DeviceProfile("Stubby", - 255, 450, 3, 4, 48, 13, (hasAA ? 5 : 5), 48)); + 255, 450, 3, 4, 48, 13, (hasAA ? 5 : 4), 48)); deviceProfiles.add(new DeviceProfile("Nexus S", - 296, 491.33f, 4, 4, 48, 13, (hasAA ? 5 : 5), 48)); + 296, 491.33f, 4, 4, 48, 13, (hasAA ? 5 : 4), 48)); deviceProfiles.add(new DeviceProfile("Nexus 4", - 359, 518, 4, 4, DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56)); + 359, 518, 4, 4, DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 4), 56)); // The tablet profile is odd in that the landscape orientation // also includes the nav bar on the side deviceProfiles.add(new DeviceProfile("Nexus 7", diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 28efd0148..27b7dae2a 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -270,8 +270,7 @@ public class LauncherProvider extends ContentProvider { // Use default workspace resource if none provided if (workspaceResId == 0) { - workspaceResId = - sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, getDefaultWorkspaceResourceId()); + workspaceResId = sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, R.xml.default_workspace); } // Populate favorites table with initial favorites @@ -287,14 +286,6 @@ public class LauncherProvider extends ContentProvider { } } - private static int getDefaultWorkspaceResourceId() { - if (AppsCustomizePagedView.DISABLE_ALL_APPS) { - return R.xml.default_workspace_no_all_apps; - } else { - return R.xml.default_workspace; - } - } - private static interface ContentValuesCallback { public void onRow(ContentValues values); } |