diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index f70cc886ae..e8fa644e1f 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -71,7 +71,7 @@
 
     <application
         android:backupAgent="com.android.launcher3.LauncherBackupAgent"
-        android:name="com.android.launcher3.LauncherApplication"
+        android:name="app.lawnchair.LawnchairApp"
         android:fullBackupOnly="true"
         android:backupInForeground="true"
         android:fullBackupContent="@xml/backupscheme"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cd8dd39c8c..9e5f3e6299 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -47,7 +47,7 @@
         attributes and intent filters the same
         -->
         <activity
-            android:name="com.android.launcher3.Launcher"
+            android:name="app.lawnchair.LawnchairLauncher"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"
diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index 870b3f6a43..4a8446c398 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -72,7 +72,7 @@
             </intent-filter>
             <meta-data
                 android:name="com.android.launcher3.grid.control"
-                android:value="${packageName}.grid_control" />
+                android:value="${applicationId}.grid_control" />
         </activity>
 
     </application>
diff --git a/quickstep/res/color/bubblebar_drop_target_bg_color.xml b/quickstep/res/color/bubblebar_drop_target_bg_color.xml
index ca37c7ffff..8e03b2e09c 100644
--- a/quickstep/res/color/bubblebar_drop_target_bg_color.xml
+++ b/quickstep/res/color/bubblebar_drop_target_bg_color.xml
@@ -15,5 +15,5 @@
   -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:alpha="0.35" android:color="?androidprv:attr/materialColorPrimaryContainer" />
-</selector>
\ No newline at end of file
+    <item android:alpha="0.35" android:color="?attr/materialColorPrimaryContainer" />
+</selector>
diff --git a/quickstep/res/drawable/bg_bubble_bar_drop_target.xml b/quickstep/res/drawable/bg_bubble_bar_drop_target.xml
index 79e43187f4..f597cb5cb0 100644
--- a/quickstep/res/drawable/bg_bubble_bar_drop_target.xml
+++ b/quickstep/res/drawable/bg_bubble_bar_drop_target.xml
@@ -20,5 +20,5 @@
     <solid android:color="@color/bubblebar_drop_target_bg_color" />
     <stroke
         android:width="1dp"
-        android:color="?androidprv:attr/materialColorPrimaryContainer" />
+        android:color="?attr/materialColorPrimaryContainer" />
 </shape>
diff --git a/quickstep/res/drawable/bg_bubble_expanded_view_drop_target.xml b/quickstep/res/drawable/bg_bubble_expanded_view_drop_target.xml
index d722dd7f94..169e396524 100644
--- a/quickstep/res/drawable/bg_bubble_expanded_view_drop_target.xml
+++ b/quickstep/res/drawable/bg_bubble_expanded_view_drop_target.xml
@@ -22,6 +22,6 @@
         <solid android:color="@color/bubblebar_drop_target_bg_color" />
         <stroke
             android:width="1dp"
-            android:color="?androidprv:attr/materialColorPrimaryContainer" />
+            android:color="?attr/materialColorPrimaryContainer" />
     </shape>
 </inset>
diff --git a/quickstep/res/drawable/ic_chevron_down.xml b/quickstep/res/drawable/ic_chevron_down.xml
index f246cbc30c..b586e5003e 100644
--- a/quickstep/res/drawable/ic_chevron_down.xml
+++ b/quickstep/res/drawable/ic_chevron_down.xml
@@ -19,7 +19,7 @@
     android:width="48dp"
     android:height="48dp"
     android:autoMirrored="true"
-    android:tint="?androidprv:attr/materialColorOnSurface"
+    android:tint="?attr/materialColorOnSurface"
     android:viewportHeight="48"
     android:viewportWidth="48">
     <group
diff --git a/quickstep/res/layout/icon_app_chip_view.xml b/quickstep/res/layout/icon_app_chip_view.xml
index fb9bf998ec..36ece2abc5 100644
--- a/quickstep/res/layout/icon_app_chip_view.xml
+++ b/quickstep/res/layout/icon_app_chip_view.xml
@@ -26,7 +26,7 @@
     android:importantForAccessibility="no"
     android:autoMirrored="true"
     android:elevation="@dimen/task_thumbnail_icon_menu_elevation"
-    android:background="?androidprv:attr/materialColorSurfaceBright">
+    android:background="?attr/materialColorSurfaceBright">
 
     <!-- ignoring warning because the user of the anchor is a Rect where RTL is not needed -->
     <!-- This anchor's bounds is in the expected location after rotations and translations are
diff --git a/quickstep/res/layout/taskbar_divider_popup_menu.xml b/quickstep/res/layout/taskbar_divider_popup_menu.xml
index b184191fc0..3421e9029e 100644
--- a/quickstep/res/layout/taskbar_divider_popup_menu.xml
+++ b/quickstep/res/layout/taskbar_divider_popup_menu.xml
@@ -47,7 +47,7 @@
             android:backgroundTint="?android:attr/textColorPrimary" />
 
         <Switch
-            style="@style/Switch.SettingsLib"
+            style="@android:style/Widget.Material.CompoundButton.Switch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/taskbar_pinning_switch"
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 952505a484..1da1166631 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -124,7 +124,7 @@
     <style name="TextAppearance.GestureTutorial.ButtonLabel"
         parent="TextAppearance.GestureTutorial.CallToAction">
         <item name="android:gravity">center</item>
-        <item name="android:textColor">?androidprv:attr/materialColorOnPrimary</item>
+        <item name="android:textColor">?attr/materialColorOnPrimary</item>
         <item name="android:letterSpacing">0.02</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textAllCaps">false</item>
@@ -268,46 +268,46 @@
     <style name="KeyboardQuickSwitchText">
         <item name="fontFamily">google-sans-text</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
+        <item name="android:textColor">?attr/materialColorOnSurface</item>
         <item name="lineHeight">20sp</item>
     </style>
 
     <style name="KeyboardQuickSwitchText.OnBackground" parent="KeyboardQuickSwitchText">
-        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
+        <item name="android:textColor">?attr/materialColorOnSurface</item>
     </style>
 
     <style name="GestureTutorialActivity" parent="@style/AppTheme">
         <item name="background">@android:color/transparent</item>
         <item name="tutorialSubtitle">@android:color/black</item>
-        <item name="surfaceContainer">?androidprv:attr/materialColorSurfaceContainer</item>
-        <item name="onSurfaceHome">?androidprv:attr/materialColorPrimaryFixed</item>
+        <item name="surfaceContainer">?attr/materialColorSurfaceContainer</item>
+        <item name="onSurfaceHome">?attr/materialColorPrimaryFixed</item>
         <item name="surfaceHome">@android:color/system_accent1_300</item>
-        <item name="secondaryHome">?androidprv:attr/materialColorOnPrimaryFixedVariant</item>
-        <item name="onSurfaceBack">?androidprv:attr/materialColorTertiaryFixed</item>
+        <item name="secondaryHome">?attr/materialColorOnPrimaryFixedVariant</item>
+        <item name="onSurfaceBack">?attr/materialColorTertiaryFixed</item>
         <item name="surfaceBack">@android:color/system_accent3_300</item>
-        <item name="secondaryBack">?androidprv:attr/materialColorOnTertiaryFixedVariant</item>
-        <item name="onSurfaceOverview">?androidprv:attr/materialColorPrimaryFixed</item>
+        <item name="secondaryBack">?attr/materialColorOnTertiaryFixedVariant</item>
+        <item name="onSurfaceOverview">?attr/materialColorPrimaryFixed</item>
         <item name="surfaceOverview">@android:color/system_accent2_300</item>
-        <item name="secondaryOverview">?androidprv:attr/materialColorOnSecondaryFixedVariant</item>
+        <item name="secondaryOverview">?attr/materialColorOnSecondaryFixedVariant</item>
     </style>
 
     <style name="rotate_prompt_title" parent="TextAppearance.GestureTutorial.Dialog.Title">
-        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
+        <item name="android:textColor">?attr/materialColorOnSurface</item>
     </style>
 
     <style name="rotate_prompt_subtitle" parent="TextAppearance.GestureTutorial.Dialog.Subtitle">
-        <item name="android:textColor">?androidprv:attr/materialColorOnSurfaceVariant</item>
+        <item name="android:textColor">?attr/materialColorOnSurfaceVariant</item>
     </style>
 
     <style name="ArrowTipTaskbarStyle">
-        <item name="arrowTipBackground">?androidprv:attr/materialColorSurfaceContainer</item>
-        <item name="arrowTipTextColor">?androidprv:attr/materialColorOnSurface</item>
+        <item name="arrowTipBackground">?attr/materialColorSurfaceContainer</item>
+        <item name="arrowTipTextColor">?attr/materialColorOnSurface</item>
     </style>
 
     <style name="IconAppChipMenuTextStyle">
         <item name="android:fontFamily">google-sans-text-medium</item>
         <item name="android:textSize">@dimen/task_thumbnail_icon_menu_text_size</item>
-        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
+        <item name="android:textColor">?attr/materialColorOnSurface</item>
         <item name="android:letterSpacing">0.025</item>
         <item name="android:lineHeight">20sp</item>
     </style>
diff --git a/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml
index 379e0e53d6..ca9448964b 100644
--- a/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml
+++ b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle" >
-    <solid android:color="?androidprv:attr/materialColorOutlineVariant"/>
+    <solid android:color="?attr/materialColorOutlineVariant"/>
     <corners android:radius="@dimen/bottom_sheet_handle_corner_radius" />
 </shape>
diff --git a/res/drawable/ic_private_space_with_background.xml b/res/drawable/ic_private_space_with_background.xml
index cb37c9add5..fe85168d3b 100644
--- a/res/drawable/ic_private_space_with_background.xml
+++ b/res/drawable/ic_private_space_with_background.xml
@@ -20,7 +20,7 @@
     android:height="48dp">
     <path
         android:pathData="M48 24A24 24 0 0 1 0 24A24 24 0 0 1 48 24Z"
-        android:fillColor="?androidprv:attr/materialColorSurfaceContainerLowest" />
+        android:fillColor="?attr/materialColorSurfaceContainerLowest" />
     <path
         android:pathData="M24.0021 10.6641L13.3354 14.6641V22.7841C13.3354 29.5174 17.8821 35.7974 24.0021 37.3307C30.1221 35.7974 34.6688 29.5174 34.6688 22.7841V14.6641L24.0021 10.6641ZM32.0021 22.7841C32.0021 28.1174 28.6021 33.0507 24.0021 34.5574C19.4021 33.0507 16.0021 28.1307 16.0021 22.7841V16.5174L24.0021 13.5174L32.0021 16.5174V22.7841Z"
         android:fillType="evenOdd"
diff --git a/res/drawable/icon_menu_arrow_background.xml b/res/drawable/icon_menu_arrow_background.xml
index 2eb1dfcde5..8af3c00fad 100644
--- a/res/drawable/icon_menu_arrow_background.xml
+++ b/res/drawable/icon_menu_arrow_background.xml
@@ -22,7 +22,7 @@
         android:angle="0"
         android:startColor="#00000000"
         android:centerX="0.25"
-        android:centerColor="?androidprv:attr/materialColorSurfaceBright"
-        android:endColor="?androidprv:attr/materialColorSurfaceBright" />
+        android:centerColor="?attr/materialColorSurfaceBright"
+        android:endColor="?attr/materialColorSurfaceBright" />
     <corners android:radius="@dimen/dialogCornerRadius" />
 </shape>
\ No newline at end of file
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index ad9184d165..dcb1ae9083 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -19,16 +19,15 @@ package com.android.launcher3;
 import static com.android.launcher3.Utilities.dpiFromPx;
 import static com.android.launcher3.testing.shared.ResourceUtils.INVALID_RESOURCE_HANDLE;
 import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY;
-import static com.android.launcher3.util.DisplayController.CHANGE_DESKTOP_MODE;
 import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE;
 import static com.android.launcher3.util.DisplayController.CHANGE_SUPPORTED_BOUNDS;
-import static com.android.launcher3.util.DisplayController.CHANGE_TASKBAR_PINNING;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.annotation.TargetApi;
 import android.appwidget.AppWidgetHostView;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
