diff options
| author | Nilesh Agrawal <nileshagrawal@google.com> | 2013-12-09 20:18:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-09 20:18:57 +0000 |
| commit | 23c165a990a5faa11d9b63b437005cf6e3c4d83e (patch) | |
| tree | 85afae937965c03518765a7dae54bfe55285e4fa /src | |
| parent | 06a0ac2fea10bde7f5a45e72dea83308773a220d (diff) | |
| parent | f4ed1be4ef22c87b002c3bca90d130eb77fe5535 (diff) | |
| download | android_packages_apps_Trebuchet-23c165a990a5faa11d9b63b437005cf6e3c4d83e.tar.gz android_packages_apps_Trebuchet-23c165a990a5faa11d9b63b437005cf6e3c4d83e.tar.bz2 android_packages_apps_Trebuchet-23c165a990a5faa11d9b63b437005cf6e3c4d83e.zip | |
Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit
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, 16 insertions, 7 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index ce7855362..dc01c6933 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 : 4), 48)); + 255, 300, 2, 3, 48, 13, (hasAA ? 5 : 5), 48)); deviceProfiles.add(new DeviceProfile("Shorter Stubby", - 255, 400, 3, 3, 48, 13, (hasAA ? 5 : 4), 48)); + 255, 400, 3, 3, 48, 13, (hasAA ? 5 : 5), 48)); deviceProfiles.add(new DeviceProfile("Short Stubby", - 275, 420, 3, 4, 48, 13, (hasAA ? 5 : 4), 48)); + 275, 420, 3, 4, 48, 13, (hasAA ? 5 : 5), 48)); deviceProfiles.add(new DeviceProfile("Stubby", - 255, 450, 3, 4, 48, 13, (hasAA ? 5 : 4), 48)); + 255, 450, 3, 4, 48, 13, (hasAA ? 5 : 5), 48)); deviceProfiles.add(new DeviceProfile("Nexus S", - 296, 491.33f, 4, 4, 48, 13, (hasAA ? 5 : 4), 48)); + 296, 491.33f, 4, 4, 48, 13, (hasAA ? 5 : 5), 48)); deviceProfiles.add(new DeviceProfile("Nexus 4", - 359, 518, 4, 4, DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 4), 56)); + 359, 518, 4, 4, DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 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 27b7dae2a..28efd0148 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -270,7 +270,8 @@ public class LauncherProvider extends ContentProvider { // Use default workspace resource if none provided if (workspaceResId == 0) { - workspaceResId = sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, R.xml.default_workspace); + workspaceResId = + sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, getDefaultWorkspaceResourceId()); } // Populate favorites table with initial favorites @@ -286,6 +287,14 @@ 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); } |