Launcher: Customize app shortcuts for Carrier

App shortcuts are displayed on home:

Screen 2
  - deskclock
  - calendar

Screen 3
  - bestpay, imusic, video, ezone, pdager, FJDXCartoon, mail189, sfreader
  - elive, ecp, pim, hall, jt, egame, mdesk

Change-Id: I848333548eabded42700aa11e874fae3c5362246
Signed-off-by: Xiaojing Zhang <zhangx@codeaurora.org>

2 files changed, 14 insertions, 8 deletions

diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index dfb41528c..1acba379b 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -56,28 +56,31 @@ public class DynamicGrid {
         ArrayList<DeviceProfile> deviceProfiles =
                 new ArrayList<DeviceProfile>();
         boolean hasAA = !LauncherAppState.isDisableAllApps();
+        boolean launcherShortcutEnabled = LauncherApplication.LAUNCHER_SHORTCUT_ENABLED;
+        int fourByFourDefaultLayout = launcherShortcutEnabled ? R.xml.ct_default_workspace_4x4
+                               : R.xml.default_workspace_4x4;
         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 ? 3 : 5), 48, R.xml.default_workspace_4x4,
+                255, 300,  2, 3,  48, 13, (hasAA ? 3 : 5), 48, fourByFourDefaultLayout,
                 R.xml.default_workspace_4x4_no_all_apps));
         deviceProfiles.add(new DeviceProfile("Shorter Stubby",
-                255, 400,  3, 3,  48, 13, (hasAA ? 3 : 5), 48, R.xml.default_workspace_4x4,
+                255, 400,  3, 3,  48, 13, (hasAA ? 3 : 5), 48, fourByFourDefaultLayout,
                 R.xml.default_workspace_4x4_no_all_apps));
         deviceProfiles.add(new DeviceProfile("Short Stubby",
-                275, 420,  3, 4,  48, 13, (hasAA ? 5 : 5), 48, R.xml.default_workspace_4x4,
+                275, 420,  3, 4,  48, 13, (hasAA ? 5 : 5), 48, fourByFourDefaultLayout,
                 R.xml.default_workspace_4x4_no_all_apps));
         deviceProfiles.add(new DeviceProfile("Stubby",
-                255, 450,  3, 4,  48, 13, (hasAA ? 5 : 5), 48, R.xml.default_workspace_4x4,
+                255, 450,  3, 4,  48, 13, (hasAA ? 5 : 5), 48, fourByFourDefaultLayout,
                 R.xml.default_workspace_4x4_no_all_apps));
         deviceProfiles.add(new DeviceProfile("Nexus S",
-                296, 491.33f,  4, 4,  48, 13, (hasAA ? 5 : 5), 48, R.xml.default_workspace_4x4,
+                296, 491.33f,  4, 4,  48, 13, (hasAA ? 5 : 5), 48, fourByFourDefaultLayout,
                 R.xml.default_workspace_4x4_no_all_apps));
         deviceProfiles.add(new DeviceProfile("Nexus 4",
-                335, 567,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56, R.xml.default_workspace_4x4,
+                335, 567,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56, fourByFourDefaultLayout,
                 R.xml.default_workspace_4x4_no_all_apps));
         deviceProfiles.add(new DeviceProfile("Nexus 5",
-                359, 567,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56, R.xml.default_workspace_4x4,
+                359, 567,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56, fourByFourDefaultLayout,
                 R.xml.default_workspace_4x4_no_all_apps));
         deviceProfiles.add(new DeviceProfile("Large Phone",
                 406, 694,  5, 5,  64, 14.4f,  5, 56, R.xml.default_workspace_5x5,
@@ -92,7 +95,7 @@ public class DynamicGrid {
                 727, 1207,  5, 6,  76, 14.4f,  7, 64, R.xml.default_workspace_5x6,
                 R.xml.default_workspace_5x6_no_all_apps));
         deviceProfiles.add(new DeviceProfile("20-inch Tablet",
-                1527, 2527,  7, 7,  100, 20,  7, 72, R.xml.default_workspace_4x4,
+                1527, 2527,  7, 7,  100, 20,  7, 72, fourByFourDefaultLayout,
                 R.xml.default_workspace_4x4_no_all_apps));
         mMinWidth = dpiFromPx(minWidthPx, dm);
         mMinHeight = dpiFromPx(minHeightPx, dm);
diff --git a/src/com/android/launcher3/LauncherApplication.java b/src/com/android/launcher3/LauncherApplication.java
index f0a08ffbe..1a74ab276 100644
--- a/src/com/android/launcher3/LauncherApplication.java
+++ b/src/com/android/launcher3/LauncherApplication.java
@@ -20,12 +20,15 @@ import android.app.Application;
 
 public class LauncherApplication extends Application {
     public static boolean LAUNCHER_SHOW_UNREAD_NUMBER;
+    public static boolean LAUNCHER_SHORTCUT_ENABLED;
 
     @Override
     public void onCreate() {
         super.onCreate();
         LAUNCHER_SHOW_UNREAD_NUMBER = getResources().getBoolean(
                 R.bool.config_launcher_show_unread_number);
+        LAUNCHER_SHORTCUT_ENABLED = getResources().getBoolean(
+                R.bool.config_launcher_shortcut);
         LauncherAppState.setApplicationContext(this);
         LauncherAppState.getInstance();
     }