@@ -74,22 +73,25 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
+
 import app.lawnchair.DeviceProfileOverrides;
 
 public class InvariantDeviceProfile implements SafeCloseable {
 
         public static final String TAG = "IDP";
-        // We do not need any synchronization for this variable as its only written on
-        // UI thread.
-        public static final MainThreadInitializedObject<InvariantDeviceProfile> INSTANCE = new MainThreadInitializedObject<>(
-                        InvariantDeviceProfile::new);
+        // We do not need any synchronization for this variable as its only written on UI thread.
+        public static final MainThreadInitializedObject<InvariantDeviceProfile> INSTANCE =
+                new MainThreadInitializedObject<>(InvariantDeviceProfile::new);
+
+        @Override
+        public void close() {
+
+        }
 
         @Retention(RetentionPolicy.SOURCE)
-        @IntDef({ TYPE_PHONE, TYPE_MULTI_DISPLAY, TYPE_TABLET })
-        public @interface DeviceType {
-        }
+        @IntDef({TYPE_PHONE, TYPE_MULTI_DISPLAY, TYPE_TABLET})
+        public @interface DeviceType {}
 
         public static final int TYPE_PHONE = 0;
         public static final int TYPE_MULTI_DISPLAY = 1;
@@ -97,29 +99,28 @@ public class InvariantDeviceProfile implements SafeCloseable {
 
         private static final float ICON_SIZE_DEFINED_IN_APP_DP = 48;
 
-        // Constants that affects the interpolation curve between statically defined
-        // device profile
+        // Constants that affects the interpolation curve between statically defined device profile
         // buckets.
         private static final float KNEARESTNEIGHBOR = 3;
         private static final float WEIGHT_POWER = 5;
 
-        // used to offset float not being able to express extremely small weights in
-        // extreme cases.
+        // used to offset float not being able to express extremely small weights in extreme cases.
         private static final float WEIGHT_EFFICIENT = 100000f;
 
-        // Used for arrays to specify different sizes (e.g. border spaces, width/height)
-        // in different
+        // Used for arrays to specify different sizes (e.g. border spaces, width/height) in different
         // constraints
         static final int COUNT_SIZES = 4;
-        static final int INDEX_DEFAULT = 0;
-        static final int INDEX_LANDSCAPE = 1;
-        static final int INDEX_TWO_PANEL_PORTRAIT = 2;
-        static final int INDEX_TWO_PANEL_LANDSCAPE = 3;
+        public static final int INDEX_DEFAULT = 0;
+        public static final int INDEX_LANDSCAPE = 1;
+        public static final int INDEX_TWO_PANEL_PORTRAIT = 2;
+        public static final int INDEX_TWO_PANEL_LANDSCAPE = 3;
 
-        /** These resources are used to override the device profile */
-        private static final String RES_GRID_NUM_ROWS = "grid_num_rows";
-        private static final String RES_GRID_NUM_COLUMNS = "grid_num_columns";
-        private static final String RES_GRID_ICON_SIZE_DP = "grid_icon_size_dp";
+        /** These resources are used to override the device profile  */
+        public static final String RES_GRID_NUM_ROWS = "grid_num_rows";
+        public static final String RES_GRID_NUM_COLUMNS = "grid_num_columns";
+        public static final String RES_GRID_ICON_SIZE_DP = "grid_icon_size_dp";
+
+        private static final String KEY_IDP_GRID_NAME = "idp_grid_name";
 
         /**
          * Number of icons per row and column in the workspace.
@@ -128,16 +129,21 @@ public class InvariantDeviceProfile implements SafeCloseable {
         public int numColumns;
         public int numSearchContainerColumns;
 
+        /**
+         * Original profile before preference overrides
+         */
+        public GridOption closestProfile;
+
         /**
          * Number of icons per row and column in the folder.
          */
-        public int[] numFolderRows;
-        public int[] numFolderColumns;
+        public int numFolderRows;
+        public int numFolderColumns;
         public float[] iconSize;
         public float[] iconTextSize;
         public int iconBitmapSize;
         public int fillResIconDpi;
-        public @DeviceType int deviceType;
+        public static @DeviceType int deviceType;
 
         public PointF[] minCellSize;
 
@@ -165,14 +171,13 @@ public class InvariantDeviceProfile implements SafeCloseable {
         public int numShownHotseatIcons;
 
         /**
-         * Number of icons inside the hotseat area that is stored in the database. This
-         * is greater than
-         * or equal to numnShownHotseatIcons, allowing for a seamless transition between
-         * two hotseat
+         * Number of icons inside the hotseat area that is stored in the database. This is greater than
+         * or equal to numnShownHotseatIcons, allowing for a seamless transition between two hotseat
          * sizes that share the same DB.
          */
         public int numDatabaseHotseatIcons;
 
+        public int[] hotseatColumnSpan;
         public float[] hotseatBarBottomSpace;
         public float[] hotseatQsbSpace;
 
@@ -180,7 +185,6 @@ public class InvariantDeviceProfile implements SafeCloseable {
          * Number of columns in the all apps list.
          */
         public int numAllAppsColumns;
-        public int numAllAppsRowsForCellHeightCalculation;
         public int numDatabaseAllAppsColumns;
         public @StyleRes int allAppsStyle;
 
@@ -190,10 +194,16 @@ public class InvariantDeviceProfile implements SafeCloseable {
         protected boolean isScalable;
         @XmlRes
         public int devicePaddingId = INVALID_RESOURCE_HANDLE;
+
+        public String dbFile;
+        public int defaultLayoutId;
+
         @XmlRes
         public int workspaceSpecsId = INVALID_RESOURCE_HANDLE;
+
         @XmlRes
         public int workspaceSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
+
         @XmlRes
         public int allAppsSpecsId = INVALID_RESOURCE_HANDLE;
         @XmlRes
@@ -206,6 +216,7 @@ public class InvariantDeviceProfile implements SafeCloseable {
         public int hotseatSpecsId = INVALID_RESOURCE_HANDLE;
         @XmlRes
         public int hotseatSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
+
         @XmlRes
         public int workspaceCellSpecsId = INVALID_RESOURCE_HANDLE;
         @XmlRes
@@ -214,9 +225,6 @@ public class InvariantDeviceProfile implements SafeCloseable {
         public int allAppsCellSpecsId = INVALID_RESOURCE_HANDLE;
         @XmlRes
         public int allAppsCellSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-
-        public String dbFile;
-        public int defaultLayoutId;
         public int demoModeLayoutId;
         public boolean[] inlineQsb = new boolean[COUNT_SIZES];
 
@@ -226,817 +234,12 @@ public class InvariantDeviceProfile implements SafeCloseable {
         public List<DeviceProfile> supportedProfiles = Collections.EMPTY_LIST;
 
         public Point defaultWallpaperSize;
+        public Rect defaultWidgetPadding;
 
         private final ArrayList<OnIDPChangeListener> mChangeListeners = new ArrayList<>();
 
         @VisibleForTesting
-        public InvariantDeviceProfile() {
-        }
-
-        @TargetApi(23)
-        private InvariantDeviceProfile(Context context) {
-                String gridName = getCurrentGridName(context);
-                String newGridName = initGrid(context, gridName);
-                if (!newGridName.equals(gridName)) {
-                        LauncherPrefs.get(context).put(GRID_NAME, newGridName);
-                }
-                LockedUserState.get(context).runOnUserUnlocked(() -> new DeviceGridState(this).writeToPrefs(context));
-
-                DisplayController.INSTANCE.get(context).setPriorityListener(
-                                (displayContext, info, flags) -> {
-                                        if ((flags & (CHANGE_DENSITY | CHANGE_SUPPORTED_BOUNDS
-                                                        | CHANGE_NAVIGATION_MODE | CHANGE_TASKBAR_PINNING
-                                                        | CHANGE_DESKTOP_MODE)) != 0) {
-                                                onConfigChanged(displayContext);
-                                        }
-                                });
-        }
-
-        /**
-         * This constructor should NOT have any monitors by design.
-         */
-        public InvariantDeviceProfile(Context context, String gridName) {
-                String newName = initGrid(context, gridName);
-                if (newName == null || !newName.equals(gridName)) {
-                        throw new IllegalArgumentException("Unknown grid name: " + gridName);
-                }
-        }
-
-        /**
-         * This constructor should NOT have any monitors by design.
-         */
-        public InvariantDeviceProfile(Context context, Display display) {
-                // Ensure that the main device profile is initialized
-                INSTANCE.get(context);
-                String gridName = getCurrentGridName(context);
-
-                // Get the display info based on default display and interpolate it to existing
-                // display
-                Info defaultInfo = DisplayController.INSTANCE.get(context).getInfo();
-                @DeviceType
-                int defaultDeviceType = defaultInfo.getDeviceType();
-                DisplayOption defaultDisplayOption = invDistWeightedInterpolate(
-                                defaultInfo,
-                                getPredefinedDeviceProfiles(context, gridName, defaultDeviceType,
-                                                /* allowDisabledGrid= */false),
-                                defaultDeviceType);
-
-                Context displayContext = context.createDisplayContext(display);
-                Info myInfo = new Info(displayContext);
-                @DeviceType
-                int deviceType = myInfo.getDeviceType();
-                DisplayOption myDisplayOption = invDistWeightedInterpolate(
-                                myInfo,
-                                getPredefinedDeviceProfiles(context, gridName, deviceType,
-                                                /* allowDisabledGrid= */false),
-                                deviceType);
-
-                DisplayOption result = new DisplayOption(defaultDisplayOption.grid)
-                                .add(myDisplayOption);
-                result.iconSizes[INDEX_DEFAULT] = defaultDisplayOption.iconSizes[INDEX_DEFAULT];
-                for (int i = 1; i < COUNT_SIZES; i++) {
-                        result.iconSizes[i] = Math.min(
-                                        defaultDisplayOption.iconSizes[i], myDisplayOption.iconSizes[i]);
-                }
-
-                System.arraycopy(defaultDisplayOption.minCellSize, 0, result.minCellSize, 0,
-                                COUNT_SIZES);
-                System.arraycopy(defaultDisplayOption.borderSpaces, 0, result.borderSpaces, 0,
-                                COUNT_SIZES);
-
-                initGrid(context, myInfo, result, deviceType);
-        }
-
-        @Override
-        public void close() {
-                DisplayController.INSTANCE.executeIfCreated(dc -> dc.setPriorityListener(null));
-        }
-
-        /**
-         * Reinitialize the current grid after a restore, where some grids might now be
-         * disabled.
-         */
-        public void reinitializeAfterRestore(Context context) {
-                String currentGridName = getCurrentGridName(context);
-                String currentDbFile = dbFile;
-                String newGridName = initGrid(context, currentGridName);
-                String newDbFile = dbFile;
-                FileLog.d(TAG, "Reinitializing grid after restore."
-                                + " currentGridName=" + currentGridName
-                                + ", currentDbFile=" + currentDbFile
-                                + ", newGridName=" + newGridName
-                                + ", newDbFile=" + newDbFile);
-                if (!newDbFile.equals(currentDbFile)) {
-                        FileLog.d(TAG, "Restored grid is disabled : " + currentGridName
-                                        + ", migrating to: " + newGridName
-                                        + ", removing all other grid db files");
-                        for (String gridDbFile : LauncherFiles.GRID_DB_FILES) {
-                                if (gridDbFile.equals(currentDbFile)) {
-                                        continue;
-                                }
-                                if (context.getDatabasePath(gridDbFile).delete()) {
-                                        FileLog.d(TAG, "Removed old grid db file: " + gridDbFile);
-                                }
-                        }
-                        setCurrentGrid(context, newGridName);
-                }
-        }
-
-        public static String getCurrentGridName(Context context) {
-                return LauncherPrefs.get(context).get(GRID_NAME);
-        }
-
-        private String initGrid(Context context, String gridName) {
-                Info displayInfo = DisplayController.INSTANCE.get(context).getInfo();
-                @DeviceType
-                int deviceType = displayInfo.getDeviceType();
-
-                ArrayList<DisplayOption> allOptions = getPredefinedDeviceProfiles(context, gridName, deviceType,
-                                RestoreDbTask.isPending(context));
-                DisplayOption displayOption = invDistWeightedInterpolate(displayInfo, allOptions, deviceType);
-                initGrid(context, displayInfo, displayOption, deviceType);
-                return displayOption.grid.name;
-        }
-
-        /**
-         * @deprecated This is a temporary solution because on the backup and restore
-         *             case we modify the
-         *             IDP, this resets it. b/332974074
-         */
-        @Deprecated
-        public void reset(Context context) {
-                initGrid(context, getCurrentGridName(context));
-        }
-
-        @VisibleForTesting
-        public static String getDefaultGridName(Context context) {
-                return new InvariantDeviceProfile().initGrid(context, null);
-        }
-
-        private void initGrid(Context context, Info displayInfo, DisplayOption displayOption,
-                        @DeviceType int deviceType) {
-                DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-                GridOption closestProfile = displayOption.grid;
-                numRows = closestProfile.numRows;
-                numColumns = closestProfile.numColumns;
-                numSearchContainerColumns = closestProfile.numSearchContainerColumns;
-                dbFile = closestProfile.dbFile;
-                defaultLayoutId = closestProfile.defaultLayoutId;
-                demoModeLayoutId = closestProfile.demoModeLayoutId;
-
-                numFolderRows = closestProfile.numFolderRows;
-                numFolderColumns = closestProfile.numFolderColumns;
-                folderStyle = closestProfile.folderStyle;
-
-                cellStyle = closestProfile.cellStyle;
-
-                isScalable = closestProfile.isScalable;
-                devicePaddingId = closestProfile.devicePaddingId;
-                workspaceSpecsId = closestProfile.mWorkspaceSpecsId;
-                workspaceSpecsTwoPanelId = closestProfile.mWorkspaceSpecsTwoPanelId;
-                allAppsSpecsId = closestProfile.mAllAppsSpecsId;
-                allAppsSpecsTwoPanelId = closestProfile.mAllAppsSpecsTwoPanelId;
-                folderSpecsId = closestProfile.mFolderSpecsId;
-                folderSpecsTwoPanelId = closestProfile.mFolderSpecsTwoPanelId;
-                hotseatSpecsId = closestProfile.mHotseatSpecsId;
-                hotseatSpecsTwoPanelId = closestProfile.mHotseatSpecsTwoPanelId;
-                workspaceCellSpecsId = closestProfile.mWorkspaceCellSpecsId;
-                workspaceCellSpecsTwoPanelId = closestProfile.mWorkspaceCellSpecsTwoPanelId;
-                allAppsCellSpecsId = closestProfile.mAllAppsCellSpecsId;
-                allAppsCellSpecsTwoPanelId = closestProfile.mAllAppsCellSpecsTwoPanelId;
-                numAllAppsRowsForCellHeightCalculation = closestProfile.mNumAllAppsRowsForCellHeightCalculation;
-                this.deviceType = deviceType;
-
-                inlineNavButtonsEndSpacing = closestProfile.inlineNavButtonsEndSpacing;
-
-                iconSize = displayOption.iconSizes;
-                float maxIconSize = iconSize[0];
-                for (int i = 1; i < iconSize.length; i++) {
-                        maxIconSize = Math.max(maxIconSize, iconSize[i]);
-                }
-                iconBitmapSize = ResourceUtils.pxFromDp(maxIconSize, metrics);
-                fillResIconDpi = getLauncherIconDensity(iconBitmapSize);
-
-                iconTextSize = displayOption.textSizes;
-
-                minCellSize = displayOption.minCellSize;
-
-                borderSpaces = displayOption.borderSpaces;
-
-                horizontalMargin = displayOption.horizontalMargin;
-
-                numShownHotseatIcons = closestProfile.numHotseatIcons;
-                numDatabaseHotseatIcons = deviceType == TYPE_MULTI_DISPLAY
-                                ? closestProfile.numDatabaseHotseatIcons
-                                : closestProfile.numHotseatIcons;
-                hotseatBarBottomSpace = displayOption.hotseatBarBottomSpace;
-                hotseatQsbSpace = displayOption.hotseatQsbSpace;
-
-                allAppsStyle = closestProfile.allAppsStyle;
-
-                numAllAppsColumns = closestProfile.numAllAppsColumns;
-
-                numDatabaseAllAppsColumns = deviceType == TYPE_MULTI_DISPLAY
-                                ? closestProfile.numDatabaseAllAppsColumns
-                                : closestProfile.numAllAppsColumns;
-
-                allAppsCellSize = displayOption.allAppsCellSize;
-                allAppsBorderSpaces = displayOption.allAppsBorderSpaces;
-                allAppsIconSize = displayOption.allAppsIconSizes;
-                allAppsIconTextSize = displayOption.allAppsIconTextSizes;
-
-                inlineQsb = closestProfile.inlineQsb;
-
-                transientTaskbarIconSize = displayOption.transientTaskbarIconSize;
-
-                startAlignTaskbar = displayOption.startAlignTaskbar;
-
-                // If the partner customization apk contains any grid overrides, apply them
-                // Supported overrides: numRows, numColumns, iconSize
-                applyPartnerDeviceProfileOverrides(context, metrics);
-
-                final List<DeviceProfile> localSupportedProfiles = new ArrayList<>();
-                defaultWallpaperSize = new Point(displayInfo.currentSize);
-                SparseArray<DotRenderer> dotRendererCache = new SparseArray<>();
-                for (WindowBounds bounds : displayInfo.supportedBounds) {
-                        localSupportedProfiles.add(new DeviceProfile.Builder(context, this, displayInfo)
-                                        .setIsMultiDisplay(deviceType == TYPE_MULTI_DISPLAY)
-                                        .setWindowBounds(bounds)
-                                        .setDotRendererCache(dotRendererCache)
-                                        .build());
-
-                        // Wallpaper size should be the maximum of the all possible sizes Launcher
-                        // expects
-                        int displayWidth = bounds.bounds.width();
-                        int displayHeight = bounds.bounds.height();
-                        defaultWallpaperSize.y = Math.max(defaultWallpaperSize.y, displayHeight);
-
-                        // We need to ensure that there is enough extra space in the wallpaper
-                        // for the intended parallax effects
-                        float parallaxFactor = dpiFromPx(Math.min(displayWidth, displayHeight),
-                                        displayInfo.getDensityDpi()) < 720
-                                                        ? 2
-                                                        : wallpaperTravelToScreenWidthRatio(displayWidth,
-                                                                        displayHeight);
-                        defaultWallpaperSize.x = Math.max(defaultWallpaperSize.x,
-                                        Math.round(parallaxFactor * displayWidth));
-                }
-                supportedProfiles = Collections.unmodifiableList(localSupportedProfiles);
-
-                int numMinShownHotseatIconsForTablet = supportedProfiles
-                                .stream()
-                                .filter(deviceProfile -> deviceProfile.isTablet)
-                                .mapToInt(deviceProfile -> deviceProfile.numShownHotseatIcons)
-                                .min()
-                                .orElse(0);
-
-                supportedProfiles
-                                .stream()
-                                .filter(deviceProfile -> deviceProfile.isTablet)
-                                .forEach(deviceProfile -> {
-                                        deviceProfile.numShownHotseatIcons = numMinShownHotseatIconsForTablet;
-                                        deviceProfile.recalculateHotseatWidthAndBorderSpace();
-                                });
-        }
-
-        public void addOnChangeListener(OnIDPChangeListener listener) {
-                mChangeListeners.add(listener);
-        }
-
-        public void removeOnChangeListener(OnIDPChangeListener listener) {
-                mChangeListeners.remove(listener);
-        }
-
-        public void setCurrentGrid(Context context, String gridName) {
-                LauncherPrefs.get(context).put(GRID_NAME, gridName);
-                MAIN_EXECUTOR.execute(() -> onConfigChanged(context.getApplicationContext()));
-        }
-
-        private Object[] toModelState() {
-                return new Object[] {
-                                numColumns, numRows, numSearchContainerColumns, numDatabaseHotseatIcons,
-                                iconBitmapSize, fillResIconDpi, numDatabaseAllAppsColumns, dbFile };
-        }
-
-        /** Updates IDP using the provided context. Notifies listeners of change. */
-        @VisibleForTesting
-        public void onConfigChanged(Context context) {
-                Object[] oldState = toModelState();
-
-                // Re-init grid
-                String gridName = getCurrentGridName(context);
-                initGrid(context, gridName);
-
-                boolean modelPropsChanged = !Arrays.equals(oldState, toModelState());
-                for (OnIDPChangeListener listener : mChangeListeners) {
-                        listener.onIdpChanged(modelPropsChanged);
-                }
-        }
-
-        private static ArrayList<DisplayOption> getPredefinedDeviceProfiles(Context context,
-                        String gridName, @DeviceType int deviceType, boolean allowDisabledGrid) {
-                ArrayList<DisplayOption> profiles = new ArrayList<>();
-
-                try (XmlResourceParser parser = context.getResources().getXml(R.xml.device_profiles)) {
-                        final int depth = parser.getDepth();
-                        int type;
-                        while (((type = parser.next()) != XmlPullParser.END_TAG ||
-                                        parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
-                                if ((type == XmlPullParser.START_TAG)
-                                                && GridOption.TAG_NAME.equals(parser.getName())) {
-
-                                        GridOption gridOption = new GridOption(context, Xml.asAttributeSet(parser));
-                                        if (gridOption.isEnabled(deviceType) || allowDisabledGrid) {
-                                                final int displayDepth = parser.getDepth();
-                                                while (((type = parser.next()) != XmlPullParser.END_TAG
-                                                                || parser.getDepth() > displayDepth)
-                                                                && type != XmlPullParser.END_DOCUMENT) {
-                                                        if ((type == XmlPullParser.START_TAG)
-                                                                        && "display-option".equals(
-                                                                                        parser.getName())) {
-                                                                profiles.add(new DisplayOption(gridOption, context,
-                                                                                Xml.asAttributeSet(parser)));
-                                                        }
-                                                }
-                                        }
-                                }
-                        }
-                } catch (IOException | XmlPullParserException e) {
-                        throw new RuntimeException(e);
-                }
-
-                ArrayList<DisplayOption> filteredProfiles = new ArrayList<>();
-                if (!TextUtils.isEmpty(gridName)) {
-                        for (DisplayOption option : profiles) {
-                                if (gridName.equals(option.grid.name)
-                                                && (option.grid.isEnabled(deviceType) || allowDisabledGrid)) {
-                                        filteredProfiles.add(option);
-                                }
-                        }
-                }
-                if (filteredProfiles.isEmpty()) {
-                        // No grid found, use the default options
-                        for (DisplayOption option : profiles) {
-                                if (option.canBeDefault) {
-                                        filteredProfiles.add(option);
-                                }
-                        }
-                }
-                if (filteredProfiles.isEmpty()) {
-                        throw new RuntimeException("No display option with canBeDefault=true");
-                }
-                return filteredProfiles;
-        }
-
-        /**
-         * Returns the GridOption associated to the given file name or null if the
-         * fileName is not
-         * supported.
-         * Ej, launcher.db -> "normal grid", launcher_4_by_4.db -> "practical grid"
-         */
-        public GridOption getGridOptionFromFileName(Context context, String fileName) {
-                return parseAllGridOptions(context).stream()
-                                .filter(gridOption -> Objects.equals(gridOption.dbFile, fileName))
-                                .findFirst()
-                                .orElse(null);
-        }
-
-        /**
-         * Returns the name of the given size on the current device or empty string if
-         * the size is not
-         * supported. Ej. 4x4 -> normal, 5x4 -> practical, etc.
-         * (Note: the name of the grid can be different for the same grid size depending
-         * of
-         * the values of the InvariantDeviceProfile)
-         *
-         */
-        public String getGridNameFromSize(Context context, Point size) {
-                return parseAllGridOptions(context).stream()
-                                .filter(gridOption -> gridOption.numColumns == size.x
-                                                && gridOption.numRows == size.y)
-                                .map(gridOption -> gridOption.name)
-                                .findFirst()
-                                .orElse("");
-        }
-
-        /**
-         * Returns the grid option for the given gridName on the current device (Note:
-         * the gridOption
-         * be different for the same gridName depending on the values of the
-         * InvariantDeviceProfile).
-         */
-        public GridOption getGridOptionFromName(Context context, String gridName) {
-                return parseAllGridOptions(context).stream()
-                                .filter(gridOption -> Objects.equals(gridOption.name, gridName))
-                                .findFirst()
-                                .orElse(null);
-        }
-
-        /**
-         * @return all the grid options that can be shown on the device
-         */
-        public List<GridOption> parseAllGridOptions(Context context) {
-                return parseAllDefinedGridOptions(context)
-                                .stream()
-                                .filter(go -> go.isEnabled(deviceType))
-                                .collect(Collectors.toList());
-        }
-
-        /**
-         * @return all the grid options that can be shown on the device
-         */
-        public static List<GridOption> parseAllDefinedGridOptions(Context context) {
-                List<GridOption> result = new ArrayList<>();
-
-                try (XmlResourceParser parser = context.getResources().getXml(R.xml.device_profiles)) {
-                        final int depth = parser.getDepth();
-                        int type;
-                        while (((type = parser.next()) != XmlPullParser.END_TAG
-                                        || parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
-                                if ((type == XmlPullParser.START_TAG)
-                                                && GridOption.TAG_NAME.equals(parser.getName())) {
-                                        result.add(new GridOption(context, Xml.asAttributeSet(parser)));
-                                }
-                        }
-                } catch (IOException | XmlPullParserException e) {
-                        Log.e(TAG, "Error parsing device profile", e);
-                        return Collections.emptyList();
-                }
-                return result;
-        }
-
-        private int getLauncherIconDensity(int requiredSize) {
-                // Densities typically defined by an app.
-                int[] densityBuckets = new int[] {
-                                DisplayMetrics.DENSITY_LOW,
-                                DisplayMetrics.DENSITY_MEDIUM,
-                                DisplayMetrics.DENSITY_TV,
-                                DisplayMetrics.DENSITY_HIGH,
-                                DisplayMetrics.DENSITY_XHIGH,
-                                DisplayMetrics.DENSITY_XXHIGH,
-                                DisplayMetrics.DENSITY_XXXHIGH
-                };
-
-                int density = DisplayMetrics.DENSITY_XXXHIGH;
-                for (int i = densityBuckets.length - 1; i >= 0; i--) {
-                        float expectedSize = ICON_SIZE_DEFINED_IN_APP_DP * densityBuckets[i]
-                                        / DisplayMetrics.DENSITY_DEFAULT;
-                        if (expectedSize >= requiredSize) {
-                                density = densityBuckets[i];
-                        }
-                }
-
-                return density;
-        }
-
-        /**
-         * Apply any Partner customization grid overrides.
-         *
-         * Currently we support: all apps row / column count.
-         */
-        private void applyPartnerDeviceProfileOverrides(Context context, DisplayMetrics dm) {
-                Partner p = Partner.get(context.getPackageManager());
-                if (p == null) {
-                        return;
-                }
-                try {
-                        int numRows = p.getIntValue(RES_GRID_NUM_ROWS, -1);
-                        int numColumns = p.getIntValue(RES_GRID_NUM_COLUMNS, -1);
-                        float iconSizePx = p.getDimenValue(RES_GRID_ICON_SIZE_DP, -1);
-
-                        if (numRows > 0 && numColumns > 0) {
-                                this.numRows = numRows;
-                                this.numColumns = numColumns;
-                        }
-                        if (iconSizePx > 0) {
-                                this.iconSize[InvariantDeviceProfile.INDEX_DEFAULT] = Utilities.dpiFromPx(iconSizePx,
-                                                dm.densityDpi);
-                        }
-                } catch (Resources.NotFoundException ex) {
-                        Log.e(TAG, "Invalid Partner grid resource!", ex);
-                }
-        }
-
-        private static float dist(float x0, float y0, float x1, float y1) {
-                return (float) Math.hypot(x1 - x0, y1 - y0);
-        }
-
-        private static DisplayOption invDistWeightedInterpolate(
-                        Info displayInfo, ArrayList<DisplayOption> points, @DeviceType int deviceType) {
-                int minWidthPx = Integer.MAX_VALUE;
-                int minHeightPx = Integer.MAX_VALUE;
-                for (WindowBounds bounds : displayInfo.supportedBounds) {
-                        boolean isTablet = displayInfo.isTablet(bounds);
-                        if (isTablet && deviceType == TYPE_MULTI_DISPLAY) {
-                                // For split displays, take half width per page
-                                minWidthPx = Math.min(minWidthPx, bounds.availableSize.x / 2);
-                                minHeightPx = Math.min(minHeightPx, bounds.availableSize.y);
-
-                        } else if (!isTablet && bounds.isLandscape()) {
-                                // We will use transposed layout in this case
-                                minWidthPx = Math.min(minWidthPx, bounds.availableSize.y);
-                                minHeightPx = Math.min(minHeightPx, bounds.availableSize.x);
-                        } else {
-                                minWidthPx = Math.min(minWidthPx, bounds.availableSize.x);
-                                minHeightPx = Math.min(minHeightPx, bounds.availableSize.y);
-                        }
-                }
-
-                float width = dpiFromPx(minWidthPx, displayInfo.getDensityDpi());
-                float height = dpiFromPx(minHeightPx, displayInfo.getDensityDpi());
-
-                // Sort the profiles based on the closeness to the device size
-                Collections.sort(points, (a, b) -> Float.compare(dist(width, height, a.minWidthDps, a.minHeightDps),
-                                dist(width, height, b.minWidthDps, b.minHeightDps)));
-
-                DisplayOption closestPoint = points.get(0);
-                GridOption closestOption = closestPoint.grid;
-                float weights = 0;
-
-                if (dist(width, height, closestPoint.minWidthDps, closestPoint.minHeightDps) == 0) {
-                        return closestPoint;
-                }
-
-                DisplayOption out = new DisplayOption(closestOption);
-                for (int i = 0; i < points.size() && i < KNEARESTNEIGHBOR; ++i) {
-                        DisplayOption p = points.get(i);
-                        float w = weight(width, height, p.minWidthDps, p.minHeightDps, WEIGHT_POWER);
-                        weights += w;
-                        out.add(new DisplayOption().add(p).multiply(w));
-                }
-                out.multiply(1.0f / weights);
-
-                // Since the bitmaps are persisted, ensure that all bitmap sizes are not larger
-                // than
-                // predefined size to avoid cache invalidation
-                for (int i = INDEX_DEFAULT; i < COUNT_SIZES; i++) {
-                        out.iconSizes[i] = Math.min(out.iconSizes[i], closestPoint.iconSizes[i]);
-                }
-
-                return out;
-        }
-
-        public DeviceProfile getDeviceProfile(Context context) {
-                WindowManagerProxy windowManagerProxy = WindowManagerProxy.INSTANCE.get(context);
-                Rect bounds = windowManagerProxy.getCurrentBounds(context);
-                int rotation = windowManagerProxy.getRotation(context);
-
-                return getBestMatch(bounds.width(), bounds.height(), rotation);
-        }
-
-        /**
-         * Returns the device profile matching the provided screen configuration
-         */
-        public DeviceProfile getBestMatch(float screenWidth, float screenHeight, int rotation) {
-                DeviceProfile bestMatch = supportedProfiles.get(0);
-                float minDiff = Float.MAX_VALUE;
-
-                for (DeviceProfile profile : supportedProfiles) {
-                        float diff = Math.abs(profile.widthPx - screenWidth)
-                                        + Math.abs(profile.heightPx - screenHeight);
-                        if (diff < minDiff) {
-                                minDiff = diff;
-                                bestMatch = profile;
-                        } else if (diff == minDiff && profile.rotationHint == rotation) {
-                                bestMatch = profile;
-                        }
-                }
-                return bestMatch;
-        }
-
-        private static float weight(float x0, float y0, float x1, float y1, float pow) {
-                float d = dist(x0, y0, x1, y1);
-                if (Float.compare(d, 0f) == 0) {
-                        return Float.POSITIVE_INFINITY;
-                }
-                return (float) (WEIGHT_EFFICIENT / Math.pow(d, pow));
-        }
-
-        /**
-         * As a ratio of screen height, the total distance we want the parallax effect
-         * to span
-         * horizontally
-         */
-        private static float wallpaperTravelToScreenWidthRatio(int width, int height) {
-                float aspectRatio = width / (float) height;
-
-                // At an aspect ratio of 16/10, the wallpaper parallax effect should span 1.5 *
-                // screen width
-                // At an aspect ratio of 10/16, the wallpaper parallax effect should span 1.2 *
-                // screen width
-                // We will use these two data points to extrapolate how much the wallpaper
-                // parallax effect
-                // to span (ie travel) at any aspect ratio:
-
-                final float ASPECT_RATIO_LANDSCAPE = 16 / 10f;
-                final float ASPECT_RATIO_PORTRAIT = 10 / 16f;
-                final float WALLPAPER_WIDTH_TO_SCREEN_RATIO_LANDSCAPE = 1.5f;
-                final float WALLPAPER_WIDTH_TO_SCREEN_RATIO_PORTRAIT = 1.2f;
-
-                // To find out the desired width at different aspect ratios, we use the
-                // following two
-                // formulas, where the coefficient on x is the aspect ratio (width/height):
-                // (16/10)x + y = 1.5
-                // (10/16)x + y = 1.2
-                // We solve for x and y and end up with a final formula:
-                final float x = (WALLPAPER_WIDTH_TO_SCREEN_RATIO_LANDSCAPE
-                                - WALLPAPER_WIDTH_TO_SCREEN_RATIO_PORTRAIT) /
-                                (ASPECT_RATIO_LANDSCAPE - ASPECT_RATIO_PORTRAIT);
-                final float y = WALLPAPER_WIDTH_TO_SCREEN_RATIO_PORTRAIT - x * ASPECT_RATIO_PORTRAIT;
-                return x * aspectRatio + y;
-        }
-
-        public interface OnIDPChangeListener {
-
-                /**
-                 * Number of icons per row and column in the workspace.
-                 */
-                public int numRows;
-                public int numColumns;
-                public int numSearchContainerColumns;
-
-                /**
-                 * Original profile before preference overrides
-                 */
-                public GridOption closestProfile;
-
-                /**
-                 * Number of icons per row and column in the folder.
-                 */
-                public int numFolderRows;
-                public int numFolderColumns;
-                public float[] iconSize;
-                public float[] iconTextSize;
-                public int iconBitmapSize;
-                public int fillResIconDpi;
-                public static @DeviceType int deviceType;
-
-                public PointF[] minCellSize;
-
-                public PointF[] borderSpaces;
-                public @DimenRes int inlineNavButtonsEndSpacing;
-
-                public @StyleRes int folderStyle;
-
-                public @StyleRes int cellStyle;
-
-                private final int[] numFolderRows = new int[COUNT_SIZES];
-                private final int[] numFolderColumns = new int[COUNT_SIZES];
-                private final @StyleRes int folderStyle;
-                private final @StyleRes int cellStyle;
-
-                private final @StyleRes int allAppsStyle;
-                private final int numAllAppsColumns;
-                private final int mNumAllAppsRowsForCellHeightCalculation;
-                private final int numDatabaseAllAppsColumns;
-                private final int numHotseatIcons;
-                private final int numDatabaseHotseatIcons;
-
-                private final boolean[] inlineQsb = new boolean[COUNT_SIZES];
-
-                /**
-                 * Number of icons inside the hotseat area.
-                 */
-                public int numShownHotseatIcons;
-
-                /**
-                 * Number of icons inside the hotseat area that is stored in the database. This
-                 * is greater than
-                 * or equal to numnShownHotseatIcons, allowing for a seamless transition between
-                 * two hotseat
-                 * sizes that share the same DB.
-                 */
-                public int numDatabaseHotseatIcons;
-
-                private final boolean isScalable;
-                private final int devicePaddingId;
-                private final int mWorkspaceSpecsId;
-                private final int mWorkspaceSpecsTwoPanelId;
-                private final int mAllAppsSpecsId;
-                private final int mAllAppsSpecsTwoPanelId;
-                private final int mFolderSpecsId;
-                private final int mFolderSpecsTwoPanelId;
-                private final int mHotseatSpecsId;
-                private final int mHotseatSpecsTwoPanelId;
-                private final int mWorkspaceCellSpecsId;
-                private final int mWorkspaceCellSpecsTwoPanelId;
-                private final int mAllAppsCellSpecsId;
-                private final int mAllAppsCellSpecsTwoPanelId;
-
-                /**
-                 * Number of columns in the all apps list.
-                 */
-                public int numAllAppsColumns;
-                public int numDatabaseAllAppsColumns;
-                public @StyleRes int allAppsStyle;
-
-                /**
-                 * Do not query directly. see {@link DeviceProfile#isScalableGrid}.
-                 */
-                protected boolean isScalable;
-                @XmlRes
-                public int devicePaddingId = INVALID_RESOURCE_HANDLE;
-
-                public String dbFile;
-                public int defaultLayoutId;
-
-        @XmlRes
-        public int workspaceSpecsId = INVALID_RESOURCE_HANDLE;
-
-                inlineNavButtonsEndSpacing=a.getResourceId(R.styleable.GridDisplayOption_inlineNavButtonsEndSpacing,R.dimen.taskbar_button_margin_default);
-
-                numFolderRows[INDEX_DEFAULT]=a.getInt(R.styleable.GridDisplayOption_numFolderRows,numRows);numFolderColumns[INDEX_DEFAULT]=a.getInt(R.styleable.GridDisplayOption_numFolderColumns,numColumns);
-
-                if(FeatureFlags.enableResponsiveWorkspace())
-                {
-                        numFolderRows[INDEX_LANDSCAPE] = a.getInt(
-                                        R.styleable.GridDisplayOption_numFolderRowsLandscape,
-                                        numFolderRows[INDEX_DEFAULT]);
-                        numFolderColumns[INDEX_LANDSCAPE] = a.getInt(
-                                        R.styleable.GridDisplayOption_numFolderColumnsLandscape,
-                                        numFolderColumns[INDEX_DEFAULT]);
-                        numFolderRows[INDEX_TWO_PANEL_PORTRAIT] = a.getInt(
-                                        R.styleable.GridDisplayOption_numFolderRowsTwoPanelPortrait,
-                                        numFolderRows[INDEX_DEFAULT]);
-                        numFolderColumns[INDEX_TWO_PANEL_PORTRAIT] = a.getInt(
-                                        R.styleable.GridDisplayOption_numFolderColumnsTwoPanelPortrait,
-                                        numFolderColumns[INDEX_DEFAULT]);
-                        numFolderRows[INDEX_TWO_PANEL_LANDSCAPE] = a.getInt(
-                                        R.styleable.GridDisplayOption_numFolderRowsTwoPanelLandscape,
-                                        numFolderRows[INDEX_DEFAULT]);
-                        numFolderColumns[INDEX_TWO_PANEL_LANDSCAPE] = a.getInt(
-                                        R.styleable.GridDisplayOption_numFolderColumnsTwoPanelLandscape,
-                                        numFolderColumns[INDEX_DEFAULT]);
-                }else
-                {
-                        numFolderRows[INDEX_LANDSCAPE] = numFolderRows[INDEX_DEFAULT];
-                        numFolderColumns[INDEX_LANDSCAPE] = numFolderColumns[INDEX_DEFAULT];
-                        numFolderRows[INDEX_TWO_PANEL_PORTRAIT] = numFolderRows[INDEX_DEFAULT];
-                        numFolderColumns[INDEX_TWO_PANEL_PORTRAIT] = numFolderColumns[INDEX_DEFAULT];
-                        numFolderRows[INDEX_TWO_PANEL_LANDSCAPE] = numFolderRows[INDEX_DEFAULT];
-                        numFolderColumns[INDEX_TWO_PANEL_LANDSCAPE] = numFolderColumns[INDEX_DEFAULT];
-                }
-
-                folderStyle=a.getResourceId(R.styleable.GridDisplayOption_folderStyle,INVALID_RESOURCE_HANDLE);
-
-                public Point defaultWallpaperSize;
-                public Rect defaultWidgetPadding;
-
-                private final ArrayList<OnIDPChangeListener> mChangeListeners = new ArrayList<>();
-
-                if(FeatureFlags.enableResponsiveWorkspace())
-                {
-                        mWorkspaceSpecsId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_workspaceSpecsId, INVALID_RESOURCE_HANDLE);
-                        mWorkspaceSpecsTwoPanelId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_workspaceSpecsTwoPanelId,
-                                        mWorkspaceSpecsId);
-                        mAllAppsSpecsId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_allAppsSpecsId, INVALID_RESOURCE_HANDLE);
-                        mAllAppsSpecsTwoPanelId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_allAppsSpecsTwoPanelId,
-                                        mAllAppsSpecsId);
-                        mFolderSpecsId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_folderSpecsId, INVALID_RESOURCE_HANDLE);
-                        mFolderSpecsTwoPanelId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_folderSpecsTwoPanelId,
-                                        mFolderSpecsId);
-                        mHotseatSpecsId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_hotseatSpecsId, INVALID_RESOURCE_HANDLE);
-                        mHotseatSpecsTwoPanelId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_hotseatSpecsTwoPanelId,
-                                        mHotseatSpecsId);
-                        mWorkspaceCellSpecsId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_workspaceCellSpecsId,
-                                        INVALID_RESOURCE_HANDLE);
-                        mWorkspaceCellSpecsTwoPanelId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_workspaceCellSpecsTwoPanelId,
-                                        mWorkspaceCellSpecsId);
-                        mAllAppsCellSpecsId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_allAppsCellSpecsId,
-                                        INVALID_RESOURCE_HANDLE);
-                        mAllAppsCellSpecsTwoPanelId = a.getResourceId(
-                                        R.styleable.GridDisplayOption_allAppsCellSpecsTwoPanelId,
-                                        mAllAppsCellSpecsId);
-                        mNumAllAppsRowsForCellHeightCalculation = a.getInt(
-                                        R.styleable.GridDisplayOption_numAllAppsRowsForCellHeightCalculation,
-                                        numRows);
-                }else
-                {
-                        mWorkspaceSpecsId = INVALID_RESOURCE_HANDLE;
-                        mWorkspaceSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                        mAllAppsSpecsId = INVALID_RESOURCE_HANDLE;
-                        mAllAppsSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                        mFolderSpecsId = INVALID_RESOURCE_HANDLE;
-                        mFolderSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                        mHotseatSpecsId = INVALID_RESOURCE_HANDLE;
-                        mHotseatSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                        mWorkspaceCellSpecsId = INVALID_RESOURCE_HANDLE;
-                        mWorkspaceCellSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                        mAllAppsCellSpecsId = INVALID_RESOURCE_HANDLE;
-                        mAllAppsCellSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                        mNumAllAppsRowsForCellHeightCalculation = numRows;
-                }
+        public InvariantDeviceProfile() { }
 
         @TargetApi(23)
         private InvariantDeviceProfile(Context context) {
@@ -1137,191 +340,186 @@ public class InvariantDeviceProfile implements SafeCloseable {
                 }
         }
 
