Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23c165a9 authored by Nilesh Agrawal's avatar Nilesh Agrawal Committed by Android (Google) Code Review
Browse files

Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit

parents 06a0ac2f f4ed1be4

src/com/android/launcher3/DynamicGrid.java

+6 −6
Original line number Diff line number Diff line
@@ -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",

src/com/android/launcher3/LauncherProvider.java

+10 −1
Original line number Diff line number Diff line
@@ -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);

    }