-                public static @DeviceType int getDeviceType(Info displayInfo) {
-                        int flagPhone = 1 << 0;
-                        int flagTablet = 1 << 1;
+        public static @DeviceType int getDeviceType(Info displayInfo) {
+                int flagPhone = 1 << 0;
+                int flagTablet = 1 << 1;
 
-                        int type = displayInfo.supportedBounds.stream()
-                                        .mapToInt(bounds -> displayInfo.isTablet(bounds) ? flagTablet : flagPhone)
-                                        .reduce(0, (a, b) -> a | b);
-                        if ((type == (flagPhone | flagTablet))) {
-                                // device has profiles supporting both phone and table modes
-                                return TYPE_MULTI_DISPLAY;
-                        } else if (type == flagTablet) {
-                                return TYPE_TABLET;
-                        } else {
-                                return TYPE_PHONE;
-                        }
+                int type = displayInfo.supportedBounds.stream()
+                        .mapToInt(bounds -> displayInfo.isTablet(bounds) ? flagTablet : flagPhone)
+                        .reduce(0, (a, b) -> a | b);
+                if ((type == (flagPhone | flagTablet))) {
+                        // device has profiles supporting both phone and table modes
+                        return TYPE_MULTI_DISPLAY;
+                } else if (type == flagTablet) {
+                        return TYPE_TABLET;
+                } else {
+                        return TYPE_PHONE;
                 }
+        }
 
-                public static String getCurrentGridName(Context context) {
-                        return DeviceProfileOverrides.INSTANCE.get(context).getCurrentGridName();
+        public static String getCurrentGridName(Context context) {
+                return DeviceProfileOverrides.INSTANCE.get(context).getCurrentGridName();
+        }
+
+        private String initGrid(Context context, String gridName, DeviceProfileOverrides.DBGridInfo dbGridInfo) {
+                Info displayInfo = DisplayController.INSTANCE.get(context).getInfo();
+                @DeviceType int deviceType = getDeviceType(displayInfo);
+
+                ArrayList<DisplayOption> allOptions =
+                        getPredefinedDeviceProfiles(context, gridName, deviceType,
+                                RestoreDbTask.isPending(context));
+                DisplayOption displayOption =
+                        invDistWeightedInterpolate(displayInfo, allOptions, deviceType);
+                initGrid(context, displayInfo, displayOption, deviceType, dbGridInfo);
+                return displayOption.grid.name;
+        }
+
+        private void initGrid(Context context, Info displayInfo, DisplayOption displayOption,
+                              @DeviceType int deviceType) {
+                DeviceProfileOverrides.DBGridInfo dbGridInfo = DeviceProfileOverrides.INSTANCE.get(context)
+                        .getGridInfo();
+                initGrid(context, displayInfo, displayOption, deviceType, dbGridInfo);
+        }
+
+        private String initGrid(Context context, String gridName) {
+                DeviceProfileOverrides.DBGridInfo dbGridInfo = DeviceProfileOverrides.INSTANCE.get(context)
+                        .getGridInfo();
+                return initGrid(context, gridName, dbGridInfo);
+        }
+
+        @VisibleForTesting
+        public static String getDefaultGridName(Context context) {
+                return new InvariantDeviceProfile().initGrid(context, null);
+        }
+
+        private void initGrid(Context context, Info displayInfo, DisplayOption displayOption,
+                              @DeviceType int deviceType, DeviceProfileOverrides.DBGridInfo dbGridInfo) {
+                DeviceProfileOverrides.Options overrideOptions = DeviceProfileOverrides.INSTANCE.get(context)
+                        .getOverrides(displayOption.grid);
+                DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+                closestProfile = displayOption.grid;
+                numRows = dbGridInfo.getNumRows();
+                numColumns = dbGridInfo.getNumColumns();
+                numSearchContainerColumns = closestProfile.numSearchContainerColumns;
+                dbFile = dbGridInfo.getDbFile();
+                defaultLayoutId = closestProfile.defaultLayoutId;
+                demoModeLayoutId = closestProfile.demoModeLayoutId;
+
+                numFolderRows = closestProfile.numFolderRows;
+                numFolderColumns = closestProfile.numFolderColumns;
+                folderStyle = closestProfile.folderStyle;
+
+                cellStyle = closestProfile.cellStyle;
+
+                isScalable = closestProfile.isScalable;
+                devicePaddingId = closestProfile.devicePaddingId;
+                workspaceSpecsId = closestProfile.mWorkspaceSpecsId;
+                workspaceSpecsTwoPanelId = closestProfile.mWorkspaceSpecsTwoPanelId;
+                allAppsSpecsId = closestProfile.mAllAppsSpecsId;
+                allAppsSpecsTwoPanelId = closestProfile.mAllAppsSpecsTwoPanelId;
+                folderSpecsId = closestProfile.mFolderSpecsId;
+                folderSpecsTwoPanelId = closestProfile.mFolderSpecsTwoPanelId;
+                hotseatSpecsId = closestProfile.mHotseatSpecsId;
+                hotseatSpecsTwoPanelId = closestProfile.mHotseatSpecsTwoPanelId;
+                workspaceCellSpecsId = closestProfile.mWorkspaceCellSpecsId;
+                workspaceCellSpecsTwoPanelId = closestProfile.mWorkspaceCellSpecsTwoPanelId;
+                allAppsCellSpecsId = closestProfile.mAllAppsCellSpecsId;
+                allAppsCellSpecsTwoPanelId = closestProfile.mAllAppsCellSpecsTwoPanelId;
+
+                this.deviceType = deviceType;
+
+                inlineNavButtonsEndSpacing = closestProfile.inlineNavButtonsEndSpacing;
+
+                iconSize = displayOption.iconSizes;
+                float maxIconSize = iconSize[0];
+                for (int i = 1; i < iconSize.length; i++) {
+                        maxIconSize = Math.max(maxIconSize, iconSize[i]);
                 }
+                iconBitmapSize = ResourceUtils.pxFromDp(maxIconSize, metrics);
+                fillResIconDpi = getLauncherIconDensity(iconBitmapSize);
 
-                private String initGrid(Context context, String gridName,
-                                DeviceProfileOverrides.DBGridInfo dbGridInfo) {
-                        Info displayInfo = DisplayController.INSTANCE.get(context).getInfo();
-                        @DeviceType
-                        int deviceType = getDeviceType(displayInfo);
+                iconTextSize = displayOption.textSizes;
 
-                        ArrayList<DisplayOption> allOptions = getPredefinedDeviceProfiles(context, gridName, deviceType,
-                                        RestoreDbTask.isPending(context));
-                        DisplayOption displayOption = invDistWeightedInterpolate(displayInfo, allOptions, deviceType);
-                        initGrid(context, displayInfo, displayOption, deviceType, dbGridInfo);
-                        return displayOption.grid.name;
+                minCellSize = displayOption.minCellSize;
+
+                borderSpaces = displayOption.borderSpaces;
+
+                horizontalMargin = displayOption.horizontalMargin;
+
+                numShownHotseatIcons = deviceType == TYPE_MULTI_DISPLAY
+                        ? closestProfile.numHotseatIcons : dbGridInfo.getNumHotseatColumns();
+                numDatabaseHotseatIcons = deviceType == TYPE_MULTI_DISPLAY
+                        ? closestProfile.numDatabaseHotseatIcons : numShownHotseatIcons;
+                hotseatColumnSpan = closestProfile.hotseatColumnSpan;
+                hotseatBarBottomSpace = displayOption.hotseatBarBottomSpace;
+                hotseatQsbSpace = displayOption.hotseatQsbSpace;
+
+                allAppsStyle = closestProfile.allAppsStyle;
+
+                numAllAppsColumns = closestProfile.numAllAppsColumns;
+                numDatabaseAllAppsColumns = deviceType == TYPE_MULTI_DISPLAY
+                        ? closestProfile.numDatabaseAllAppsColumns : closestProfile.numAllAppsColumns;
+
+                allAppsCellSize = displayOption.allAppsCellSize;
+                allAppsBorderSpaces = displayOption.allAppsBorderSpaces;
+                allAppsIconSize = displayOption.allAppsIconSizes;
+                allAppsIconTextSize = displayOption.allAppsIconTextSizes;
+
+                inlineQsb = closestProfile.inlineQsb;
+
+                transientTaskbarIconSize = displayOption.transientTaskbarIconSize;
+
+                startAlignTaskbar = displayOption.startAlignTaskbar;
+
+                // If the partner customization apk contains any grid overrides, apply them
+                // Supported overrides: numRows, numColumns, iconSize
+                applyPartnerDeviceProfileOverrides(context, metrics);
+
+                // Lawnchair ignores partner overrides and allows the user to customize the grid themselves
+                overrideOptions.applyUi(this);
+
+                final List<DeviceProfile> localSupportedProfiles = new ArrayList<>();
+                defaultWallpaperSize = new Point(displayInfo.currentSize);
+                SparseArray<DotRenderer> dotRendererCache = new SparseArray<>();
+                for (WindowBounds bounds : displayInfo.supportedBounds) {
+                        localSupportedProfiles.add(new DeviceProfile.Builder(context, this, displayInfo)
+                                .setIsMultiDisplay(deviceType == TYPE_MULTI_DISPLAY)
+                                .setWindowBounds(bounds)
+                                .setDotRendererCache(dotRendererCache)
+                                .build());
+
+                        // Wallpaper size should be the maximum of the all possible sizes Launcher expects
+                        int displayWidth = bounds.bounds.width();
+                        int displayHeight = bounds.bounds.height();
+                        defaultWallpaperSize.y = Math.max(defaultWallpaperSize.y, displayHeight);
+
+                        // We need to ensure that there is enough extra space in the wallpaper
+                        // for the intended parallax effects
+                        float parallaxFactor =
+                                dpiFromPx(Math.min(displayWidth, displayHeight), displayInfo.getDensityDpi())
+                                        < 720
+                                        ? 2
+                                        : wallpaperTravelToScreenWidthRatio(displayWidth, displayHeight);
+                        defaultWallpaperSize.x =
+                                Math.max(defaultWallpaperSize.x, Math.round(parallaxFactor * displayWidth));
                 }
+                supportedProfiles = Collections.unmodifiableList(localSupportedProfiles);
 
-                private void initGrid(Context context, Info displayInfo, DisplayOption displayOption,
-                                @DeviceType int deviceType) {
-                        DeviceProfileOverrides.DBGridInfo dbGridInfo = DeviceProfileOverrides.INSTANCE.get(context)
-                                        .getGridInfo();
-                        initGrid(context, displayInfo, displayOption, deviceType, dbGridInfo);
-                }
+                int numMinShownHotseatIconsForTablet = supportedProfiles
+                        .stream()
+                        .filter(deviceProfile -> deviceProfile.isTablet)
+                        .mapToInt(deviceProfile -> deviceProfile.numShownHotseatIcons)
+                        .min()
+                        .orElse(0);
 
-                private String initGrid(Context context, String gridName) {
-                        DeviceProfileOverrides.DBGridInfo dbGridInfo = DeviceProfileOverrides.INSTANCE.get(context)
-                                        .getGridInfo();
-                        return initGrid(context, gridName, dbGridInfo);
-                }
-
-                @VisibleForTesting
-                public static String getDefaultGridName(Context context) {
-                        return new InvariantDeviceProfile().initGrid(context, null);
-                }
-
-                private void initGrid(Context context, Info displayInfo, DisplayOption displayOption,
-                                @DeviceType int deviceType, DeviceProfileOverrides.DBGridInfo dbGridInfo) {
-                        DeviceProfileOverrides.Options overrideOptions = DeviceProfileOverrides.INSTANCE.get(context)
-                                        .getOverrides(displayOption.grid);
-                        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-                        closestProfile = displayOption.grid;
-                        numRows = dbGridInfo.getNumRows();
-                        numColumns = dbGridInfo.getNumColumns();
-                        numSearchContainerColumns = closestProfile.numSearchContainerColumns;
-                        dbFile = dbGridInfo.getDbFile();
-                        defaultLayoutId = closestProfile.defaultLayoutId;
-                        demoModeLayoutId = closestProfile.demoModeLayoutId;
-
-                        numFolderRows = closestProfile.numFolderRows;
-                        numFolderColumns = closestProfile.numFolderColumns;
-                        folderStyle = closestProfile.folderStyle;
-
-                        cellStyle = closestProfile.cellStyle;
-
-                        isScalable = closestProfile.isScalable;
-                        devicePaddingId = closestProfile.devicePaddingId;
-                        workspaceSpecsId = closestProfile.mWorkspaceSpecsId;
-                        workspaceSpecsTwoPanelId = closestProfile.mWorkspaceSpecsTwoPanelId;
-                        allAppsSpecsId = closestProfile.mAllAppsSpecsId;
-                        allAppsSpecsTwoPanelId = closestProfile.mAllAppsSpecsTwoPanelId;
-                        folderSpecsId = closestProfile.mFolderSpecsId;
-                        folderSpecsTwoPanelId = closestProfile.mFolderSpecsTwoPanelId;
-                        hotseatSpecsId = closestProfile.mHotseatSpecsId;
-                        hotseatSpecsTwoPanelId = closestProfile.mHotseatSpecsTwoPanelId;
-                        workspaceCellSpecsId = closestProfile.mWorkspaceCellSpecsId;
-                        workspaceCellSpecsTwoPanelId = closestProfile.mWorkspaceCellSpecsTwoPanelId;
-                        allAppsCellSpecsId = closestProfile.mAllAppsCellSpecsId;
-                        allAppsCellSpecsTwoPanelId = closestProfile.mAllAppsCellSpecsTwoPanelId;
-
-                        this.deviceType = deviceType;
-
-                        inlineNavButtonsEndSpacing = closestProfile.inlineNavButtonsEndSpacing;
-
-                        iconSize = displayOption.iconSizes;
-                        float maxIconSize = iconSize[0];
-                        for (int i = 1; i < iconSize.length; i++) {
-                                maxIconSize = Math.max(maxIconSize, iconSize[i]);
-                        }
-                        iconBitmapSize = ResourceUtils.pxFromDp(maxIconSize, metrics);
-                        fillResIconDpi = getLauncherIconDensity(iconBitmapSize);
-
-                        iconTextSize = displayOption.textSizes;
-
-                        minCellSize = displayOption.minCellSize;
-
-                        borderSpaces = displayOption.borderSpaces;
-
-                        horizontalMargin = displayOption.horizontalMargin;
-
-                        numShownHotseatIcons = deviceType == TYPE_MULTI_DISPLAY
-                                        ? closestProfile.numHotseatIcons
-                                        : dbGridInfo.getNumHotseatColumns();
-                        numDatabaseHotseatIcons = deviceType == TYPE_MULTI_DISPLAY
-                                        ? closestProfile.numDatabaseHotseatIcons
-                                        : numShownHotseatIcons;
-                        hotseatColumnSpan = closestProfile.hotseatColumnSpan;
-                        hotseatBarBottomSpace = displayOption.hotseatBarBottomSpace;
-                        hotseatQsbSpace = displayOption.hotseatQsbSpace;
-
-                        allAppsStyle = closestProfile.allAppsStyle;
-
-                        numAllAppsColumns = closestProfile.numAllAppsColumns;
-                        numDatabaseAllAppsColumns = deviceType == TYPE_MULTI_DISPLAY
-                                        ? closestProfile.numDatabaseAllAppsColumns
-                                        : closestProfile.numAllAppsColumns;
-
-                        allAppsCellSize = displayOption.allAppsCellSize;
-                        allAppsBorderSpaces = displayOption.allAppsBorderSpaces;
-                        allAppsIconSize = displayOption.allAppsIconSizes;
-                        allAppsIconTextSize = displayOption.allAppsIconTextSizes;
-
-                        inlineQsb = closestProfile.inlineQsb;
-
-                        transientTaskbarIconSize = displayOption.transientTaskbarIconSize;
-
-                        startAlignTaskbar = displayOption.startAlignTaskbar;
-
-                        // If the partner customization apk contains any grid overrides, apply them
-                        // Supported overrides: numRows, numColumns, iconSize
-                        applyPartnerDeviceProfileOverrides(context, metrics);
-
-                        // Lawnchair ignores partner overrides and allows the user to customize the grid
-                        // themselves
-                        overrideOptions.applyUi(this);
-
-                        final List<DeviceProfile> localSupportedProfiles = new ArrayList<>();
-                        defaultWallpaperSize = new Point(displayInfo.currentSize);
-                        SparseArray<DotRenderer> dotRendererCache = new SparseArray<>();
-                        for (WindowBounds bounds : displayInfo.supportedBounds) {
-                                localSupportedProfiles.add(new DeviceProfile.Builder(context, this, displayInfo)
-                                                .setIsMultiDisplay(deviceType == TYPE_MULTI_DISPLAY)
-                                                .setWindowBounds(bounds)
-                                                .setDotRendererCache(dotRendererCache)
-                                                .build());
-
-                                // Wallpaper size should be the maximum of the all possible sizes Launcher
-                                // expects
-                                int displayWidth = bounds.bounds.width();
-                                int displayHeight = bounds.bounds.height();
-                                defaultWallpaperSize.y = Math.max(defaultWallpaperSize.y, displayHeight);
-
-                                // We need to ensure that there is enough extra space in the wallpaper
-                                // for the intended parallax effects
-                                float parallaxFactor = dpiFromPx(Math.min(displayWidth, displayHeight),
-                                                displayInfo.getDensityDpi()) < 720
-                                                                ? 2
-                                                                : wallpaperTravelToScreenWidthRatio(displayWidth,
-                                                                                displayHeight);
-                                defaultWallpaperSize.x = Math.max(defaultWallpaperSize.x,
-                                                Math.round(parallaxFactor * displayWidth));
-                        }
-                        supportedProfiles = Collections.unmodifiableList(localSupportedProfiles);
-
-                        int numMinShownHotseatIconsForTablet = supportedProfiles
-                                        .stream()
-                                        .filter(deviceProfile -> deviceProfile.isTablet)
-                                        .mapToInt(deviceProfile -> deviceProfile.numShownHotseatIcons)
-                                        .min()
-                                        .orElse(0);
-
-                        supportedProfiles
-                                        .stream()
-                                        .filter(deviceProfile -> deviceProfile.isTablet)
-                                        .forEach(deviceProfile -> {
-                                                deviceProfile.numShownHotseatIcons = numMinShownHotseatIconsForTablet;
-                                                deviceProfile.recalculateHotseatWidthAndBorderSpace();
-                                        });
-                }
+                supportedProfiles
+                        .stream()
+                        .filter(deviceProfile -> deviceProfile.isTablet)
+                        .forEach(deviceProfile -> {
+                                deviceProfile.numShownHotseatIcons = numMinShownHotseatIconsForTablet;
+                                deviceProfile.recalculateHotseatWidthAndBorderSpace();
+                        });
+        }
 
         public void addOnChangeListener(OnIDPChangeListener listener) {
                 mChangeListeners.add(listener);
@@ -1342,227 +540,223 @@ public class InvariantDeviceProfile implements SafeCloseable {
                 MAIN_EXECUTOR.execute(() -> onConfigChanged(appContext));
         }
 
-                private Object[] toModelState() {
-                        return new Object[] {
-                                        numColumns, numRows, numSearchContainerColumns, numDatabaseHotseatIcons,
-                                        iconBitmapSize, fillResIconDpi, numDatabaseAllAppsColumns, dbFile };
+        private Object[] toModelState() {
+                return new Object[]{
+                        numColumns, numRows, numSearchContainerColumns, numDatabaseHotseatIcons,
+                        iconBitmapSize, fillResIconDpi, numDatabaseAllAppsColumns, dbFile};
+        }
+
+        private void onConfigChanged(Context context) {
+                Object[] oldState = toModelState();
+
+                // Re-init grid
+                String gridName = getCurrentGridName(context);
+                initGrid(context, gridName);
+
+                boolean modelPropsChanged = !Arrays.equals(oldState, toModelState());
+                for (OnIDPChangeListener listener : mChangeListeners) {
+                        listener.onIdpChanged(modelPropsChanged);
                 }
+        }
 
-                private void onConfigChanged(Context context) {
-                        Object[] oldState = toModelState();
+        private static ArrayList<DisplayOption> getPredefinedDeviceProfiles(Context context,
+                                                                            String gridName, @DeviceType int deviceType, boolean allowDisabledGrid) {
+                ArrayList<DisplayOption> profiles = new ArrayList<>();
 
-                        // Re-init grid
-                        String gridName = getCurrentGridName(context);
-                        initGrid(context, gridName);
+                try (XmlResourceParser parser = context.getResources().getXml(R.xml.device_profiles)) {
+                        final int depth = parser.getDepth();
+                        int type;
+                        while (((type = parser.next()) != XmlPullParser.END_TAG ||
+                                parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
+                                if ((type == XmlPullParser.START_TAG)
+                                        && GridOption.TAG_NAME.equals(parser.getName())) {
 
-                        boolean modelPropsChanged = !Arrays.equals(oldState, toModelState());
-                        for (OnIDPChangeListener listener : mChangeListeners) {
-                                listener.onIdpChanged(modelPropsChanged);
-                        }
-                }
-
-                private static ArrayList<DisplayOption> getPredefinedDeviceProfiles(Context context,
-                                String gridName, @DeviceType int deviceType, boolean allowDisabledGrid) {
-                        ArrayList<DisplayOption> profiles = new ArrayList<>();
-
-                        try (XmlResourceParser parser = context.getResources().getXml(R.xml.device_profiles)) {
-                                final int depth = parser.getDepth();
-                                int type;
-                                while (((type = parser.next()) != XmlPullParser.END_TAG ||
-                                                parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
-                                        if ((type == XmlPullParser.START_TAG)
-                                                        && GridOption.TAG_NAME.equals(parser.getName())) {
-
-                                                GridOption gridOption = new GridOption(context,
-                                                                Xml.asAttributeSet(parser));
-                                                if (gridOption.isEnabled(deviceType) || allowDisabledGrid) {
-                                                        final int displayDepth = parser.getDepth();
-                                                        while (((type = parser.next()) != XmlPullParser.END_TAG
-                                                                        || parser.getDepth() > displayDepth)
-                                                                        && type != XmlPullParser.END_DOCUMENT) {
-                                                                if ((type == XmlPullParser.START_TAG)
-                                                                                && "display-option".equals(
-                                                                                                parser.getName())) {
-                                                                        profiles.add(new DisplayOption(gridOption,
-                                                                                        context,
-                                                                                        Xml.asAttributeSet(parser)));
-                                                                }
+                                        GridOption gridOption = new GridOption(context, Xml.asAttributeSet(parser));
+                                        if (gridOption.isEnabled(deviceType) || allowDisabledGrid) {
+                                                final int displayDepth = parser.getDepth();
+                                                while (((type = parser.next()) != XmlPullParser.END_TAG
+                                                        || parser.getDepth() > displayDepth)
+                                                        && type != XmlPullParser.END_DOCUMENT) {
+                                                        if ((type == XmlPullParser.START_TAG) && "display-option".equals(
+                                                                parser.getName())) {
+                                                                profiles.add(new DisplayOption(gridOption, context,
+                                                                        Xml.asAttributeSet(parser)));
                                                         }
                                                 }
                                         }
                                 }
-                        } catch (IOException | XmlPullParserException e) {
-                                throw new RuntimeException(e);
                         }
-
-                        ArrayList<DisplayOption> filteredProfiles = new ArrayList<>();
-                        if (!TextUtils.isEmpty(gridName)) {
-                                for (DisplayOption option : profiles) {
-                                        if (gridName.equals(option.grid.name)
-                                                        && (option.grid.isEnabled(deviceType) || allowDisabledGrid)) {
-                                                filteredProfiles.add(option);
-                                        }
-                                }
-                        }
-                        if (filteredProfiles.isEmpty()) {
-                                // No grid found, use the default options
-                                for (DisplayOption option : profiles) {
-                                        if (option.canBeDefault) {
-                                                filteredProfiles.add(option);
-                                        }
-                                }
-                        }
-                        if (filteredProfiles.isEmpty()) {
-                                throw new RuntimeException("No display option with canBeDefault=true");
-                        }
-                        return filteredProfiles;
+                } catch (IOException | XmlPullParserException e) {
+                        throw new RuntimeException(e);
                 }
 
-                /**
-                 * @return all the grid options that can be shown on the device
-                 */
-                public static List<GridOption> parseAllGridOptions(Context context) {
-                        return parseAllDefinedGridOptions(context)
-                                        .stream()
-                                        .filter(go -> go.isEnabled(deviceType))
-                                        .collect(Collectors.toList());
-                }
-
-                /**
-                 * @return all the grid options that can be shown on the device
-                 */
-                public static List<GridOption> parseAllDefinedGridOptions(Context context) {
-                        List<GridOption> result = new ArrayList<>();
-
-                        try (XmlResourceParser parser = context.getResources().getXml(R.xml.device_profiles)) {
-                                final int depth = parser.getDepth();
-                                int type;
-                                while (((type = parser.next()) != XmlPullParser.END_TAG
-                                                || parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
-                                        if ((type == XmlPullParser.START_TAG)
-                                                        && GridOption.TAG_NAME.equals(parser.getName())) {
-                                                result.add(new GridOption(context, Xml.asAttributeSet(parser)));
-                                        }
-                                }
-                        } catch (IOException | XmlPullParserException e) {
-                                Log.e(TAG, "Error parsing device profile", e);
-                                return Collections.emptyList();
-                        }
-                        return result;
-                }
-
-                private int getLauncherIconDensity(int requiredSize) {
-                        // Densities typically defined by an app.
-                        int[] densityBuckets = new int[] {
-                                        DisplayMetrics.DENSITY_LOW,
-                                        DisplayMetrics.DENSITY_MEDIUM,
-                                        DisplayMetrics.DENSITY_TV,
-                                        DisplayMetrics.DENSITY_HIGH,
-                                        DisplayMetrics.DENSITY_XHIGH,
-                                        DisplayMetrics.DENSITY_XXHIGH,
-                                        DisplayMetrics.DENSITY_XXXHIGH
-                        };
-
-                        int density = DisplayMetrics.DENSITY_XXXHIGH;
-                        for (int i = densityBuckets.length - 1; i >= 0; i--) {
-                                float expectedSize = ICON_SIZE_DEFINED_IN_APP_DP * densityBuckets[i]
-                                                / DisplayMetrics.DENSITY_DEFAULT;
-                                if (expectedSize >= requiredSize) {
-                                        density = densityBuckets[i];
+                ArrayList<DisplayOption> filteredProfiles = new ArrayList<>();
+                if (!TextUtils.isEmpty(gridName)) {
+                        for (DisplayOption option : profiles) {
+                                if (gridName.equals(option.grid.name)
+                                        && (option.grid.isEnabled(deviceType) || allowDisabledGrid)) {
+                                        filteredProfiles.add(option);
                                 }
                         }
-
-                        return density;
                 }
-
-                /**
-                 * Apply any Partner customization grid overrides.
-                 *
-                 * Currently we support: all apps row / column count.
-                 */
-                private void applyPartnerDeviceProfileOverrides(Context context, DisplayMetrics dm) {
-                        Partner p = Partner.get(context.getPackageManager());
-                        if (p == null) {
-                                return;
+                if (filteredProfiles.isEmpty()) {
+                        // No grid found, use the default options
+                        for (DisplayOption option : profiles) {
+                                if (option.canBeDefault) {
+                                        filteredProfiles.add(option);
+                                }
                         }
-                        try {
-                                int numRows = p.getIntValue(RES_GRID_NUM_ROWS, -1);
-                                int numColumns = p.getIntValue(RES_GRID_NUM_COLUMNS, -1);
-                                float iconSizePx = p.getDimenValue(RES_GRID_ICON_SIZE_DP, -1);
+                }
+                if (filteredProfiles.isEmpty()) {
+                        throw new RuntimeException("No display option with canBeDefault=true");
+                }
+                return filteredProfiles;
+        }
 
-                                if (numRows > 0 && numColumns > 0) {
-                                        this.numRows = numRows;
-                                        this.numColumns = numColumns;
+        /**
+         * @return all the grid options that can be shown on the device
+         */
+        public static List<GridOption> parseAllGridOptions(Context context) {
+                return parseAllDefinedGridOptions(context)
+                        .stream()
+                        .filter(go -> go.isEnabled(deviceType))
+                        .collect(Collectors.toList());
+        }
+
+        /**
+         * @return all the grid options that can be shown on the device
+         */
+        public static List<GridOption> parseAllDefinedGridOptions(Context context) {
+                List<GridOption> result = new ArrayList<>();
+
+                try (XmlResourceParser parser = context.getResources().getXml(R.xml.device_profiles)) {
+                        final int depth = parser.getDepth();
+                        int type;
+                        while (((type = parser.next()) != XmlPullParser.END_TAG
+                                || parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
+                                if ((type == XmlPullParser.START_TAG)
+                                        && GridOption.TAG_NAME.equals(parser.getName())) {
+                                        result.add(new GridOption(context, Xml.asAttributeSet(parser)));
                                 }
-                                if (iconSizePx > 0) {
-                                        this.iconSize[InvariantDeviceProfile.INDEX_DEFAULT] = Utilities
-                                                        .dpiFromPx(iconSizePx, dm.densityDpi);
-                                }
-                        } catch (Resources.NotFoundException ex) {
-                                Log.e(TAG, "Invalid Partner grid resource!", ex);
+                        }
+                } catch (IOException | XmlPullParserException e) {
+                        Log.e(TAG, "Error parsing device profile", e);
+                        return Collections.emptyList();
+                }
+                return result;
+        }
+
+        private int getLauncherIconDensity(int requiredSize) {
+                // Densities typically defined by an app.
+                int[] densityBuckets = new int[]{
+                        DisplayMetrics.DENSITY_LOW,
+                        DisplayMetrics.DENSITY_MEDIUM,
+                        DisplayMetrics.DENSITY_TV,
+                        DisplayMetrics.DENSITY_HIGH,
+                        DisplayMetrics.DENSITY_XHIGH,
+                        DisplayMetrics.DENSITY_XXHIGH,
+                        DisplayMetrics.DENSITY_XXXHIGH
+                };
+
+                int density = DisplayMetrics.DENSITY_XXXHIGH;
+                for (int i = densityBuckets.length - 1; i >= 0; i--) {
+                        float expectedSize = ICON_SIZE_DEFINED_IN_APP_DP * densityBuckets[i]
+                                / DisplayMetrics.DENSITY_DEFAULT;
+                        if (expectedSize >= requiredSize) {
+                                density = densityBuckets[i];
                         }
                 }
 
-                private static float dist(float x0, float y0, float x1, float y1) {
-                        return (float) Math.hypot(x1 - x0, y1 - y0);
+                return density;
+        }
+
+        /**
+         * Apply any Partner customization grid overrides.
+         *
+         * Currently we support: all apps row / column count.
+         */
+        private void applyPartnerDeviceProfileOverrides(Context context, DisplayMetrics dm) {
+                Partner p = Partner.get(context.getPackageManager());
+                if (p == null) {
+                        return;
+                }
+                try {
+                        int numRows = p.getIntValue(RES_GRID_NUM_ROWS, -1);
+                        int numColumns = p.getIntValue(RES_GRID_NUM_COLUMNS, -1);
+                        float iconSizePx = p.getDimenValue(RES_GRID_ICON_SIZE_DP, -1);
+
+                        if (numRows > 0 && numColumns > 0) {
+                                this.numRows = numRows;
+                                this.numColumns = numColumns;
+                        }
+                        if (iconSizePx > 0) {
+                                this.iconSize[InvariantDeviceProfile.INDEX_DEFAULT] =
+                                        Utilities.dpiFromPx(iconSizePx, dm.densityDpi);
+                        }
+                } catch (Resources.NotFoundException ex) {
+                        Log.e(TAG, "Invalid Partner grid resource!", ex);
+                }
+        }
+
+        private static float dist(float x0, float y0, float x1, float y1) {
+                return (float) Math.hypot(x1 - x0, y1 - y0);
+        }
+
+        private static DisplayOption invDistWeightedInterpolate(
+                Info displayInfo, ArrayList<DisplayOption> points, @DeviceType int deviceType) {
+                int minWidthPx = Integer.MAX_VALUE;
+                int minHeightPx = Integer.MAX_VALUE;
+                for (WindowBounds bounds : displayInfo.supportedBounds) {
+                        boolean isTablet = displayInfo.isTablet(bounds);
+                        if (isTablet && deviceType == TYPE_MULTI_DISPLAY) {
+                                // For split displays, take half width per page
+                                minWidthPx = Math.min(minWidthPx, bounds.availableSize.x / 2);
+                                minHeightPx = Math.min(minHeightPx, bounds.availableSize.y);
+
+                        } else if (!isTablet && bounds.isLandscape()) {
+                                // We will use transposed layout in this case
+                                minWidthPx = Math.min(minWidthPx, bounds.availableSize.y);
+                                minHeightPx = Math.min(minHeightPx, bounds.availableSize.x);
+                        } else {
+                                minWidthPx = Math.min(minWidthPx, bounds.availableSize.x);
+                                minHeightPx = Math.min(minHeightPx, bounds.availableSize.y);
+                        }
                 }
 
-                private static DisplayOption invDistWeightedInterpolate(
-                                Info displayInfo, ArrayList<DisplayOption> points, @DeviceType int deviceType) {
-                        int minWidthPx = Integer.MAX_VALUE;
-                        int minHeightPx = Integer.MAX_VALUE;
-                        for (WindowBounds bounds : displayInfo.supportedBounds) {
-                                boolean isTablet = displayInfo.isTablet(bounds);
-                                if (isTablet && deviceType == TYPE_MULTI_DISPLAY) {
-                                        // For split displays, take half width per page
-                                        minWidthPx = Math.min(minWidthPx, bounds.availableSize.x / 2);
-                                        minHeightPx = Math.min(minHeightPx, bounds.availableSize.y);
+                float width = dpiFromPx(minWidthPx, displayInfo.getDensityDpi());
+                float height = dpiFromPx(minHeightPx, displayInfo.getDensityDpi());
 
-                                } else if (!isTablet && bounds.isLandscape()) {
-                                        // We will use transposed layout in this case
-                                        minWidthPx = Math.min(minWidthPx, bounds.availableSize.y);
-                                        minHeightPx = Math.min(minHeightPx, bounds.availableSize.x);
-                                } else {
-                                        minWidthPx = Math.min(minWidthPx, bounds.availableSize.x);
-                                        minHeightPx = Math.min(minHeightPx, bounds.availableSize.y);
-                                }
-                        }
+                // Sort the profiles based on the closeness to the device size
+                Collections.sort(points, (a, b) ->
+                        Float.compare(dist(width, height, a.minWidthDps, a.minHeightDps),
+                                dist(width, height, b.minWidthDps, b.minHeightDps)));
 
-                        float width = dpiFromPx(minWidthPx, displayInfo.getDensityDpi());
-                        float height = dpiFromPx(minHeightPx, displayInfo.getDensityDpi());
+                DisplayOption closestPoint = points.get(0);
+                GridOption closestOption = closestPoint.grid;
+                float weights = 0;
 
-                        // Sort the profiles based on the closeness to the device size
-                        Collections.sort(points,
-                                        (a, b) -> Float.compare(dist(width, height, a.minWidthDps, a.minHeightDps),
-                                                        dist(width, height, b.minWidthDps, b.minHeightDps)));
-
-                        DisplayOption closestPoint = points.get(0);
-                        GridOption closestOption = closestPoint.grid;
-                        float weights = 0;
-
-                        if (dist(width, height, closestPoint.minWidthDps, closestPoint.minHeightDps) == 0) {
-                                return closestPoint;
-                        }
-
-                        DisplayOption out = new DisplayOption(closestOption);
-                        for (int i = 0; i < points.size() && i < KNEARESTNEIGHBOR; ++i) {
-                                DisplayOption p = points.get(i);
-                                float w = weight(width, height, p.minWidthDps, p.minHeightDps, WEIGHT_POWER);
-                                weights += w;
-                                out.add(new DisplayOption().add(p).multiply(w));
-                        }
-                        out.multiply(1.0f / weights);
-
-                        // Since the bitmaps are persisted, ensure that all bitmap sizes are not larger
-                        // than
-                        // predefined size to avoid cache invalidation
-                        for (int i = INDEX_DEFAULT; i < COUNT_SIZES; i++) {
-                                out.iconSizes[i] = Math.min(out.iconSizes[i], closestPoint.iconSizes[i]);
-                        }
-
-                        return out;
+                if (dist(width, height, closestPoint.minWidthDps, closestPoint.minHeightDps) == 0) {
+                        return closestPoint;
                 }
 
+                DisplayOption out = new DisplayOption(closestOption);
+                for (int i = 0; i < points.size() && i < KNEARESTNEIGHBOR; ++i) {
+                        DisplayOption p = points.get(i);
+                        float w = weight(width, height, p.minWidthDps, p.minHeightDps, WEIGHT_POWER);
+                        weights += w;
+                        out.add(new DisplayOption().add(p).multiply(w));
+                }
+                out.multiply(1.0f / weights);
+
+                // Since the bitmaps are persisted, ensure that all bitmap sizes are not larger than
+                // predefined size to avoid cache invalidation
+                for (int i = INDEX_DEFAULT; i < COUNT_SIZES; i++) {
+                        out.iconSizes[i] = Math.min(out.iconSizes[i], closestPoint.iconSizes[i]);
+                }
+
+                return out;
+        }
+
         public DeviceProfile getDeviceProfile(Context context) {
                 Resources res = context.getResources();
                 Configuration config = context.getResources().getConfiguration();
@@ -1594,605 +788,592 @@ public class InvariantDeviceProfile implements SafeCloseable {
                 return bestMatch;
         }
 
-                private static float weight(float x0, float y0, float x1, float y1, float pow) {
-                        float d = dist(x0, y0, x1, y1);
-                        if (Float.compare(d, 0f) == 0) {
-                                return Float.POSITIVE_INFINITY;
-                        }
-                        return (float) (WEIGHT_EFFICIENT / Math.pow(d, pow));
+        private static float weight(float x0, float y0, float x1, float y1, float pow) {
+                float d = dist(x0, y0, x1, y1);
+                if (Float.compare(d, 0f) == 0) {
+                        return Float.POSITIVE_INFINITY;
                 }
+                return (float) (WEIGHT_EFFICIENT / Math.pow(d, pow));
+        }
+
+        /**
+         * As a ratio of screen height, the total distance we want the parallax effect to span
+         * horizontally
+         */
+        private static float wallpaperTravelToScreenWidthRatio(int width, int height) {
+                float aspectRatio = width / (float) height;
+
+                // At an aspect ratio of 16/10, the wallpaper parallax effect should span 1.5 * screen width
+                // At an aspect ratio of 10/16, the wallpaper parallax effect should span 1.2 * screen width
+                // We will use these two data points to extrapolate how much the wallpaper parallax effect
+                // to span (ie travel) at any aspect ratio:
+
+                final float ASPECT_RATIO_LANDSCAPE = 16 / 10f;
+                final float ASPECT_RATIO_PORTRAIT = 10 / 16f;
+                final float WALLPAPER_WIDTH_TO_SCREEN_RATIO_LANDSCAPE = 1.5f;
+                final float WALLPAPER_WIDTH_TO_SCREEN_RATIO_PORTRAIT = 1.2f;
+
+                // To find out the desired width at different aspect ratios, we use the following two
+                // formulas, where the coefficient on x is the aspect ratio (width/height):
+                //   (16/10)x + y = 1.5
+                //   (10/16)x + y = 1.2
+                // We solve for x and y and end up with a final formula:
+                final float x =
+                        (WALLPAPER_WIDTH_TO_SCREEN_RATIO_LANDSCAPE
+                                - WALLPAPER_WIDTH_TO_SCREEN_RATIO_PORTRAIT) /
+                                (ASPECT_RATIO_LANDSCAPE - ASPECT_RATIO_PORTRAIT);
+                final float y = WALLPAPER_WIDTH_TO_SCREEN_RATIO_PORTRAIT - x * ASPECT_RATIO_PORTRAIT;
+                return x * aspectRatio + y;
+        }
+
+        public interface OnIDPChangeListener {
 
                 /**
-                 * As a ratio of screen height, the total distance we want the parallax effect
-                 * to span
-                 * horizontally
+                 * Called when the device provide changes
                  */
-                private static float wallpaperTravelToScreenWidthRatio(int width, int height) {
-                        float aspectRatio = width / (float) height;
+                void onIdpChanged(boolean modelPropertiesChanged);
+        }
 
-                        // At an aspect ratio of 16/10, the wallpaper parallax effect should span 1.5 *
-                        // screen width
-                        // At an aspect ratio of 10/16, the wallpaper parallax effect should span 1.2 *
-                        // screen width
-                        // We will use these two data points to extrapolate how much the wallpaper
-                        // parallax effect
-                        // to span (ie travel) at any aspect ratio:
 
-                        final float ASPECT_RATIO_LANDSCAPE = 16 / 10f;
-                        final float ASPECT_RATIO_PORTRAIT = 10 / 16f;
-                        final float WALLPAPER_WIDTH_TO_SCREEN_RATIO_LANDSCAPE = 1.5f;
-                        final float WALLPAPER_WIDTH_TO_SCREEN_RATIO_PORTRAIT = 1.2f;
+        public static final class GridOption {
 
-                        // To find out the desired width at different aspect ratios, we use the
-                        // following two
-                        // formulas, where the coefficient on x is the aspect ratio (width/height):
-                        // (16/10)x + y = 1.5
-                        // (10/16)x + y = 1.2
-                        // We solve for x and y and end up with a final formula:
-                        final float x = (WALLPAPER_WIDTH_TO_SCREEN_RATIO_LANDSCAPE
-                                        - WALLPAPER_WIDTH_TO_SCREEN_RATIO_PORTRAIT) /
-                                        (ASPECT_RATIO_LANDSCAPE - ASPECT_RATIO_PORTRAIT);
-                        final float y = WALLPAPER_WIDTH_TO_SCREEN_RATIO_PORTRAIT - x * ASPECT_RATIO_PORTRAIT;
-                        return x * aspectRatio + y;
-                }
+                public static final String TAG_NAME = "grid-option";
 
-                public interface OnIDPChangeListener {
+                private static final int DEVICE_CATEGORY_PHONE = 1 << 0;
+                private static final int DEVICE_CATEGORY_TABLET = 1 << 1;
+                private static final int DEVICE_CATEGORY_MULTI_DISPLAY = 1 << 2;
+                private static final int DEVICE_CATEGORY_ALL =
+                        DEVICE_CATEGORY_PHONE | DEVICE_CATEGORY_TABLET | DEVICE_CATEGORY_MULTI_DISPLAY;
 
-                        /**
-                         * Called when the device provide changes
-                         */
-                        void onIdpChanged(boolean modelPropertiesChanged);
-                }
+                private static final int INLINE_QSB_FOR_PORTRAIT = 1 << 0;
+                private static final int INLINE_QSB_FOR_LANDSCAPE = 1 << 1;
+                private static final int INLINE_QSB_FOR_TWO_PANEL_PORTRAIT = 1 << 2;
+                private static final int INLINE_QSB_FOR_TWO_PANEL_LANDSCAPE = 1 << 3;
+                private static final int DONT_INLINE_QSB = 0;
 
-                public static final class GridOption {
+                public final String name;
+                public final int numRows;
+                public final int numColumns;
+                public final int numSearchContainerColumns;
+                public final int deviceCategory;
 
-                        public static final String TAG_NAME = "grid-option";
+                public final int numFolderRows;
+                public final int numFolderColumns;
+                private final @StyleRes int folderStyle;
+                private final @StyleRes int cellStyle;
 
-                        private static final int DEVICE_CATEGORY_PHONE = 1 << 0;
-                        private static final int DEVICE_CATEGORY_TABLET = 1 << 1;
-                        private static final int DEVICE_CATEGORY_MULTI_DISPLAY = 1 << 2;
-                        private static final int DEVICE_CATEGORY_ALL = DEVICE_CATEGORY_PHONE | DEVICE_CATEGORY_TABLET
-                                        | DEVICE_CATEGORY_MULTI_DISPLAY;
+                private final @StyleRes int allAppsStyle;
+                public final int numAllAppsColumns;
+                public final int numDatabaseAllAppsColumns;
+                public final int numHotseatIcons;
+                public final int numDatabaseHotseatIcons;
 
-                        private static final int INLINE_QSB_FOR_PORTRAIT = 1 << 0;
-                        private static final int INLINE_QSB_FOR_LANDSCAPE = 1 << 1;
-                        private static final int INLINE_QSB_FOR_TWO_PANEL_PORTRAIT = 1 << 2;
-                        private static final int INLINE_QSB_FOR_TWO_PANEL_LANDSCAPE = 1 << 3;
-                        private static final int DONT_INLINE_QSB = 0;
+                private final int[] hotseatColumnSpan = new int[COUNT_SIZES];
 
-                        public final String name;
-                        public final int numRows;
-                        public final int numColumns;
-                        public final int numSearchContainerColumns;
-                        public final int deviceCategory;
+                private final boolean[] inlineQsb = new boolean[COUNT_SIZES];
 
-                        public final int numFolderRows;
-                        public final int numFolderColumns;
-                        private final @StyleRes int folderStyle;
-                        private final @StyleRes int cellStyle;
+                private @DimenRes int inlineNavButtonsEndSpacing;
+                public final String dbFile;
 
-                        private final @StyleRes int allAppsStyle;
-                        public final int numAllAppsColumns;
-                        public final int numDatabaseAllAppsColumns;
-                        public final int numHotseatIcons;
-                        public final int numDatabaseHotseatIcons;
+                private final int defaultLayoutId;
+                private final int demoModeLayoutId;
+                private final int mWorkspaceSpecsId;
 
-                        private final int[] hotseatColumnSpan = new int[COUNT_SIZES];
+                private final int mWorkspaceSpecsTwoPanelId;
+                private final int mAllAppsSpecsId;
+                private final int mAllAppsSpecsTwoPanelId;
+                private final int mFolderSpecsId;
+                private final int mFolderSpecsTwoPanelId;
+                private final int mHotseatSpecsId;
+                private final int mHotseatSpecsTwoPanelId;
+                private final int mWorkspaceCellSpecsId;
+                private final int mWorkspaceCellSpecsTwoPanelId;
+                private final int mAllAppsCellSpecsId;
+                private final int mAllAppsCellSpecsTwoPanelId;
 
-                        private final boolean[] inlineQsb = new boolean[COUNT_SIZES];
+                private final boolean isScalable;
+                private final int devicePaddingId;
 
-                        private @DimenRes int inlineNavButtonsEndSpacing;
-                        public final String dbFile;
+                public GridOption(Context context, AttributeSet attrs) {
+                        TypedArray a = context.obtainStyledAttributes(
+                                attrs, R.styleable.GridDisplayOption);
+                        name = a.getString(R.styleable.GridDisplayOption_name);
+                        numRows = a.getInt(R.styleable.GridDisplayOption_numRows, 0);
+                        numColumns = a.getInt(R.styleable.GridDisplayOption_numColumns, 4);
+                        numSearchContainerColumns = a.getInt(
+                                R.styleable.GridDisplayOption_numSearchContainerColumns, numColumns);
 
-                        private final int defaultLayoutId;
-                        private final int demoModeLayoutId;
-                        private final int mWorkspaceSpecsId;
+                        dbFile = a.getString(R.styleable.GridDisplayOption_dbFile);
+                        defaultLayoutId = a.getResourceId(
+                                R.styleable.GridDisplayOption_defaultLayoutId, 0);
+                        demoModeLayoutId = a.getResourceId(
+                                R.styleable.GridDisplayOption_demoModeLayoutId, defaultLayoutId);
 
-                        private final int mWorkspaceSpecsTwoPanelId;
-                        private final int mAllAppsSpecsId;
-                        private final int mAllAppsSpecsTwoPanelId;
-                        private final int mFolderSpecsId;
-                        private final int mFolderSpecsTwoPanelId;
-                        private final int mHotseatSpecsId;
-                        private final int mHotseatSpecsTwoPanelId;
-                        private final int mWorkspaceCellSpecsId;
-                        private final int mWorkspaceCellSpecsTwoPanelId;
-                        private final int mAllAppsCellSpecsId;
-                        private final int mAllAppsCellSpecsTwoPanelId;
+                        allAppsStyle = a.getResourceId(R.styleable.GridDisplayOption_allAppsStyle,
+                                R.style.AllAppsStyleDefault);
+                        numAllAppsColumns = a.getInt(
+                                R.styleable.GridDisplayOption_numAllAppsColumns, numColumns);
+                        numDatabaseAllAppsColumns = a.getInt(
+                                R.styleable.GridDisplayOption_numExtendedAllAppsColumns, numAllAppsColumns);
 
-                        private final boolean isScalable;
-                        private final int devicePaddingId;
+                        numHotseatIcons = a.getInt(
+                                R.styleable.GridDisplayOption_numHotseatIcons, numColumns);
+                        numDatabaseHotseatIcons = a.getInt(
+                                R.styleable.GridDisplayOption_numExtendedHotseatIcons, 2 * numHotseatIcons);
 
-                        public GridOption(Context context, AttributeSet attrs) {
-                                TypedArray a = context.obtainStyledAttributes(
-                                                attrs, R.styleable.GridDisplayOption);
-                                name = a.getString(R.styleable.GridDisplayOption_name);
-                                numRows = a.getInt(R.styleable.GridDisplayOption_numRows, 0);
-                                numColumns = a.getInt(R.styleable.GridDisplayOption_numColumns, 4);
-                                numSearchContainerColumns = a.getInt(
-                                                R.styleable.GridDisplayOption_numSearchContainerColumns, numColumns);
+                        hotseatColumnSpan[INDEX_DEFAULT] = a.getInt(
+                                R.styleable.GridDisplayOption_hotseatColumnSpan, numColumns);
+                        hotseatColumnSpan[INDEX_LANDSCAPE] = a.getInt(
+                                R.styleable.GridDisplayOption_hotseatColumnSpanLandscape, numColumns);
+                        hotseatColumnSpan[INDEX_TWO_PANEL_LANDSCAPE] = a.getInt(
+                                R.styleable.GridDisplayOption_hotseatColumnSpanTwoPanelLandscape,
+                                numColumns);
+                        hotseatColumnSpan[INDEX_TWO_PANEL_PORTRAIT] = a.getInt(
+                                R.styleable.GridDisplayOption_hotseatColumnSpanTwoPanelPortrait,
+                                numColumns);
 
-                                dbFile = a.getString(R.styleable.GridDisplayOption_dbFile);
-                                defaultLayoutId = a.getResourceId(
-                                                R.styleable.GridDisplayOption_defaultLayoutId, 0);
-                                demoModeLayoutId = a.getResourceId(
-                                                R.styleable.GridDisplayOption_demoModeLayoutId, defaultLayoutId);
+                        inlineNavButtonsEndSpacing =
+                                a.getResourceId(R.styleable.GridDisplayOption_inlineNavButtonsEndSpacing,
+                                        R.dimen.taskbar_button_margin_default);
 
-                                allAppsStyle = a.getResourceId(R.styleable.GridDisplayOption_allAppsStyle,
-                                                R.style.AllAppsStyleDefault);
-                                numAllAppsColumns = a.getInt(
-                                                R.styleable.GridDisplayOption_numAllAppsColumns, numColumns);
-                                numDatabaseAllAppsColumns = a.getInt(
-                                                R.styleable.GridDisplayOption_numExtendedAllAppsColumns,
-                                                numAllAppsColumns);
+                        numFolderRows = a.getInt(
+                                R.styleable.GridDisplayOption_numFolderRows, numRows);
+                        numFolderColumns = a.getInt(
+                                R.styleable.GridDisplayOption_numFolderColumns, numColumns);
 
-                                numHotseatIcons = a.getInt(
-                                                R.styleable.GridDisplayOption_numHotseatIcons, numColumns);
-                                numDatabaseHotseatIcons = a.getInt(
-                                                R.styleable.GridDisplayOption_numExtendedHotseatIcons,
-                                                2 * numHotseatIcons);
+                        folderStyle = a.getResourceId(R.styleable.GridDisplayOption_folderStyle,
+                                INVALID_RESOURCE_HANDLE);
 
-                                hotseatColumnSpan[INDEX_DEFAULT] = a.getInt(
-                                                R.styleable.GridDisplayOption_hotseatColumnSpan, numColumns);
-                                hotseatColumnSpan[INDEX_LANDSCAPE] = a.getInt(
-                                                R.styleable.GridDisplayOption_hotseatColumnSpanLandscape, numColumns);
-                                hotseatColumnSpan[INDEX_TWO_PANEL_LANDSCAPE] = a.getInt(
-                                                R.styleable.GridDisplayOption_hotseatColumnSpanTwoPanelLandscape,
-                                                numColumns);
-                                hotseatColumnSpan[INDEX_TWO_PANEL_PORTRAIT] = a.getInt(
-                                                R.styleable.GridDisplayOption_hotseatColumnSpanTwoPanelPortrait,
-                                                numColumns);
+                        cellStyle = a.getResourceId(R.styleable.GridDisplayOption_cellStyle,
+                                R.style.CellStyleDefault);
 
-                                inlineNavButtonsEndSpacing = a.getResourceId(
-                                                R.styleable.GridDisplayOption_inlineNavButtonsEndSpacing,
-                                                R.dimen.taskbar_button_margin_default);
+                        isScalable = a.getBoolean(
+                                R.styleable.GridDisplayOption_isScalable, false);
+                        devicePaddingId = a.getResourceId(
+                                R.styleable.GridDisplayOption_devicePaddingId, INVALID_RESOURCE_HANDLE);
+                        deviceCategory = a.getInt(R.styleable.GridDisplayOption_deviceCategory,
+                                DEVICE_CATEGORY_ALL);
 
-                                numFolderRows = a.getInt(
-                                                R.styleable.GridDisplayOption_numFolderRows, numRows);
-                                numFolderColumns = a.getInt(
-                                                R.styleable.GridDisplayOption_numFolderColumns, numColumns);
-
-                                folderStyle = a.getResourceId(R.styleable.GridDisplayOption_folderStyle,
-                                                INVALID_RESOURCE_HANDLE);
-
-                                cellStyle = a.getResourceId(R.styleable.GridDisplayOption_cellStyle,
-                                                R.style.CellStyleDefault);
-
-                                isScalable = a.getBoolean(
-                                                R.styleable.GridDisplayOption_isScalable, false);
-                                devicePaddingId = a.getResourceId(
-                                                R.styleable.GridDisplayOption_devicePaddingId, INVALID_RESOURCE_HANDLE);
-                                deviceCategory = a.getInt(R.styleable.GridDisplayOption_deviceCategory,
-                                                DEVICE_CATEGORY_ALL);
-
-                                if (FeatureFlags.ENABLE_RESPONSIVE_WORKSPACE.get()) {
-                                        mWorkspaceSpecsId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_workspaceSpecsId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                        mWorkspaceSpecsTwoPanelId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_workspaceSpecsTwoPanelId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                        mAllAppsSpecsId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_allAppsSpecsId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                        mAllAppsSpecsTwoPanelId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_allAppsSpecsTwoPanelId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                        mFolderSpecsId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_folderSpecsId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                        mFolderSpecsTwoPanelId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_folderSpecsTwoPanelId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                        mHotseatSpecsId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_hotseatSpecsId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                        mHotseatSpecsTwoPanelId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_hotseatSpecsTwoPanelId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                        mWorkspaceCellSpecsId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_workspaceCellSpecsId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                        mWorkspaceCellSpecsTwoPanelId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_workspaceCellSpecsTwoPanelId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                        mAllAppsCellSpecsId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_allAppsCellSpecsId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                        mAllAppsCellSpecsTwoPanelId = a.getResourceId(
-                                                        R.styleable.GridDisplayOption_allAppsCellSpecsTwoPanelId,
-                                                        INVALID_RESOURCE_HANDLE);
-                                } else {
-                                        mWorkspaceSpecsId = INVALID_RESOURCE_HANDLE;
-                                        mWorkspaceSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                                        mAllAppsSpecsId = INVALID_RESOURCE_HANDLE;
-                                        mAllAppsSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                                        mFolderSpecsId = INVALID_RESOURCE_HANDLE;
-                                        mFolderSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                                        mHotseatSpecsId = INVALID_RESOURCE_HANDLE;
-                                        mHotseatSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                                        mWorkspaceCellSpecsId = INVALID_RESOURCE_HANDLE;
-                                        mWorkspaceCellSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                                        mAllAppsCellSpecsId = INVALID_RESOURCE_HANDLE;
-                                        mAllAppsCellSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
-                                }
-
-                                int inlineForRotation = a.getInt(R.styleable.GridDisplayOption_inlineQsb,
-                                                DONT_INLINE_QSB);
-                                inlineQsb[INDEX_DEFAULT] = (inlineForRotation
-                                                & INLINE_QSB_FOR_PORTRAIT) == INLINE_QSB_FOR_PORTRAIT;
-                                inlineQsb[INDEX_LANDSCAPE] = (inlineForRotation
-                                                & INLINE_QSB_FOR_LANDSCAPE) == INLINE_QSB_FOR_LANDSCAPE;
-                                inlineQsb[INDEX_TWO_PANEL_PORTRAIT] = (inlineForRotation
-                                                & INLINE_QSB_FOR_TWO_PANEL_PORTRAIT) == INLINE_QSB_FOR_TWO_PANEL_PORTRAIT;
-                                inlineQsb[INDEX_TWO_PANEL_LANDSCAPE] = (inlineForRotation
-                                                & INLINE_QSB_FOR_TWO_PANEL_LANDSCAPE) == INLINE_QSB_FOR_TWO_PANEL_LANDSCAPE;
-                                a.recycle();
+                        if (FeatureFlags.ENABLE_RESPONSIVE_WORKSPACE.get()) {
+                                mWorkspaceSpecsId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_workspaceSpecsId, INVALID_RESOURCE_HANDLE);
+                                mWorkspaceSpecsTwoPanelId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_workspaceSpecsTwoPanelId,
+                                        INVALID_RESOURCE_HANDLE);
+                                mAllAppsSpecsId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_allAppsSpecsId, INVALID_RESOURCE_HANDLE);
+                                mAllAppsSpecsTwoPanelId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_allAppsSpecsTwoPanelId,
+                                        INVALID_RESOURCE_HANDLE);
+                                mFolderSpecsId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_folderSpecsId, INVALID_RESOURCE_HANDLE);
+                                mFolderSpecsTwoPanelId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_folderSpecsTwoPanelId,
+                                        INVALID_RESOURCE_HANDLE);
+                                mHotseatSpecsId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_hotseatSpecsId, INVALID_RESOURCE_HANDLE);
+                                mHotseatSpecsTwoPanelId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_hotseatSpecsTwoPanelId,
+                                        INVALID_RESOURCE_HANDLE);
+                                mWorkspaceCellSpecsId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_workspaceCellSpecsId,
+                                        INVALID_RESOURCE_HANDLE);
+                                mWorkspaceCellSpecsTwoPanelId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_workspaceCellSpecsTwoPanelId,
+                                        INVALID_RESOURCE_HANDLE);
+                                mAllAppsCellSpecsId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_allAppsCellSpecsId,
+                                        INVALID_RESOURCE_HANDLE);
+                                mAllAppsCellSpecsTwoPanelId = a.getResourceId(
+                                        R.styleable.GridDisplayOption_allAppsCellSpecsTwoPanelId,
+                                        INVALID_RESOURCE_HANDLE);
+                        } else {
+                                mWorkspaceSpecsId = INVALID_RESOURCE_HANDLE;
+                                mWorkspaceSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
+                                mAllAppsSpecsId = INVALID_RESOURCE_HANDLE;
+                                mAllAppsSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
+                                mFolderSpecsId = INVALID_RESOURCE_HANDLE;
+                                mFolderSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
+                                mHotseatSpecsId = INVALID_RESOURCE_HANDLE;
+                                mHotseatSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
+                                mWorkspaceCellSpecsId = INVALID_RESOURCE_HANDLE;
+                                mWorkspaceCellSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
+                                mAllAppsCellSpecsId = INVALID_RESOURCE_HANDLE;
+                                mAllAppsCellSpecsTwoPanelId = INVALID_RESOURCE_HANDLE;
                         }
 
-                        public boolean isEnabled(@DeviceType int deviceType) {
-                                switch (deviceType) {
-                                        case TYPE_PHONE:
-                                                return (deviceCategory
-                                                                & DEVICE_CATEGORY_PHONE) == DEVICE_CATEGORY_PHONE;
-                                        case TYPE_TABLET:
-                                                return (deviceCategory
-                                                                & DEVICE_CATEGORY_TABLET) == DEVICE_CATEGORY_TABLET;
-                                        case TYPE_MULTI_DISPLAY:
-                                                return (deviceCategory
-                                                                & DEVICE_CATEGORY_MULTI_DISPLAY) == DEVICE_CATEGORY_MULTI_DISPLAY;
-                                        default:
-                                                return false;
-                                }
+                        int inlineForRotation = a.getInt(R.styleable.GridDisplayOption_inlineQsb,
+                                DONT_INLINE_QSB);
+                        inlineQsb[INDEX_DEFAULT] =
+                                (inlineForRotation & INLINE_QSB_FOR_PORTRAIT) == INLINE_QSB_FOR_PORTRAIT;
+                        inlineQsb[INDEX_LANDSCAPE] =
+                                (inlineForRotation & INLINE_QSB_FOR_LANDSCAPE) == INLINE_QSB_FOR_LANDSCAPE;
+                        inlineQsb[INDEX_TWO_PANEL_PORTRAIT] =
+                                (inlineForRotation & INLINE_QSB_FOR_TWO_PANEL_PORTRAIT)
+                                        == INLINE_QSB_FOR_TWO_PANEL_PORTRAIT;
+                        inlineQsb[INDEX_TWO_PANEL_LANDSCAPE] =
+                                (inlineForRotation & INLINE_QSB_FOR_TWO_PANEL_LANDSCAPE)
+                                        == INLINE_QSB_FOR_TWO_PANEL_LANDSCAPE;
+                        a.recycle();
+                }
+
+                public boolean isEnabled(@DeviceType int deviceType) {
+                        switch (deviceType) {
+                                case TYPE_PHONE:
+                                        return (deviceCategory & DEVICE_CATEGORY_PHONE) == DEVICE_CATEGORY_PHONE;
+                                case TYPE_TABLET:
+                                        return (deviceCategory & DEVICE_CATEGORY_TABLET) == DEVICE_CATEGORY_TABLET;
+                                case TYPE_MULTI_DISPLAY:
+                                        return (deviceCategory & DEVICE_CATEGORY_MULTI_DISPLAY)
+                                                == DEVICE_CATEGORY_MULTI_DISPLAY;
+                                default:
+                                        return false;
+                        }
+                }
+        }
+
+        @VisibleForTesting
+        static final class DisplayOption {
+                public final GridOption grid;
+
+                private final float minWidthDps;
+                private final float minHeightDps;
+                private final boolean canBeDefault;
+
+                private final PointF[] minCellSize = new PointF[COUNT_SIZES];
+
+                private final PointF[] borderSpaces = new PointF[COUNT_SIZES];
+                private final float[] horizontalMargin = new float[COUNT_SIZES];
+                private final float[] hotseatBarBottomSpace = new float[COUNT_SIZES];
+                private final float[] hotseatQsbSpace = new float[COUNT_SIZES];
+
+                private final float[] iconSizes = new float[COUNT_SIZES];
+                private final float[] textSizes = new float[COUNT_SIZES];
+
+                private final PointF[] allAppsCellSize = new PointF[COUNT_SIZES];
+                private final float[] allAppsIconSizes = new float[COUNT_SIZES];
+                private final float[] allAppsIconTextSizes = new float[COUNT_SIZES];
+                private final PointF[] allAppsBorderSpaces = new PointF[COUNT_SIZES];
+
+                private final float[] transientTaskbarIconSize = new float[COUNT_SIZES];
+
+                private final boolean[] startAlignTaskbar = new boolean[COUNT_SIZES];
+
+                DisplayOption(GridOption grid, Context context, AttributeSet attrs) {
+                        this.grid = grid;
+
+                        Resources res = context.getResources();
+
+                        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ProfileDisplayOption);
+
+                        minWidthDps = a.getFloat(R.styleable.ProfileDisplayOption_minWidthDps, 0);
+                        minHeightDps = a.getFloat(R.styleable.ProfileDisplayOption_minHeightDps, 0);
+
+                        canBeDefault = a.getBoolean(R.styleable.ProfileDisplayOption_canBeDefault, false);
+
+                        float x;
+                        float y;
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidth, 0);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeight, 0);
+                        minCellSize[INDEX_DEFAULT] = new PointF(x, y);
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthLandscape,
+                                minCellSize[INDEX_DEFAULT].x);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeightLandscape,
+                                minCellSize[INDEX_DEFAULT].y);
+                        minCellSize[INDEX_LANDSCAPE] = new PointF(x, y);
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthTwoPanelPortrait,
+                                minCellSize[INDEX_DEFAULT].x);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeightTwoPanelPortrait,
+                                minCellSize[INDEX_DEFAULT].y);
+                        minCellSize[INDEX_TWO_PANEL_PORTRAIT] = new PointF(x, y);
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthTwoPanelLandscape,
+                                minCellSize[INDEX_DEFAULT].x);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeightTwoPanelLandscape,
+                                minCellSize[INDEX_DEFAULT].y);
+                        minCellSize[INDEX_TWO_PANEL_LANDSCAPE] = new PointF(x, y);
+
+                        float borderSpace = a.getFloat(R.styleable.ProfileDisplayOption_borderSpace, 0);
+                        float borderSpaceLandscape = a.getFloat(
+                                R.styleable.ProfileDisplayOption_borderSpaceLandscape, borderSpace);
+                        float borderSpaceTwoPanelPortrait = a.getFloat(
+                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelPortrait, borderSpace);
+                        float borderSpaceTwoPanelLandscape = a.getFloat(
+                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelLandscape, borderSpace);
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceHorizontal, borderSpace);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceVertical, borderSpace);
+                        borderSpaces[INDEX_DEFAULT] = new PointF(x, y);
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceLandscapeHorizontal,
+                                borderSpaceLandscape);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceLandscapeVertical,
+                                borderSpaceLandscape);
+                        borderSpaces[INDEX_LANDSCAPE] = new PointF(x, y);
+
+                        x = a.getFloat(
+                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelPortraitHorizontal,
+                                borderSpaceTwoPanelPortrait);
+                        y = a.getFloat(
+                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelPortraitVertical,
+                                borderSpaceTwoPanelPortrait);
+                        borderSpaces[INDEX_TWO_PANEL_PORTRAIT] = new PointF(x, y);
+
+                        x = a.getFloat(
+                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelLandscapeHorizontal,
+                                borderSpaceTwoPanelLandscape);
+                        y = a.getFloat(
+                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelLandscapeVertical,
+                                borderSpaceTwoPanelLandscape);
+                        borderSpaces[INDEX_TWO_PANEL_LANDSCAPE] = new PointF(x, y);
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellWidth,
+                                minCellSize[INDEX_DEFAULT].x);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellHeight,
+                                minCellSize[INDEX_DEFAULT].y);
+                        allAppsCellSize[INDEX_DEFAULT] = new PointF(x, y);
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellWidthLandscape,
+                                allAppsCellSize[INDEX_DEFAULT].x);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellHeightLandscape,
+                                allAppsCellSize[INDEX_DEFAULT].y);
+                        allAppsCellSize[INDEX_LANDSCAPE] = new PointF(x, y);
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellWidthTwoPanelPortrait,
+                                allAppsCellSize[INDEX_DEFAULT].x);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellHeightTwoPanelPortrait,
+                                allAppsCellSize[INDEX_DEFAULT].y);
+                        allAppsCellSize[INDEX_TWO_PANEL_PORTRAIT] = new PointF(x, y);
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellWidthTwoPanelLandscape,
+                                allAppsCellSize[INDEX_DEFAULT].x);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellHeightTwoPanelLandscape,
+                                allAppsCellSize[INDEX_DEFAULT].y);
+                        allAppsCellSize[INDEX_TWO_PANEL_LANDSCAPE] = new PointF(x, y);
+
+                        float allAppsBorderSpace = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsBorderSpace, borderSpace);
+                        float allAppsBorderSpaceLandscape = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceLandscape,
+                                allAppsBorderSpace);
+                        float allAppsBorderSpaceTwoPanelPortrait = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelPortrait,
+                                allAppsBorderSpace);
+                        float allAppsBorderSpaceTwoPanelLandscape = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelLandscape,
+                                allAppsBorderSpace);
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsBorderSpaceHorizontal,
+                                allAppsBorderSpace);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsBorderSpaceVertical,
+                                allAppsBorderSpace);
+                        allAppsBorderSpaces[INDEX_DEFAULT] = new PointF(x, y);
+
+                        x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsBorderSpaceLandscapeHorizontal,
+                                allAppsBorderSpaceLandscape);
+                        y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsBorderSpaceLandscapeVertical,
+                                allAppsBorderSpaceLandscape);
+                        allAppsBorderSpaces[INDEX_LANDSCAPE] = new PointF(x, y);
+
+                        x = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelPortraitHorizontal,
+                                allAppsBorderSpaceTwoPanelPortrait);
+                        y = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelPortraitVertical,
+                                allAppsBorderSpaceTwoPanelPortrait);
+                        allAppsBorderSpaces[INDEX_TWO_PANEL_PORTRAIT] = new PointF(x, y);
+
+                        x = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelLandscapeHorizontal,
+                                allAppsBorderSpaceTwoPanelLandscape);
+                        y = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelLandscapeVertical,
+                                allAppsBorderSpaceTwoPanelLandscape);
+                        allAppsBorderSpaces[INDEX_TWO_PANEL_LANDSCAPE] = new PointF(x, y);
+
+                        iconSizes[INDEX_DEFAULT] =
+                                a.getFloat(R.styleable.ProfileDisplayOption_iconImageSize, 0);
+                        iconSizes[INDEX_LANDSCAPE] =
+                                a.getFloat(R.styleable.ProfileDisplayOption_iconSizeLandscape,
+                                        iconSizes[INDEX_DEFAULT]);
+                        iconSizes[INDEX_TWO_PANEL_PORTRAIT] =
+                                a.getFloat(R.styleable.ProfileDisplayOption_iconSizeTwoPanelPortrait,
+                                        iconSizes[INDEX_DEFAULT]);
+                        iconSizes[INDEX_TWO_PANEL_LANDSCAPE] =
+                                a.getFloat(R.styleable.ProfileDisplayOption_iconSizeTwoPanelLandscape,
+                                        iconSizes[INDEX_DEFAULT]);
+
+                        allAppsIconSizes[INDEX_DEFAULT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsIconSize, iconSizes[INDEX_DEFAULT]);
+                        allAppsIconSizes[INDEX_LANDSCAPE] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsIconSizeLandscape,
+                                allAppsIconSizes[INDEX_DEFAULT]);
+                        allAppsIconSizes[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsIconSizeTwoPanelPortrait,
+                                allAppsIconSizes[INDEX_DEFAULT]);
+                        allAppsIconSizes[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsIconSizeTwoPanelLandscape,
+                                allAppsIconSizes[INDEX_DEFAULT]);
+
+                        textSizes[INDEX_DEFAULT] =
+                                a.getFloat(R.styleable.ProfileDisplayOption_iconTextSize, 0);
+                        textSizes[INDEX_LANDSCAPE] =
+                                a.getFloat(R.styleable.ProfileDisplayOption_iconTextSizeLandscape,
+                                        textSizes[INDEX_DEFAULT]);
+                        textSizes[INDEX_TWO_PANEL_PORTRAIT] =
+                                a.getFloat(R.styleable.ProfileDisplayOption_iconTextSizeTwoPanelPortrait,
+                                        textSizes[INDEX_DEFAULT]);
+                        textSizes[INDEX_TWO_PANEL_LANDSCAPE] =
+                                a.getFloat(R.styleable.ProfileDisplayOption_iconTextSizeTwoPanelLandscape,
+                                        textSizes[INDEX_DEFAULT]);
+
+                        allAppsIconTextSizes[INDEX_DEFAULT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsIconTextSize, textSizes[INDEX_DEFAULT]);
+                        allAppsIconTextSizes[INDEX_LANDSCAPE] = allAppsIconTextSizes[INDEX_DEFAULT];
+                        allAppsIconTextSizes[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsIconTextSizeTwoPanelPortrait,
+                                allAppsIconTextSizes[INDEX_DEFAULT]);
+                        allAppsIconTextSizes[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_allAppsIconTextSizeTwoPanelLandscape,
+                                allAppsIconTextSizes[INDEX_DEFAULT]);
+
+                        horizontalMargin[INDEX_DEFAULT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_horizontalMargin, 0);
+                        horizontalMargin[INDEX_LANDSCAPE] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_horizontalMarginLandscape,
+                                horizontalMargin[INDEX_DEFAULT]);
+                        horizontalMargin[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_horizontalMarginTwoPanelLandscape,
+                                horizontalMargin[INDEX_DEFAULT]);
+                        horizontalMargin[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_horizontalMarginTwoPanelPortrait,
+                                horizontalMargin[INDEX_DEFAULT]);
+
+                        hotseatBarBottomSpace[INDEX_DEFAULT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_hotseatBarBottomSpace,
+                                ResourcesCompat.getFloat(res, R.dimen.hotseat_bar_bottom_space_default));
+                        hotseatBarBottomSpace[INDEX_LANDSCAPE] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_hotseatBarBottomSpaceLandscape,
+                                hotseatBarBottomSpace[INDEX_DEFAULT]);
+                        hotseatBarBottomSpace[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_hotseatBarBottomSpaceTwoPanelLandscape,
+                                hotseatBarBottomSpace[INDEX_DEFAULT]);
+                        hotseatBarBottomSpace[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_hotseatBarBottomSpaceTwoPanelPortrait,
+                                hotseatBarBottomSpace[INDEX_DEFAULT]);
+
+                        hotseatQsbSpace[INDEX_DEFAULT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_hotseatQsbSpace,
+                                ResourcesCompat.getFloat(res, R.dimen.hotseat_qsb_space_default));
+                        hotseatQsbSpace[INDEX_LANDSCAPE] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_hotseatQsbSpaceLandscape,
+                                hotseatQsbSpace[INDEX_DEFAULT]);
+                        hotseatQsbSpace[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_hotseatQsbSpaceTwoPanelLandscape,
+                                hotseatQsbSpace[INDEX_DEFAULT]);
+                        hotseatQsbSpace[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_hotseatQsbSpaceTwoPanelPortrait,
+                                hotseatQsbSpace[INDEX_DEFAULT]);
+
+                        transientTaskbarIconSize[INDEX_DEFAULT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_transientTaskbarIconSize,
+                                ResourcesCompat.getFloat(res, R.dimen.taskbar_icon_size));
+                        transientTaskbarIconSize[INDEX_LANDSCAPE] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_transientTaskbarIconSizeLandscape,
+                                transientTaskbarIconSize[INDEX_DEFAULT]);
+                        transientTaskbarIconSize[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_transientTaskbarIconSizeTwoPanelLandscape,
+                                transientTaskbarIconSize[INDEX_DEFAULT]);
+                        transientTaskbarIconSize[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
+                                R.styleable.ProfileDisplayOption_transientTaskbarIconSizeTwoPanelPortrait,
+                                transientTaskbarIconSize[INDEX_DEFAULT]);
+
+                        startAlignTaskbar[INDEX_DEFAULT] = a.getBoolean(
+                                R.styleable.ProfileDisplayOption_startAlignTaskbar, false);
+                        startAlignTaskbar[INDEX_LANDSCAPE] = a.getBoolean(
+                                R.styleable.ProfileDisplayOption_startAlignTaskbarLandscape,
+                                startAlignTaskbar[INDEX_DEFAULT]);
+                        startAlignTaskbar[INDEX_TWO_PANEL_LANDSCAPE] = a.getBoolean(
+                                R.styleable.ProfileDisplayOption_startAlignTaskbarTwoPanelLandscape,
+                                startAlignTaskbar[INDEX_LANDSCAPE]);
+                        startAlignTaskbar[INDEX_TWO_PANEL_PORTRAIT] = a.getBoolean(
+                                R.styleable.ProfileDisplayOption_startAlignTaskbarTwoPanelPortrait,
+                                startAlignTaskbar[INDEX_DEFAULT]);
+
+                        a.recycle();
+                }
+
+                DisplayOption() {
+                        this(null);
+                }
+
+                DisplayOption(GridOption grid) {
+                        this.grid = grid;
+                        minWidthDps = 0;
+                        minHeightDps = 0;
+                        canBeDefault = false;
+                        for (int i = 0; i < COUNT_SIZES; i++) {
+                                iconSizes[i] = 0;
+                                textSizes[i] = 0;
+                                borderSpaces[i] = new PointF();
+                                minCellSize[i] = new PointF();
+                                allAppsCellSize[i] = new PointF();
+                                allAppsIconSizes[i] = 0;
+                                allAppsIconTextSizes[i] = 0;
+                                allAppsBorderSpaces[i] = new PointF();
+                                transientTaskbarIconSize[i] = 0;
+                                startAlignTaskbar[i] = false;
                         }
                 }
 
-                @VisibleForTesting
-                static final class DisplayOption {
-                        public final GridOption grid;
-
-                        private final float minWidthDps;
-                        private final float minHeightDps;
-                        private final boolean canBeDefault;
-
-                        private final PointF[] minCellSize = new PointF[COUNT_SIZES];
-
-                        private final PointF[] borderSpaces = new PointF[COUNT_SIZES];
-                        private final float[] horizontalMargin = new float[COUNT_SIZES];
-                        private final float[] hotseatBarBottomSpace = new float[COUNT_SIZES];
-                        private final float[] hotseatQsbSpace = new float[COUNT_SIZES];
-
-                        private final float[] iconSizes = new float[COUNT_SIZES];
-                        private final float[] textSizes = new float[COUNT_SIZES];
-
-                        private final PointF[] allAppsCellSize = new PointF[COUNT_SIZES];
-                        private final float[] allAppsIconSizes = new float[COUNT_SIZES];
-                        private final float[] allAppsIconTextSizes = new float[COUNT_SIZES];
-                        private final PointF[] allAppsBorderSpaces = new PointF[COUNT_SIZES];
-
-                        private final float[] transientTaskbarIconSize = new float[COUNT_SIZES];
-
-                        private final boolean[] startAlignTaskbar = new boolean[COUNT_SIZES];
-
-                        DisplayOption(GridOption grid, Context context, AttributeSet attrs) {
-                                this.grid = grid;
-
-                                Resources res = context.getResources();
-
-                                TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ProfileDisplayOption);
-
-                                minWidthDps = a.getFloat(R.styleable.ProfileDisplayOption_minWidthDps, 0);
-                                minHeightDps = a.getFloat(R.styleable.ProfileDisplayOption_minHeightDps, 0);
-
-                                canBeDefault = a.getBoolean(R.styleable.ProfileDisplayOption_canBeDefault, false);
-
-                                float x;
-                                float y;
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidth, 0);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeight, 0);
-                                minCellSize[INDEX_DEFAULT] = new PointF(x, y);
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthLandscape,
-                                                minCellSize[INDEX_DEFAULT].x);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeightLandscape,
-                                                minCellSize[INDEX_DEFAULT].y);
-                                minCellSize[INDEX_LANDSCAPE] = new PointF(x, y);
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthTwoPanelPortrait,
-                                                minCellSize[INDEX_DEFAULT].x);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeightTwoPanelPortrait,
-                                                minCellSize[INDEX_DEFAULT].y);
-                                minCellSize[INDEX_TWO_PANEL_PORTRAIT] = new PointF(x, y);
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthTwoPanelLandscape,
-                                                minCellSize[INDEX_DEFAULT].x);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeightTwoPanelLandscape,
-                                                minCellSize[INDEX_DEFAULT].y);
-                                minCellSize[INDEX_TWO_PANEL_LANDSCAPE] = new PointF(x, y);
-
-                                float borderSpace = a.getFloat(R.styleable.ProfileDisplayOption_borderSpace, 0);
-                                float borderSpaceLandscape = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_borderSpaceLandscape, borderSpace);
-                                float borderSpaceTwoPanelPortrait = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelPortrait,
-                                                borderSpace);
-                                float borderSpaceTwoPanelLandscape = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelLandscape,
-                                                borderSpace);
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceHorizontal, borderSpace);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceVertical, borderSpace);
-                                borderSpaces[INDEX_DEFAULT] = new PointF(x, y);
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceLandscapeHorizontal,
-                                                borderSpaceLandscape);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceLandscapeVertical,
-                                                borderSpaceLandscape);
-                                borderSpaces[INDEX_LANDSCAPE] = new PointF(x, y);
-
-                                x = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelPortraitHorizontal,
-                                                borderSpaceTwoPanelPortrait);
-                                y = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelPortraitVertical,
-                                                borderSpaceTwoPanelPortrait);
-                                borderSpaces[INDEX_TWO_PANEL_PORTRAIT] = new PointF(x, y);
-
-                                x = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelLandscapeHorizontal,
-                                                borderSpaceTwoPanelLandscape);
-                                y = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_borderSpaceTwoPanelLandscapeVertical,
-                                                borderSpaceTwoPanelLandscape);
-                                borderSpaces[INDEX_TWO_PANEL_LANDSCAPE] = new PointF(x, y);
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellWidth,
-                                                minCellSize[INDEX_DEFAULT].x);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellHeight,
-                                                minCellSize[INDEX_DEFAULT].y);
-                                allAppsCellSize[INDEX_DEFAULT] = new PointF(x, y);
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellWidthLandscape,
-                                                allAppsCellSize[INDEX_DEFAULT].x);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellHeightLandscape,
-                                                allAppsCellSize[INDEX_DEFAULT].y);
-                                allAppsCellSize[INDEX_LANDSCAPE] = new PointF(x, y);
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellWidthTwoPanelPortrait,
-                                                allAppsCellSize[INDEX_DEFAULT].x);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellHeightTwoPanelPortrait,
-                                                allAppsCellSize[INDEX_DEFAULT].y);
-                                allAppsCellSize[INDEX_TWO_PANEL_PORTRAIT] = new PointF(x, y);
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellWidthTwoPanelLandscape,
-                                                allAppsCellSize[INDEX_DEFAULT].x);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsCellHeightTwoPanelLandscape,
-                                                allAppsCellSize[INDEX_DEFAULT].y);
-                                allAppsCellSize[INDEX_TWO_PANEL_LANDSCAPE] = new PointF(x, y);
-
-                                float allAppsBorderSpace = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsBorderSpace, borderSpace);
-                                float allAppsBorderSpaceLandscape = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceLandscape,
-                                                allAppsBorderSpace);
-                                float allAppsBorderSpaceTwoPanelPortrait = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelPortrait,
-                                                allAppsBorderSpace);
-                                float allAppsBorderSpaceTwoPanelLandscape = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelLandscape,
-                                                allAppsBorderSpace);
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsBorderSpaceHorizontal,
-                                                allAppsBorderSpace);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsBorderSpaceVertical,
-                                                allAppsBorderSpace);
-                                allAppsBorderSpaces[INDEX_DEFAULT] = new PointF(x, y);
-
-                                x = a.getFloat(R.styleable.ProfileDisplayOption_allAppsBorderSpaceLandscapeHorizontal,
-                                                allAppsBorderSpaceLandscape);
-                                y = a.getFloat(R.styleable.ProfileDisplayOption_allAppsBorderSpaceLandscapeVertical,
-                                                allAppsBorderSpaceLandscape);
-                                allAppsBorderSpaces[INDEX_LANDSCAPE] = new PointF(x, y);
-
-                                x = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelPortraitHorizontal,
-                                                allAppsBorderSpaceTwoPanelPortrait);
-                                y = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelPortraitVertical,
-                                                allAppsBorderSpaceTwoPanelPortrait);
-                                allAppsBorderSpaces[INDEX_TWO_PANEL_PORTRAIT] = new PointF(x, y);
-
-                                x = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelLandscapeHorizontal,
-                                                allAppsBorderSpaceTwoPanelLandscape);
-                                y = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsBorderSpaceTwoPanelLandscapeVertical,
-                                                allAppsBorderSpaceTwoPanelLandscape);
-                                allAppsBorderSpaces[INDEX_TWO_PANEL_LANDSCAPE] = new PointF(x, y);
-
-                                iconSizes[INDEX_DEFAULT] = a.getFloat(R.styleable.ProfileDisplayOption_iconImageSize,
-                                                0);
-                                iconSizes[INDEX_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_iconSizeLandscape,
-                                                iconSizes[INDEX_DEFAULT]);
-                                iconSizes[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_iconSizeTwoPanelPortrait,
-                                                iconSizes[INDEX_DEFAULT]);
-                                iconSizes[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_iconSizeTwoPanelLandscape,
-                                                iconSizes[INDEX_DEFAULT]);
-
-                                allAppsIconSizes[INDEX_DEFAULT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsIconSize,
-                                                iconSizes[INDEX_DEFAULT]);
-                                allAppsIconSizes[INDEX_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsIconSizeLandscape,
-                                                allAppsIconSizes[INDEX_DEFAULT]);
-                                allAppsIconSizes[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsIconSizeTwoPanelPortrait,
-                                                allAppsIconSizes[INDEX_DEFAULT]);
-                                allAppsIconSizes[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsIconSizeTwoPanelLandscape,
-                                                allAppsIconSizes[INDEX_DEFAULT]);
-
-                                textSizes[INDEX_DEFAULT] = a.getFloat(R.styleable.ProfileDisplayOption_iconTextSize, 0);
-                                textSizes[INDEX_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_iconTextSizeLandscape,
-                                                textSizes[INDEX_DEFAULT]);
-                                textSizes[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_iconTextSizeTwoPanelPortrait,
-                                                textSizes[INDEX_DEFAULT]);
-                                textSizes[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_iconTextSizeTwoPanelLandscape,
-                                                textSizes[INDEX_DEFAULT]);
-
-                                allAppsIconTextSizes[INDEX_DEFAULT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsIconTextSize,
-                                                textSizes[INDEX_DEFAULT]);
-                                allAppsIconTextSizes[INDEX_LANDSCAPE] = allAppsIconTextSizes[INDEX_DEFAULT];
-                                allAppsIconTextSizes[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsIconTextSizeTwoPanelPortrait,
-                                                allAppsIconTextSizes[INDEX_DEFAULT]);
-                                allAppsIconTextSizes[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_allAppsIconTextSizeTwoPanelLandscape,
-                                                allAppsIconTextSizes[INDEX_DEFAULT]);
-
-                                horizontalMargin[INDEX_DEFAULT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_horizontalMargin, 0);
-                                horizontalMargin[INDEX_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_horizontalMarginLandscape,
-                                                horizontalMargin[INDEX_DEFAULT]);
-                                horizontalMargin[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_horizontalMarginTwoPanelLandscape,
-                                                horizontalMargin[INDEX_DEFAULT]);
-                                horizontalMargin[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_horizontalMarginTwoPanelPortrait,
-                                                horizontalMargin[INDEX_DEFAULT]);
-
-                                hotseatBarBottomSpace[INDEX_DEFAULT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_hotseatBarBottomSpace,
-                                                ResourcesCompat.getFloat(res,
-                                                                R.dimen.hotseat_bar_bottom_space_default));
-                                hotseatBarBottomSpace[INDEX_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_hotseatBarBottomSpaceLandscape,
-                                                hotseatBarBottomSpace[INDEX_DEFAULT]);
-                                hotseatBarBottomSpace[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_hotseatBarBottomSpaceTwoPanelLandscape,
-                                                hotseatBarBottomSpace[INDEX_DEFAULT]);
-                                hotseatBarBottomSpace[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_hotseatBarBottomSpaceTwoPanelPortrait,
-                                                hotseatBarBottomSpace[INDEX_DEFAULT]);
-
-                                hotseatQsbSpace[INDEX_DEFAULT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_hotseatQsbSpace,
-                                                ResourcesCompat.getFloat(res, R.dimen.hotseat_qsb_space_default));
-                                hotseatQsbSpace[INDEX_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_hotseatQsbSpaceLandscape,
-                                                hotseatQsbSpace[INDEX_DEFAULT]);
-                                hotseatQsbSpace[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_hotseatQsbSpaceTwoPanelLandscape,
-                                                hotseatQsbSpace[INDEX_DEFAULT]);
-                                hotseatQsbSpace[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_hotseatQsbSpaceTwoPanelPortrait,
-                                                hotseatQsbSpace[INDEX_DEFAULT]);
-
-                                transientTaskbarIconSize[INDEX_DEFAULT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_transientTaskbarIconSize,
-                                                ResourcesCompat.getFloat(res, R.dimen.taskbar_icon_size));
-                                transientTaskbarIconSize[INDEX_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_transientTaskbarIconSizeLandscape,
-                                                transientTaskbarIconSize[INDEX_DEFAULT]);
-                                transientTaskbarIconSize[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_transientTaskbarIconSizeTwoPanelLandscape,
-                                                transientTaskbarIconSize[INDEX_DEFAULT]);
-                                transientTaskbarIconSize[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
-                                                R.styleable.ProfileDisplayOption_transientTaskbarIconSizeTwoPanelPortrait,
-                                                transientTaskbarIconSize[INDEX_DEFAULT]);
-
-                                startAlignTaskbar[INDEX_DEFAULT] = a.getBoolean(
-                                                R.styleable.ProfileDisplayOption_startAlignTaskbar, false);
-                                startAlignTaskbar[INDEX_LANDSCAPE] = a.getBoolean(
-                                                R.styleable.ProfileDisplayOption_startAlignTaskbarLandscape,
-                                                startAlignTaskbar[INDEX_DEFAULT]);
-                                startAlignTaskbar[INDEX_TWO_PANEL_LANDSCAPE] = a.getBoolean(
-                                                R.styleable.ProfileDisplayOption_startAlignTaskbarTwoPanelLandscape,
-                                                startAlignTaskbar[INDEX_LANDSCAPE]);
-                                startAlignTaskbar[INDEX_TWO_PANEL_PORTRAIT] = a.getBoolean(
-                                                R.styleable.ProfileDisplayOption_startAlignTaskbarTwoPanelPortrait,
-                                                startAlignTaskbar[INDEX_DEFAULT]);
-
-                                a.recycle();
+                private DisplayOption multiply(float w) {
+                        for (int i = 0; i < COUNT_SIZES; i++) {
+                                iconSizes[i] *= w;
+                                textSizes[i] *= w;
+                                borderSpaces[i].x *= w;
+                                borderSpaces[i].y *= w;
+                                minCellSize[i].x *= w;
+                                minCellSize[i].y *= w;
+                                horizontalMargin[i] *= w;
+                                hotseatBarBottomSpace[i] *= w;
+                                hotseatQsbSpace[i] *= w;
+                                allAppsCellSize[i].x *= w;
+                                allAppsCellSize[i].y *= w;
+                                allAppsIconSizes[i] *= w;
+                                allAppsIconTextSizes[i] *= w;
+                                allAppsBorderSpaces[i].x *= w;
+                                allAppsBorderSpaces[i].y *= w;
+                                transientTaskbarIconSize[i] *= w;
                         }
 
-                        DisplayOption() {
-                                this(null);
-                        }
-
-                        DisplayOption(GridOption grid) {
-                                this.grid = grid;
-                                minWidthDps = 0;
-                                minHeightDps = 0;
-                                canBeDefault = false;
-                                for (int i = 0; i < COUNT_SIZES; i++) {
-                                        iconSizes[i] = 0;
-                                        textSizes[i] = 0;
-                                        borderSpaces[i] = new PointF();
-                                        minCellSize[i] = new PointF();
-                                        allAppsCellSize[i] = new PointF();
-                                        allAppsIconSizes[i] = 0;
-                                        allAppsIconTextSizes[i] = 0;
-                                        allAppsBorderSpaces[i] = new PointF();
-                                        transientTaskbarIconSize[i] = 0;
-                                        startAlignTaskbar[i] = false;
-                                }
-                        }
-
-                        private DisplayOption multiply(float w) {
-                                for (int i = 0; i < COUNT_SIZES; i++) {
-                                        iconSizes[i] *= w;
-                                        textSizes[i] *= w;
-                                        borderSpaces[i].x *= w;
-                                        borderSpaces[i].y *= w;
-                                        minCellSize[i].x *= w;
-                                        minCellSize[i].y *= w;
-                                        horizontalMargin[i] *= w;
-                                        hotseatBarBottomSpace[i] *= w;
-                                        hotseatQsbSpace[i] *= w;
-                                        allAppsCellSize[i].x *= w;
-                                        allAppsCellSize[i].y *= w;
-                                        allAppsIconSizes[i] *= w;
-                                        allAppsIconTextSizes[i] *= w;
-                                        allAppsBorderSpaces[i].x *= w;
-                                        allAppsBorderSpaces[i].y *= w;
-                                        transientTaskbarIconSize[i] *= w;
-                                }
-
-                                return this;
-                        }
-
-                        private DisplayOption add(DisplayOption p) {
-                                for (int i = 0; i < COUNT_SIZES; i++) {
-                                        iconSizes[i] += p.iconSizes[i];
-                                        textSizes[i] += p.textSizes[i];
-                                        borderSpaces[i].x += p.borderSpaces[i].x;
-                                        borderSpaces[i].y += p.borderSpaces[i].y;
-                                        minCellSize[i].x += p.minCellSize[i].x;
-                                        minCellSize[i].y += p.minCellSize[i].y;
-                                        horizontalMargin[i] += p.horizontalMargin[i];
-                                        hotseatBarBottomSpace[i] += p.hotseatBarBottomSpace[i];
-                                        hotseatQsbSpace[i] += p.hotseatQsbSpace[i];
-                                        allAppsCellSize[i].x += p.allAppsCellSize[i].x;
-                                        allAppsCellSize[i].y += p.allAppsCellSize[i].y;
-                                        allAppsIconSizes[i] += p.allAppsIconSizes[i];
-                                        allAppsIconTextSizes[i] += p.allAppsIconTextSizes[i];
-                                        allAppsBorderSpaces[i].x += p.allAppsBorderSpaces[i].x;
-                                        allAppsBorderSpaces[i].y += p.allAppsBorderSpaces[i].y;
-                                        transientTaskbarIconSize[i] += p.transientTaskbarIconSize[i];
-                                        startAlignTaskbar[i] |= p.startAlignTaskbar[i];
-                                }
-
-                                return this;
-                        }
+                        return this;
                 }
-}
+
+                private DisplayOption add(DisplayOption p) {
+                        for (int i = 0; i < COUNT_SIZES; i++) {
+                                iconSizes[i] += p.iconSizes[i];
+                                textSizes[i] += p.textSizes[i];
+                                borderSpaces[i].x += p.borderSpaces[i].x;
+                                borderSpaces[i].y += p.borderSpaces[i].y;
+                                minCellSize[i].x += p.minCellSize[i].x;
+                                minCellSize[i].y += p.minCellSize[i].y;
+                                horizontalMargin[i] += p.horizontalMargin[i];
+                                hotseatBarBottomSpace[i] += p.hotseatBarBottomSpace[i];
+                                hotseatQsbSpace[i] += p.hotseatQsbSpace[i];
+                                allAppsCellSize[i].x += p.allAppsCellSize[i].x;
+                                allAppsCellSize[i].y += p.allAppsCellSize[i].y;
+                                allAppsIconSizes[i] += p.allAppsIconSizes[i];
+                                allAppsIconTextSizes[i] += p.allAppsIconTextSizes[i];
+                                allAppsBorderSpaces[i].x += p.allAppsBorderSpaces[i].x;
+                                allAppsBorderSpaces[i].y += p.allAppsBorderSpaces[i].y;
+                                transientTaskbarIconSize[i] += p.transientTaskbarIconSize[i];
+                                startAlignTaskbar[i] |= p.startAlignTaskbar[i];
+                        }
+
+                        return this;
+                }
+        }
+}
\ No newline at end of file
diff --git a/src/com/android/launcher3/testing/shared/ResourceUtils.java b/src/com/android/launcher3/testing/shared/ResourceUtils.java
new file mode 100644
index 0000000000..2efecd72e3
--- /dev/null
+++ b/src/com/android/launcher3/testing/shared/ResourceUtils.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.testing.shared;
+import android.content.res.Resources;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+public class ResourceUtils {
+    private static final float EPSILON = 0.0001f;
+    public static final int DEFAULT_NAVBAR_VALUE = 48;
+    public static final int INVALID_RESOURCE_HANDLE = -1;
+    public static final String NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE = "navigation_bar_width";
+    public static final String NAVBAR_BOTTOM_GESTURE_SIZE = "navigation_bar_gesture_height";
+    public static final String NAVBAR_BOTTOM_GESTURE_LARGER_SIZE =
+            "navigation_bar_gesture_larger_height";
+    public static final String NAVBAR_HEIGHT = "navigation_bar_height";
+    public static final String NAVBAR_HEIGHT_LANDSCAPE = "navigation_bar_height_landscape";
+    public static final String STATUS_BAR_HEIGHT = "status_bar_height";
+    public static final String STATUS_BAR_HEIGHT_LANDSCAPE = "status_bar_height_landscape";
+    public static final String STATUS_BAR_HEIGHT_PORTRAIT = "status_bar_height_portrait";
+    public static final String NAV_BAR_INTERACTION_MODE_RES_NAME = "config_navBarInteractionMode";
+    public static int getNavbarSize(String resName, Resources res) {
+        return getDimenByName(resName, res, DEFAULT_NAVBAR_VALUE);
+    }
+    public static int getDimenByName(String resName, Resources res, int defaultValue) {
+        final int frameSize;
+        final int frameSizeResID = res.getIdentifier(resName, "dimen", "android");
+        if (frameSizeResID != 0) {
+            frameSize = res.getDimensionPixelSize(frameSizeResID);
+        } else {
+            frameSize = pxFromDp(defaultValue, res.getDisplayMetrics());
+        }
+        return frameSize;
+    }
+    public static boolean getBoolByName(String resName, Resources res, boolean defaultValue) {
+        final boolean val;
+        final int resId = res.getIdentifier(resName, "bool", "android");
+        if (resId != 0) {
+            val = res.getBoolean(resId);
+        } else {
+            val = defaultValue;
+        }
+        return val;
+    }
+    public static int getIntegerByName(String resName, Resources res, int defaultValue) {
+        int resId = res.getIdentifier(resName, "integer", "android");
+        return resId != 0 ? res.getInteger(resId) : defaultValue;
+    }
+    public static int pxFromDp(float size, DisplayMetrics metrics) {
+        return pxFromDp(size, metrics, 1f);
+    }
+    public static int pxFromDp(float size, DisplayMetrics metrics, float scale) {
+        float value = scale * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, metrics);
+        return size < 0 ? INVALID_RESOURCE_HANDLE : roundPxValueFromFloat(value);
+    }
+    /**
+     * Rounds a pixel value, taking into account floating point errors.
+     *
+     * <p>If a dp (or sp) value typically returns a half pixel, such as 20dp at a 2.625 density
+     * returning 52.5px, there is a small chance that due to floating-point errors, the value will
+     * be stored as 52.499999. As we round to the nearest pixel, this could cause a 1px difference
+     * in final values, which we correct for in this method.
+     */
+    public static int roundPxValueFromFloat(float value) {
+        float fraction = (float) (value - Math.floor(value));
+        if (Math.abs(0.5f - fraction) < EPSILON) {
+            // Note: we add for negative values as well, as Math.round brings -.5 to the next
+            // "highest" value, e.g. Math.round(-2.5) == -2 [i.e. (int)Math.floor(a + 0.5d)]
+            value += EPSILON;
+        }
+        return Math.round(value);
+    }
+}
\ No newline at end of file