From 10ec24ca9e502623e5e39ca55f660da5da758559 Mon Sep 17 00:00:00 2001
From: MrSluffy <werdna.jac@gmail.com>
Date: Sat, 1 Feb 2025 12:15:35 +0800
Subject: [PATCH 1/2] enh : restore split configuration

- only tested in pixel fold emulator
---
 build.gradle                                  |   2 +
 .../android/launcher3/FeatureFlagsImpl.java   |   2 +-
 lawnchair/res/values-sw400dp-land/styles.xml  |  18 ++
 lawnchair/res/values-sw400dp/styles.xml       |  38 +++
 lawnchair/res/values-sw480dp-land/styles.xml  |  18 ++
 lawnchair/res/values-sw480dp/styles.xml       |  18 ++
 lawnchair/res/values-sw600dp-land/dimens.xml  |  17 ++
 lawnchair/res/values-sw600dp-land/styles.xml  |  51 ++++
 lawnchair/res/values-sw600dp/dimens.xml       |  33 +++
 lawnchair/res/values-sw600dp/integers.xml     |  10 +
 lawnchair/res/values-sw600dp/styles.xml       |  62 +++++
 lawnchair/res/values-sw640dp-land/styles.xml  |  25 ++
 lawnchair/res/values-sw640dp/styles.xml       |  25 ++
 lawnchair/res/values-sw700dp-land/styles.xml  |  36 +++
 lawnchair/res/values-sw700dp/styles.xml       |  56 +++++
 lawnchair/res/values-sw720dp-land/dimens.xml  |  13 +
 lawnchair/res/values-sw720dp/dimens.xml       |  24 ++
 lawnchair/res/values-sw800dp-land/styles.xml  |  24 ++
 lawnchair/res/values-sw800dp/styles.xml       |  24 ++
 lawnchair/res/values-sw900dp/dimens.xml       |   5 +
 lawnchair/res/values/config.xml               |   2 +
 lawnchair/res/values/dimens.xml               |   4 +
 lawnchair/res/values/styles.xml               |  13 +
 .../xml-sw600dp-land/paddings_split_4_col.xml |  47 ++++
 .../xml-sw600dp-land/paddings_split_4x4.xml   |  61 +++++
 .../xml-sw600dp-land/paddings_split_4x5.xml   |  47 ++++
 .../xml-sw600dp-land/paddings_split_5_col.xml |  47 ++++
 .../xml-sw600dp-land/paddings_split_5x5.xml   |  47 ++++
 .../res/xml-sw600dp/paddings_split_4_col.xml  |  47 ++++
 .../res/xml-sw600dp/paddings_split_4x4.xml    |  49 ++++
 .../res/xml-sw600dp/paddings_split_4x5.xml    |  47 ++++
 .../res/xml-sw600dp/paddings_split_5_col.xml  |  47 ++++
 .../res/xml-sw600dp/paddings_split_5x5.xml    |  47 ++++
 .../default_workspace_splitdisplay_4x5.xml    |  75 ++++++
 lawnchair/res/xml/device_profiles.xml         | 234 ++++++++++++++++++
 lawnchair/res/xml/paddings_split_4x5.xml      |  47 ++++
 .../spec_all_apps_cell_match_workspace.xml    |  12 +
 .../spec_foldable_all_apps_4x5_unfolded.xml   |  39 +++
 .../xml/spec_foldable_folder_4x5_unfolded.xml |  57 +++++
 .../spec_foldable_hotseat_4x5_unfolded.xml    |  25 ++
 .../spec_foldable_workspace_4x5_unfolded.xml  |  71 ++++++
 ...c_foldable_workspace_cell_4x5_unfolded.xml |  35 +++
 lawnchair/res/xml/spec_handheld_all_apps.xml  |  39 +++
 .../res/xml/spec_handheld_folder_4x5.xml      |  51 ++++
 .../res/xml/spec_handheld_hotseat_4x5.xml     |  31 +++
 .../res/xml/spec_handheld_workspace_4x5.xml   | 127 ++++++++++
 .../xml/spec_handheld_workspace_cell_4x5.xml  |  21 ++
 src/com/android/launcher3/Launcher.java       |  11 +-
 48 files changed, 1875 insertions(+), 6 deletions(-)
 create mode 100644 lawnchair/res/values-sw400dp-land/styles.xml
 create mode 100644 lawnchair/res/values-sw400dp/styles.xml
 create mode 100644 lawnchair/res/values-sw480dp-land/styles.xml
 create mode 100644 lawnchair/res/values-sw480dp/styles.xml
 create mode 100644 lawnchair/res/values-sw600dp-land/dimens.xml
 create mode 100644 lawnchair/res/values-sw600dp-land/styles.xml
 create mode 100644 lawnchair/res/values-sw600dp/dimens.xml
 create mode 100644 lawnchair/res/values-sw600dp/integers.xml
 create mode 100644 lawnchair/res/values-sw600dp/styles.xml
 create mode 100644 lawnchair/res/values-sw640dp-land/styles.xml
 create mode 100644 lawnchair/res/values-sw640dp/styles.xml
 create mode 100644 lawnchair/res/values-sw700dp-land/styles.xml
 create mode 100644 lawnchair/res/values-sw700dp/styles.xml
 create mode 100644 lawnchair/res/values-sw720dp-land/dimens.xml
 create mode 100644 lawnchair/res/values-sw720dp/dimens.xml
 create mode 100644 lawnchair/res/values-sw800dp-land/styles.xml
 create mode 100644 lawnchair/res/values-sw800dp/styles.xml
 create mode 100644 lawnchair/res/values-sw900dp/dimens.xml
 create mode 100644 lawnchair/res/xml-sw600dp-land/paddings_split_4_col.xml
 create mode 100644 lawnchair/res/xml-sw600dp-land/paddings_split_4x4.xml
 create mode 100644 lawnchair/res/xml-sw600dp-land/paddings_split_4x5.xml
 create mode 100644 lawnchair/res/xml-sw600dp-land/paddings_split_5_col.xml
 create mode 100644 lawnchair/res/xml-sw600dp-land/paddings_split_5x5.xml
 create mode 100644 lawnchair/res/xml-sw600dp/paddings_split_4_col.xml
 create mode 100644 lawnchair/res/xml-sw600dp/paddings_split_4x4.xml
 create mode 100644 lawnchair/res/xml-sw600dp/paddings_split_4x5.xml
 create mode 100644 lawnchair/res/xml-sw600dp/paddings_split_5_col.xml
 create mode 100644 lawnchair/res/xml-sw600dp/paddings_split_5x5.xml
 create mode 100644 lawnchair/res/xml/default_workspace_splitdisplay_4x5.xml
 create mode 100644 lawnchair/res/xml/paddings_split_4x5.xml
 create mode 100644 lawnchair/res/xml/spec_all_apps_cell_match_workspace.xml
 create mode 100644 lawnchair/res/xml/spec_foldable_all_apps_4x5_unfolded.xml
 create mode 100644 lawnchair/res/xml/spec_foldable_folder_4x5_unfolded.xml
 create mode 100644 lawnchair/res/xml/spec_foldable_hotseat_4x5_unfolded.xml
 create mode 100644 lawnchair/res/xml/spec_foldable_workspace_4x5_unfolded.xml
 create mode 100644 lawnchair/res/xml/spec_foldable_workspace_cell_4x5_unfolded.xml
 create mode 100644 lawnchair/res/xml/spec_handheld_all_apps.xml
 create mode 100644 lawnchair/res/xml/spec_handheld_folder_4x5.xml
 create mode 100644 lawnchair/res/xml/spec_handheld_hotseat_4x5.xml
 create mode 100644 lawnchair/res/xml/spec_handheld_workspace_4x5.xml
 create mode 100644 lawnchair/res/xml/spec_handheld_workspace_cell_4x5.xml

diff --git a/build.gradle b/build.gradle
index a627ada2cc4..16438c6b099 100644
--- a/build.gradle
+++ b/build.gradle
@@ -448,6 +448,8 @@ dependencies {
     }
 
     implementation 'io.github.hokofly:hoko-blur:1.5.3'
+    
+    implementation "androidx.window:window:1.3.0"
 }
 
 ksp {
diff --git a/flags/src/com/android/launcher3/FeatureFlagsImpl.java b/flags/src/com/android/launcher3/FeatureFlagsImpl.java
index b8cfae5e3a0..d0aad19aaa5 100644
--- a/flags/src/com/android/launcher3/FeatureFlagsImpl.java
+++ b/flags/src/com/android/launcher3/FeatureFlagsImpl.java
@@ -121,7 +121,7 @@ private void load_overrides_launcher() {
             enableTaskbarPinning =
                     properties.getBoolean(Flags.FLAG_ENABLE_TASKBAR_PINNING, true);
             enableTwoPaneLauncherSettings =
-                    properties.getBoolean(Flags.FLAG_ENABLE_TWO_PANE_LAUNCHER_SETTINGS, false);
+                    properties.getBoolean(Flags.FLAG_ENABLE_TWO_PANE_LAUNCHER_SETTINGS, true);
             enableTwolineAllapps =
                     properties.getBoolean(Flags.FLAG_ENABLE_TWOLINE_ALLAPPS, false);
             enableTwolineToggle =
diff --git a/lawnchair/res/values-sw400dp-land/styles.xml b/lawnchair/res/values-sw400dp-land/styles.xml
new file mode 100644
index 00000000000..438c4fae835
--- /dev/null
+++ b/lawnchair/res/values-sw400dp-land/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="CellStyle4x4Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+    <style name="CellStyle4x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+    <style name="CellStyle5x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+    <style name="CellStyle_4_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+    <style name="CellStyle_5_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw400dp/styles.xml b/lawnchair/res/values-sw400dp/styles.xml
new file mode 100644
index 00000000000..5fd65ee1d04
--- /dev/null
+++ b/lawnchair/res/values-sw400dp/styles.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="CellStyle4x4Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="CellStyle4x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="CellStyle5x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="CellStyle_4_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="CellStyle_5_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="Folder4x4FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">94dp</item>
+        <item name="folderCellWidth">80dp</item>
+    </style>
+    <style name="Folder4x5FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">89dp</item>
+        <item name="folderCellWidth">80dp</item>
+    </style>
+    <style name="Folder5x5FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">83dp</item>
+        <item name="folderCellWidth">64dp</item>
+    </style>
+    <style name="Folder_4_Col_FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">89dp</item>
+        <item name="folderCellWidth">80dp</item>
+    </style>
+    <style name="Folder_5_Col_FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">83dp</item>
+        <item name="folderCellWidth">64dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw480dp-land/styles.xml b/lawnchair/res/values-sw480dp-land/styles.xml
new file mode 100644
index 00000000000..438c4fae835
--- /dev/null
+++ b/lawnchair/res/values-sw480dp-land/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="CellStyle4x4Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+    <style name="CellStyle4x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+    <style name="CellStyle5x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+    <style name="CellStyle_4_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+    <style name="CellStyle_5_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw480dp/styles.xml b/lawnchair/res/values-sw480dp/styles.xml
new file mode 100644
index 00000000000..fb6429298a2
--- /dev/null
+++ b/lawnchair/res/values-sw480dp/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="CellStyle4x4Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="CellStyle4x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="CellStyle5x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">11dp</item>
+    </style>
+    <style name="CellStyle_4_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="CellStyle_5_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">11dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw600dp-land/dimens.xml b/lawnchair/res/values-sw600dp-land/dimens.xml
new file mode 100644
index 00000000000..adb0ac5bc20
--- /dev/null
+++ b/lawnchair/res/values-sw600dp-land/dimens.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="allset_page_margin_horizontal">48dp</dimen>
+    <dimen name="cell_layout_padding">11.33dp</dimen>
+    <dimen name="drop_target_bottom_margin">16dp</dimen>
+    <dimen name="drop_target_top_margin">0dp</dimen>
+    <dimen name="dynamic_grid_edge_margin">11.33dp</dimen>
+    <dimen name="gesture_tutorial_menu_back_shape_bottom_margin">49dp</dimen>
+    <dimen name="gesture_tutorial_menu_button_height">491dp</dimen>
+    <dimen name="gesture_tutorial_menu_button_spacing">24dp</dimen>
+    <dimen name="gesture_tutorial_menu_padding_bottom">16dp</dimen>
+    <dimen name="gesture_tutorial_menu_padding_horizontal">48dp</dimen>
+    <dimen name="gesture_tutorial_menu_padding_top">32dp</dimen>
+    <dimen name="min_page_snap_velocity">3600dp</dimen>
+    <dimen name="spring_loaded_hotseat_top_margin">44dp</dimen>
+    <dimen name="taskbar_suw_insets">24dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw600dp-land/styles.xml b/lawnchair/res/values-sw600dp-land/styles.xml
new file mode 100644
index 00000000000..1bd7c5a89ab
--- /dev/null
+++ b/lawnchair/res/values-sw600dp-land/styles.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AllAppsStyle5x5Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">43dp</item>
+    </style>
+    <style name="AllAppsStyle_5_Col_Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">43dp</item>
+    </style>
+    <style name="CellStyle4x4Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">10dp</item>
+    </style>
+    <style name="CellStyle4x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">3dp</item>
+    </style>
+    <style name="CellStyle5x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">6dp</item>
+    </style>
+    <style name="CellStyle_4_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">3dp</item>
+    </style>
+    <style name="CellStyle_5_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">6dp</item>
+    </style>
+    <style name="Folder4x4FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">89dp</item>
+        <item name="folderCellWidth">68dp</item>
+    </style>
+    <style name="Folder4x5FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">65dp</item>
+        <item name="folderCellWidth">70dp</item>
+    </style>
+    <style name="Folder5x5FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">66dp</item>
+        <item name="folderCellWidth">53dp</item>
+    </style>
+    <style name="FolderStyleDefault" parent="">
+        <item name="folderBorderSpace">16dp</item>
+        <item name="folderCellHeight">94dp</item>
+        <item name="folderCellWidth">80dp</item>
+        <item name="folderFooterHeight">56dp</item>
+        <item name="folderTopPadding">24dp</item>
+    </style>
+    <style name="Folder_4_Col_FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">65dp</item>
+        <item name="folderCellWidth">70dp</item>
+    </style>
+    <style name="Folder_5_Col_FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">66dp</item>
+        <item name="folderCellWidth">53dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw600dp/dimens.xml b/lawnchair/res/values-sw600dp/dimens.xml
new file mode 100644
index 00000000000..1472dc78044
--- /dev/null
+++ b/lawnchair/res/values-sw600dp/dimens.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="all_apps_search_bar_content_overlap">0dp</dimen>
+    <dimen name="allset_page_allset_text_size">38sp</dimen>
+    <dimen name="allset_page_margin_horizontal">120dp</dimen>
+    <dimen name="allset_page_swipe_up_text_size">15sp</dimen>
+    <dimen name="cell_layout_padding">9dp</dimen>
+    <dimen name="drag_flingToDeleteMinVelocity">-1000dp</dimen>
+    <dimen name="drop_target_bottom_margin">16dp</dimen>
+    <dimen name="drop_target_button_drawable_vertical_padding">16dp</dimen>
+    <dimen name="drop_target_top_margin">64dp</dimen>
+    <dimen name="dynamic_grid_drop_target_size">56dp</dimen>
+    <dimen name="dynamic_grid_edge_margin">9dp</dimen>
+    <dimen name="dynamic_grid_hotseat_side_padding">0dp</dimen>
+    <dimen name="fastscroll_popup_height">62dp</dimen>
+    <dimen name="fastscroll_popup_padding">13dp</dimen>
+    <dimen name="fastscroll_popup_text_size">32dp</dimen>
+    <dimen name="fastscroll_popup_width">75dp</dimen>
+    <dimen name="grid_visualization_horizontal_cell_spacing">6dp</dimen>
+    <dimen name="min_hotseat_icon_space">17dp</dimen>
+    <dimen name="min_page_snap_velocity">3000dp</dimen>
+    <dimen name="navigation_key_padding">25dp</dimen>
+    <dimen name="overview_actions_top_margin">24dp</dimen>
+    <dimen name="overview_grid_row_spacing">28dp</dimen>
+    <dimen name="overview_grid_side_margin">64dp</dimen>
+    <dimen name="overview_page_spacing">36dp</dimen>
+    <dimen name="overview_task_margin">12dp</dimen>
+    <dimen name="split_instructions_view_max_width">300dp</dimen>
+    <dimen name="spring_loaded_hotseat_top_margin">65dp</dimen>
+    <dimen name="task_thumbnail_icon_drawable_size_grid">44dp</dimen>
+    <dimen name="wallpaper_carousel_height">132dp</dimen>
+    <dimen name="widget_list_horizontal_margin">32dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw600dp/integers.xml b/lawnchair/res/values-sw600dp/integers.xml
new file mode 100644
index 00000000000..51005e8b64b
--- /dev/null
+++ b/lawnchair/res/values-sw600dp/integers.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="config_allAppsCloseDuration">@integer/config_bottomSheetCloseDuration</integer>
+    <integer name="config_allAppsOpenDuration">@integer/config_bottomSheetOpenDuration</integer>
+    <integer name="config_bottomSheetCloseDuration">500</integer>
+    <integer name="config_bottomSheetOpenDuration">500</integer>
+    <integer name="config_keyboardTaskFocusSnapAnimationDuration">400</integer>
+    <integer name="config_pageSnapAnimationDuration">550</integer>
+    <integer name="recentsThumbnailCacheSize">8</integer>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw600dp/styles.xml b/lawnchair/res/values-sw600dp/styles.xml
new file mode 100644
index 00000000000..b355fc91c2c
--- /dev/null
+++ b/lawnchair/res/values-sw600dp/styles.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AllAppsStyle4x4Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">32dp</item>
+    </style>
+    <style name="AllAppsStyle4x5Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">32dp</item>
+    </style>
+    <style name="AllAppsStyle5x5Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">42dp</item>
+    </style>
+    <style name="AllAppsStyle_4_Col_Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">32dp</item>
+    </style>
+    <style name="AllAppsStyle_5_Col_Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">42dp</item>
+    </style>
+    <style name="CellStyle4x4Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">12dp</item>
+    </style>
+    <style name="CellStyle4x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">12dp</item>
+    </style>
+    <style name="CellStyle5x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">10dp</item>
+    </style>
+    <style name="CellStyleDefault" parent="">
+        <item name="iconDrawablePadding">7dp</item>
+    </style>
+    <style name="CellStyle_4_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">12dp</item>
+    </style>
+    <style name="CellStyle_5_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">10dp</item>
+    </style>
+    <style name="Folder4x4FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">80dp</item>
+        <item name="folderCellWidth">58dp</item>
+    </style>
+    <style name="Folder4x5FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">83dp</item>
+        <item name="folderCellWidth">58dp</item>
+    </style>
+    <style name="Folder5x5FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderBorderSpace">12dp</item>
+        <item name="folderCellHeight">71dp</item>
+        <item name="folderCellWidth">48dp</item>
+    </style>
+    <style name="Folder_4_Col_FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">83dp</item>
+        <item name="folderCellWidth">58dp</item>
+    </style>
+    <style name="Folder_5_Col_FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderBorderSpace">12dp</item>
+        <item name="folderCellHeight">71dp</item>
+        <item name="folderCellWidth">48dp</item>
+    </style>
+    <style name="Widget.Design.TabLayout" parent="@style/Base.Widget.Design.TabLayout">
+        <item name="tabGravity">center</item>
+        <item name="tabMode">fixed</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw640dp-land/styles.xml b/lawnchair/res/values-sw640dp-land/styles.xml
new file mode 100644
index 00000000000..05b3c3854bc
--- /dev/null
+++ b/lawnchair/res/values-sw640dp-land/styles.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AllAppsStyle5x8" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">32dp</item>
+    </style>
+    <style name="AllAppsStyle6x5" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">32dp</item>
+    </style>
+    <style name="CellStyle5x8" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">10dp</item>
+    </style>
+    <style name="CellStyle6x5" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">10dp</item>
+    </style>
+    <style name="Folder5x8Style" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">79dp</item>
+        <item name="folderCellWidth">79dp</item>
+        <item name="folderFooterHeight">64dp</item>
+    </style>
+    <style name="Folder6x5Style" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">79dp</item>
+        <item name="folderCellWidth">79dp</item>
+        <item name="folderFooterHeight">64dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw640dp/styles.xml b/lawnchair/res/values-sw640dp/styles.xml
new file mode 100644
index 00000000000..a8ef78797c5
--- /dev/null
+++ b/lawnchair/res/values-sw640dp/styles.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AllAppsStyle5x8" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">28dp</item>
+    </style>
+    <style name="AllAppsStyle6x5" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">28dp</item>
+    </style>
+    <style name="CellStyle5x8" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">14dp</item>
+    </style>
+    <style name="CellStyle6x5" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">14dp</item>
+    </style>
+    <style name="Folder5x8Style" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">104dp</item>
+        <item name="folderCellWidth">102dp</item>
+        <item name="folderFooterHeight">64dp</item>
+    </style>
+    <style name="Folder6x5Style" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">104dp</item>
+        <item name="folderCellWidth">102dp</item>
+        <item name="folderFooterHeight">64dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw700dp-land/styles.xml b/lawnchair/res/values-sw700dp-land/styles.xml
new file mode 100644
index 00000000000..1addb3fa837
--- /dev/null
+++ b/lawnchair/res/values-sw700dp-land/styles.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AllAppsStyle4x5Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">20dp</item>
+    </style>
+    <style name="AllAppsStyle5x5Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">50dp</item>
+    </style>
+    <style name="AllAppsStyle_4_Col_Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">20dp</item>
+    </style>
+    <style name="AllAppsStyle_5_Col_Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">50dp</item>
+    </style>
+    <style name="CellStyle4x4Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="CellStyle4x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+    <style name="CellStyle_4_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+    <style name="Folder4x4FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">94dp</item>
+        <item name="folderCellWidth">80dp</item>
+    </style>
+    <style name="Folder5x5FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">83dp</item>
+        <item name="folderCellWidth">64dp</item>
+    </style>
+    <style name="Folder_5_Col_FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">83dp</item>
+        <item name="folderCellWidth">64dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw700dp/styles.xml b/lawnchair/res/values-sw700dp/styles.xml
new file mode 100644
index 00000000000..b373d479037
--- /dev/null
+++ b/lawnchair/res/values-sw700dp/styles.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AllAppsStyle5x5Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">28dp</item>
+    </style>
+    <style name="AllAppsStyle_5_Col_Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">28dp</item>
+    </style>
+    <style name="CellStyle4x4Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">12dp</item>
+    </style>
+    <style name="CellStyle4x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">12dp</item>
+    </style>
+    <style name="CellStyle5x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="CellStyle_4_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">12dp</item>
+    </style>
+    <style name="CellStyle_5_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="Folder4x4FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">89dp</item>
+        <item name="folderCellWidth">68dp</item>
+    </style>
+    <style name="Folder4x5FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">89dp</item>
+        <item name="folderCellWidth">68dp</item>
+    </style>
+    <style name="Folder5x5FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderBorderSpace">12dp</item>
+        <item name="folderCellHeight">83dp</item>
+        <item name="folderCellWidth">64dp</item>
+    </style>
+    <style name="Folder5x8Style" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">104dp</item>
+        <item name="folderCellWidth">102dp</item>
+        <item name="folderFooterHeight">64dp</item>
+    </style>
+    <style name="Folder6x5Style" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">104dp</item>
+        <item name="folderCellWidth">102dp</item>
+        <item name="folderFooterHeight">64dp</item>
+    </style>
+    <style name="Folder_4_Col_FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">89dp</item>
+        <item name="folderCellWidth">68dp</item>
+    </style>
+    <style name="Folder_5_Col_FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderBorderSpace">12dp</item>
+        <item name="folderCellHeight">83dp</item>
+        <item name="folderCellWidth">64dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw720dp-land/dimens.xml b/lawnchair/res/values-sw720dp-land/dimens.xml
new file mode 100644
index 00000000000..6e86df95b95
--- /dev/null
+++ b/lawnchair/res/values-sw720dp-land/dimens.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="cell_layout_padding">29.33dp</dimen>
+    <dimen name="drop_target_bottom_margin">32dp</dimen>
+    <dimen name="drop_target_top_margin">0dp</dimen>
+    <dimen name="dynamic_grid_edge_margin">21.93dp</dimen>
+    <dimen name="gesture_tutorial_menu_back_shape_bottom_margin">21dp</dimen>
+    <dimen name="gesture_tutorial_menu_button_height">580dp</dimen>
+    <dimen name="gesture_tutorial_menu_button_spacing">49dp</dimen>
+    <dimen name="min_page_snap_velocity">5300dp</dimen>
+    <dimen name="spring_loaded_hotseat_top_margin">64dp</dimen>
+    <dimen name="widget_list_horizontal_margin">49dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw720dp/dimens.xml b/lawnchair/res/values-sw720dp/dimens.xml
new file mode 100644
index 00000000000..efec09e223f
--- /dev/null
+++ b/lawnchair/res/values-sw720dp/dimens.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="allset_page_allset_text_size">42sp</dimen>
+    <dimen name="allset_page_swipe_up_text_size">16sp</dimen>
+    <dimen name="cell_layout_padding">36dp</dimen>
+    <dimen name="drop_target_bottom_margin">48dp</dimen>
+    <dimen name="drop_target_button_drawable_horizontal_padding">24dp</dimen>
+    <dimen name="drop_target_button_drawable_vertical_padding">8dp</dimen>
+    <dimen name="drop_target_button_gap">32dp</dimen>
+    <dimen name="drop_target_button_workspace_edge_gap">32dp</dimen>
+    <dimen name="drop_target_text_size">20sp</dimen>
+    <dimen name="drop_target_top_margin">110dp</dimen>
+    <dimen name="dynamic_grid_drop_target_size">72dp</dimen>
+    <dimen name="dynamic_grid_edge_margin">27.59dp</dimen>
+    <dimen name="folder_footer_horiz_padding">24dp</dimen>
+    <dimen name="min_page_snap_velocity">3400dp</dimen>
+    <dimen name="overview_grid_row_spacing">36dp</dimen>
+    <dimen name="overview_page_spacing">44dp</dimen>
+    <dimen name="overview_task_margin">16dp</dimen>
+    <dimen name="spring_loaded_hotseat_top_margin">108dp</dimen>
+    <dimen name="taskbar_nav_threshold_mult">3</dimen>
+    <dimen name="widget_cell_horizontal_padding">16dp</dimen>
+    <dimen name="widget_list_horizontal_margin">30dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw800dp-land/styles.xml b/lawnchair/res/values-sw800dp-land/styles.xml
new file mode 100644
index 00000000000..e0ea739772e
--- /dev/null
+++ b/lawnchair/res/values-sw800dp-land/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AllAppsStyle4x5Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">23dp</item>
+    </style>
+    <style name="AllAppsStyle5x5Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">69dp</item>
+    </style>
+    <style name="AllAppsStyle_4_Col_Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">23dp</item>
+    </style>
+    <style name="AllAppsStyle_5_Col_Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">69dp</item>
+    </style>
+    <style name="CellStyle4x4Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">8dp</item>
+    </style>
+    <style name="CellStyle4x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+    <style name="CellStyle_4_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">4dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw800dp/styles.xml b/lawnchair/res/values-sw800dp/styles.xml
new file mode 100644
index 00000000000..57bdb624bb8
--- /dev/null
+++ b/lawnchair/res/values-sw800dp/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AllAppsStyle4x5Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">32dp</item>
+    </style>
+    <style name="AllAppsStyle5x5Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">33dp</item>
+    </style>
+    <style name="AllAppsStyle_4_Col_Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">32dp</item>
+    </style>
+    <style name="AllAppsStyle_5_Col_Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">33dp</item>
+    </style>
+    <style name="CellStyle4x4Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">12dp</item>
+    </style>
+    <style name="CellStyle4x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">12dp</item>
+    </style>
+    <style name="CellStyle_4_Col_Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">12dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values-sw900dp/dimens.xml b/lawnchair/res/values-sw900dp/dimens.xml
new file mode 100644
index 00000000000..43830549d9e
--- /dev/null
+++ b/lawnchair/res/values-sw900dp/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="key_button_ripple_max_width">76dp</dimen>
+    <dimen name="navigation_key_padding">0dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/res/values/config.xml b/lawnchair/res/values/config.xml
index ae76b57676c..ac0261ce4b8 100644
--- a/lawnchair/res/values/config.xml
+++ b/lawnchair/res/values/config.xml
@@ -161,4 +161,6 @@
 
     <!-- The max scale for the wallpaper when it's zoomed in -->
     <item name="config_wallpaperMaxScale" format="float" type="dimen">1.10</item>
+
+    <attr name="isOldGrid" format="boolean" />
 </resources>
diff --git a/lawnchair/res/values/dimens.xml b/lawnchair/res/values/dimens.xml
index a12ca82633a..338f3407f8f 100644
--- a/lawnchair/res/values/dimens.xml
+++ b/lawnchair/res/values/dimens.xml
@@ -109,4 +109,8 @@
 
     <dimen name="wallpaper_carousel_height">120dp</dimen>
 
+    <dimen name="aspect_ratio_landscape">10</dimen>
+    <dimen name="aspect_ratio_portrait">1</dimen>
+    <dimen name="aspect_ratio_portrait_and_square">1.05</dimen>
+
 </resources>
diff --git a/lawnchair/res/values/styles.xml b/lawnchair/res/values/styles.xml
index f3453325b5e..bfef8a2586f 100644
--- a/lawnchair/res/values/styles.xml
+++ b/lawnchair/res/values/styles.xml
@@ -210,4 +210,17 @@
         <item name="keyShadowOffsetX">@dimen/key_text_shadow_dx</item>
         <item name="keyShadowOffsetY">@dimen/key_text_shadow_dy</item>
     </style>
+
+    <style name="AllAppsStyle4x5Fold" parent="@style/AllAppsStyleDefault">
+        <item name="horizontalPadding">32dp</item>
+    </style>
+
+    <style name="CellStyle4x5Fold" parent="@style/CellStyleDefault">
+        <item name="iconDrawablePadding">12dp</item>
+    </style>
+
+    <style name="Folder4x5FoldStyle" parent="@style/FolderStyleDefault">
+        <item name="folderCellHeight">83dp</item>
+        <item name="folderCellWidth">58dp</item>
+    </style>
 </resources>
diff --git a/lawnchair/res/xml-sw600dp-land/paddings_split_4_col.xml b/lawnchair/res/xml-sw600dp-land/paddings_split_4_col.xml
new file mode 100644
index 00000000000..fcdc96fbae0
--- /dev/null
+++ b/lawnchair/res/xml-sw600dp-land/paddings_split_4_col.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <device-padding launcher:maxEmptySpace="30dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="80dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="16dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="16dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="135dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="58dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="58dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.4"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="0.6"
+            launcher:b="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+</device-paddings>
\ No newline at end of file
diff --git a/lawnchair/res/xml-sw600dp-land/paddings_split_4x4.xml b/lawnchair/res/xml-sw600dp-land/paddings_split_4x4.xml
new file mode 100644
index 00000000000..b35fefaba5a
--- /dev/null
+++ b/lawnchair/res/xml-sw600dp-land/paddings_split_4x4.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <device-padding launcher:maxEmptySpace="7dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="17dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="7dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:b="0"
+            launcher:c="7dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="26dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:b="0"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="120dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="32dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:b="0"
+            launcher:c="32dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.4"
+            launcher:c="0"/>
+        <workspaceBottomPadding
+            launcher:a="0.6"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+</device-paddings>
\ No newline at end of file
diff --git a/lawnchair/res/xml-sw600dp-land/paddings_split_4x5.xml b/lawnchair/res/xml-sw600dp-land/paddings_split_4x5.xml
new file mode 100644
index 00000000000..fcdc96fbae0
--- /dev/null
+++ b/lawnchair/res/xml-sw600dp-land/paddings_split_4x5.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <device-padding launcher:maxEmptySpace="30dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="80dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="16dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="16dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="135dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="58dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="58dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.4"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="0.6"
+            launcher:b="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+</device-paddings>
\ No newline at end of file
diff --git a/lawnchair/res/xml-sw600dp-land/paddings_split_5_col.xml b/lawnchair/res/xml-sw600dp-land/paddings_split_5_col.xml
new file mode 100644
index 00000000000..d6ce7f4d852
--- /dev/null
+++ b/lawnchair/res/xml-sw600dp-land/paddings_split_5_col.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <device-padding launcher:maxEmptySpace="12dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="20dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="8dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="8dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="123dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="60dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="60dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.4"
+            launcher:c="0"/>
+        <workspaceBottomPadding
+            launcher:a="0.6"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+</device-paddings>
\ No newline at end of file
diff --git a/lawnchair/res/xml-sw600dp-land/paddings_split_5x5.xml b/lawnchair/res/xml-sw600dp-land/paddings_split_5x5.xml
new file mode 100644
index 00000000000..d6ce7f4d852
--- /dev/null
+++ b/lawnchair/res/xml-sw600dp-land/paddings_split_5x5.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <device-padding launcher:maxEmptySpace="12dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="20dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="8dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="8dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="123dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="60dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="60dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.4"
+            launcher:c="0"/>
+        <workspaceBottomPadding
+            launcher:a="0.6"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+</device-paddings>
\ No newline at end of file
diff --git a/lawnchair/res/xml-sw600dp/paddings_split_4_col.xml b/lawnchair/res/xml-sw600dp/paddings_split_4_col.xml
new file mode 100644
index 00000000000..22c1cea904b
--- /dev/null
+++ b/lawnchair/res/xml-sw600dp/paddings_split_4_col.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <device-padding launcher:maxEmptySpace="60dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="100dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="60dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="60dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="160dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="73dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="73dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.4"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="0.6"
+            launcher:b="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+</device-paddings>
\ No newline at end of file
diff --git a/lawnchair/res/xml-sw600dp/paddings_split_4x4.xml b/lawnchair/res/xml-sw600dp/paddings_split_4x4.xml
new file mode 100644
index 00000000000..c5f13d1ac15
--- /dev/null
+++ b/lawnchair/res/xml-sw600dp/paddings_split_4x4.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <device-padding launcher:maxEmptySpace="34dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="85dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="34dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:b="0"
+            launcher:c="34dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="97dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="42dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:b="0"
+            launcher:c="42dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.4"
+            launcher:c="0"/>
+        <workspaceBottomPadding
+            launcher:a="0.6"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+</device-paddings>
\ No newline at end of file
diff --git a/lawnchair/res/xml-sw600dp/paddings_split_4x5.xml b/lawnchair/res/xml-sw600dp/paddings_split_4x5.xml
new file mode 100644
index 00000000000..22c1cea904b
--- /dev/null
+++ b/lawnchair/res/xml-sw600dp/paddings_split_4x5.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <device-padding launcher:maxEmptySpace="60dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="100dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="60dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="60dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="160dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="73dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="73dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.4"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="0.6"
+            launcher:b="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+</device-paddings>
\ No newline at end of file
diff --git a/lawnchair/res/xml-sw600dp/paddings_split_5_col.xml b/lawnchair/res/xml-sw600dp/paddings_split_5_col.xml
new file mode 100644
index 00000000000..837865e7e56
--- /dev/null
+++ b/lawnchair/res/xml-sw600dp/paddings_split_5_col.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <device-padding launcher:maxEmptySpace="78dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="10dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="10dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="136dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="84dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="84dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="167dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="101dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="101dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.4"
+            launcher:c="0"/>
+        <workspaceBottomPadding
+            launcher:a="0.6"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+</device-paddings>
\ No newline at end of file
diff --git a/lawnchair/res/xml-sw600dp/paddings_split_5x5.xml b/lawnchair/res/xml-sw600dp/paddings_split_5x5.xml
new file mode 100644
index 00000000000..837865e7e56
--- /dev/null
+++ b/lawnchair/res/xml-sw600dp/paddings_split_5x5.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <device-padding launcher:maxEmptySpace="78dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="10dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="10dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="136dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="84dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="84dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="167dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="101dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="101dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.4"
+            launcher:c="0"/>
+        <workspaceBottomPadding
+            launcher:a="0.6"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+</device-paddings>
\ No newline at end of file
diff --git a/lawnchair/res/xml/default_workspace_splitdisplay_4x5.xml b/lawnchair/res/xml/default_workspace_splitdisplay_4x5.xml
new file mode 100644
index 00000000000..36c1ce7137c
--- /dev/null
+++ b/lawnchair/res/xml/default_workspace_splitdisplay_4x5.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+    <favorite
+        launcher:className="com.google.android.dialer.extensions.GoogleDialtactsActivity"
+        launcher:container="-101"
+        launcher:packageName="com.google.android.dialer"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="0"/>
+    <favorite
+        launcher:className="com.google.android.apps.messaging.ui.ConversationListActivity"
+        launcher:container="-101"
+        launcher:packageName="com.google.android.apps.messaging"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0"/>
+    <favorite
+        launcher:className="com.google.android.apps.chrome.Main"
+        launcher:container="-101"
+        launcher:packageName="com.android.chrome"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="0"/>
+    <favorite
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:packageName="com.google.android.GoogleCamera"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0"/>
+    <favorite
+        launcher:className="com.android.vending.AssetBrowserActivity"
+        launcher:packageName="com.android.vending"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="4"/>
+    <favorite
+        launcher:className="com.google.android.gm.ConversationListActivityGmail"
+        launcher:packageName="com.google.android.gm"
+        launcher:screen="0"
+        launcher:x="1"
+        launcher:y="4"/>
+    <favorite
+        launcher:className="com.google.android.apps.photos.home.HomeActivity"
+        launcher:packageName="com.google.android.apps.photos"
+        launcher:screen="0"
+        launcher:x="2"
+        launcher:y="4"/>
+    <favorite
+        launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+        launcher:packageName="com.google.android.youtube"
+        launcher:screen="0"
+        launcher:x="3"
+        launcher:y="4"/>
+    <appwidget
+        launcher:className="com.google.android.apps.search.assistant.verticals.snapshot.widgets.weather.WeatherWidget_Receiver"
+        launcher:packageName="com.google.android.googlequicksearchbox"
+        launcher:screen="1"
+        launcher:spanX="4"
+        launcher:spanY="3"
+        launcher:x="0"
+        launcher:y="0">
+        <extra
+            launcher:key="is_default_appwidget"
+            launcher:value="true"/>
+    </appwidget>
+    <appwidget
+        launcher:className="com.android.calendar.widget.CalendarAppWidgetProvider"
+        launcher:packageName="com.google.android.calendar"
+        launcher:screen="1"
+        launcher:spanX="4"
+        launcher:spanY="2"
+        launcher:x="0"
+        launcher:y="3"/>
+</favorites>
\ No newline at end of file
diff --git a/lawnchair/res/xml/device_profiles.xml b/lawnchair/res/xml/device_profiles.xml
index 54f66c26f7a..4e15c83c218 100644
--- a/lawnchair/res/xml/device_profiles.xml
+++ b/lawnchair/res/xml/device_profiles.xml
@@ -207,4 +207,238 @@
 
     </grid-option>
 
+    <grid-option
+        launcher:allAppsCellSpecsId="@xml/spec_all_apps_cell_match_workspace"
+        launcher:allAppsCellSpecsTwoPanelId="@xml/spec_all_apps_cell_match_workspace"
+        launcher:allAppsSpecsId="@xml/spec_handheld_all_apps"
+        launcher:allAppsSpecsTwoPanelId="@xml/spec_foldable_all_apps_4x5_unfolded"
+        launcher:allAppsStyle="@style/AllAppsStyle4x5Fold"
+        launcher:cellStyle="@style/CellStyle4x5Fold"
+        launcher:defaultLayoutId="@xml/default_workspace_splitdisplay_4x5"
+        launcher:deviceCategory="multi_display"
+        launcher:devicePaddingId="@xml/paddings_split_4x5"
+        launcher:folderSpecsId="@xml/spec_handheld_folder_4x5"
+        launcher:folderSpecsTwoPanelId="@xml/spec_foldable_folder_4x5_unfolded"
+        launcher:folderStyle="@style/Folder4x5FoldStyle"
+        launcher:hotseatSpecsId="@xml/spec_handheld_hotseat_4x5"
+        launcher:hotseatSpecsTwoPanelId="@xml/spec_foldable_hotseat_4x5_unfolded"
+        launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_split"
+        launcher:isOldGrid="true"
+        launcher:isScalable="true"
+        launcher:name="practical"
+        launcher:numAllAppsColumns="4"
+        launcher:numColumns="4"
+        launcher:numExtendedAllAppsColumns="6"
+        launcher:numExtendedHotseatIcons="6"
+        launcher:numFolderColumns="3"
+        launcher:numFolderRows="3"
+        launcher:numHotseatIcons="4"
+        launcher:numRows="5"
+        launcher:workspaceCellSpecsId="@xml/spec_handheld_workspace_cell_4x5"
+        launcher:workspaceCellSpecsTwoPanelId="@xml/spec_foldable_workspace_cell_4x5_unfolded"
+        launcher:workspaceSpecsId="@xml/spec_handheld_workspace_4x5"
+        launcher:workspaceSpecsTwoPanelId="@xml/spec_foldable_workspace_4x5_unfolded">
+        <display-option
+            launcher:allAppsBorderSpace="16"
+            launcher:allAppsBorderSpaceTwoPanelLandscapeHorizontal="20"
+            launcher:allAppsBorderSpaceTwoPanelLandscapeVertical="12"
+            launcher:allAppsBorderSpaceTwoPanelPortraitHorizontal="16"
+            launcher:allAppsBorderSpaceTwoPanelPortraitVertical="12"
+            launcher:allAppsCellHeight="89"
+            launcher:allAppsCellHeightTwoPanelLandscape="104"
+            launcher:allAppsCellHeightTwoPanelPortrait="104"
+            launcher:allAppsCellWidth="78"
+            launcher:allAppsCellWidthTwoPanelLandscape="80"
+            launcher:allAppsCellWidthTwoPanelPortrait="68"
+            launcher:allAppsIconSize="66"
+            launcher:allAppsIconSizeTwoPanelLandscape="57"
+            launcher:allAppsIconSizeTwoPanelPortrait="57"
+            launcher:allAppsIconTextSize="14"
+            launcher:allAppsIconTextSizeTwoPanelLandscape="12"
+            launcher:allAppsIconTextSizeTwoPanelPortrait="12"
+            launcher:borderSpace="16"
+            launcher:horizontalMargin="25.5"
+            launcher:horizontalMarginTwoPanelLandscape="28.5"
+            launcher:horizontalMarginTwoPanelPortrait="22.5"
+            launcher:hotseatBarBottomSpaceTwoPanelLandscape="24"
+            launcher:hotseatBarBottomSpaceTwoPanelPortrait="36"
+            launcher:hotseatQsbSpace="24"
+            launcher:hotseatQsbSpaceTwoPanelLandscape="24"
+            launcher:hotseatQsbSpaceTwoPanelPortrait="36"
+            launcher:iconImageSize="66"
+            launcher:iconSizeLandscape="57"
+            launcher:iconSizeTwoPanelLandscape="57"
+            launcher:iconSizeTwoPanelPortrait="57"
+            launcher:iconTextSize="14"
+            launcher:iconTextSizeTwoPanelLandscape="12"
+            launcher:iconTextSizeTwoPanelPortrait="12"
+            launcher:minCellHeight="89"
+            launcher:minCellHeightTwoPanelLandscape="79"
+            launcher:minCellHeightTwoPanelPortrait="89"
+            launcher:minCellWidth="78"
+            launcher:minCellWidthTwoPanelLandscape="84"
+            launcher:minCellWidthTwoPanelPortrait="68"
+            launcher:minHeightDps="659.8095"
+            launcher:minWidthDps="352"
+            launcher:name="Pixel (Split Display)"
+            launcher:startAlignTaskbar="true"
+            launcher:startAlignTaskbarLandscape="true"
+            launcher:transientTaskbarIconSize="52.8"/>
+        <display-option
+            launcher:allAppsBorderSpaceHorizontal="16"
+            launcher:allAppsBorderSpaceTwoPanelLandscapeHorizontal="16"
+            launcher:allAppsBorderSpaceTwoPanelLandscapeVertical="8"
+            launcher:allAppsBorderSpaceTwoPanelPortraitHorizontal="16"
+            launcher:allAppsBorderSpaceTwoPanelPortraitVertical="8"
+            launcher:allAppsBorderSpaceVertical="12"
+            launcher:allAppsCellHeight="73"
+            launcher:allAppsCellHeightTwoPanelLandscape="104"
+            launcher:allAppsCellHeightTwoPanelPortrait="104"
+            launcher:allAppsCellWidth="65"
+            launcher:allAppsCellWidthTwoPanelLandscape="70"
+            launcher:allAppsCellWidthTwoPanelPortrait="58"
+            launcher:allAppsIconSize="57"
+            launcher:allAppsIconSizeTwoPanelLandscape="48"
+            launcher:allAppsIconSizeTwoPanelPortrait="52"
+            launcher:allAppsIconTextSize="14"
+            launcher:allAppsIconTextSizeTwoPanelLandscape="12"
+            launcher:allAppsIconTextSizeTwoPanelPortrait="12"
+            launcher:borderSpaceHorizontal="16"
+            launcher:borderSpaceTwoPanelLandscapeHorizontal="16"
+            launcher:borderSpaceTwoPanelLandscapeVertical="16"
+            launcher:borderSpaceTwoPanelPortraitHorizontal="16"
+            launcher:borderSpaceTwoPanelPortraitVertical="16"
+            launcher:borderSpaceVertical="16"
+            launcher:canBeDefault="true"
+            launcher:horizontalMargin="22"
+            launcher:horizontalMarginTwoPanelLandscape="25"
+            launcher:horizontalMarginTwoPanelPortrait="13"
+            launcher:hotseatBarBottomSpaceTwoPanelLandscape="36"
+            launcher:hotseatBarBottomSpaceTwoPanelPortrait="38"
+            launcher:hotseatQsbSpace="24"
+            launcher:hotseatQsbSpaceTwoPanelLandscape="24"
+            launcher:hotseatQsbSpaceTwoPanelPortrait="34"
+            launcher:iconImageSize="57"
+            launcher:iconSizeLandscape="52"
+            launcher:iconSizeTwoPanelLandscape="48"
+            launcher:iconSizeTwoPanelPortrait="52"
+            launcher:iconTextSize="14"
+            launcher:iconTextSizeTwoPanelLandscape="12"
+            launcher:iconTextSizeTwoPanelPortrait="12"
+            launcher:minCellHeight="73"
+            launcher:minCellHeightTwoPanelLandscape="65"
+            launcher:minCellHeightTwoPanelPortrait="83"
+            launcher:minCellWidth="65"
+            launcher:minCellWidthTwoPanelLandscape="70"
+            launcher:minCellWidthTwoPanelPortrait="58"
+            launcher:minHeightDps="790.97"
+            launcher:minWidthDps="366.76"
+            launcher:name="Pixel (Split Display 2024)"
+            launcher:startAlignTaskbar="true"
+            launcher:startAlignTaskbarLandscape="true"
+            launcher:transientTaskbarIconSize="52.8"/>
+        <display-option
+            launcher:allAppsBorderSpace="16"
+            launcher:allAppsBorderSpaceTwoPanelLandscapeHorizontal="24"
+            launcher:allAppsBorderSpaceTwoPanelLandscapeVertical="20"
+            launcher:allAppsBorderSpaceTwoPanelPortraitHorizontal="16"
+            launcher:allAppsBorderSpaceTwoPanelPortraitVertical="20"
+            launcher:allAppsCellHeight="112"
+            launcher:allAppsCellHeightTwoPanelLandscape="104"
+            launcher:allAppsCellHeightTwoPanelPortrait="104"
+            launcher:allAppsCellWidth="90"
+            launcher:allAppsCellWidthTwoPanelLandscape="101"
+            launcher:allAppsCellWidthTwoPanelPortrait="80"
+            launcher:allAppsIconSize="66"
+            launcher:allAppsIconSizeTwoPanelLandscape="57"
+            launcher:allAppsIconSizeTwoPanelPortrait="57"
+            launcher:allAppsIconTextSize="14"
+            launcher:allAppsIconTextSizeTwoPanelLandscape="12"
+            launcher:allAppsIconTextSizeTwoPanelPortrait="12"
+            launcher:borderSpace="16"
+            launcher:borderSpaceTwoPanelLandscapeHorizontal="16"
+            launcher:borderSpaceTwoPanelLandscapeVertical="20"
+            launcher:borderSpaceTwoPanelPortraitHorizontal="16"
+            launcher:borderSpaceTwoPanelPortraitVertical="20.75"
+            launcher:horizontalMargin="38"
+            launcher:horizontalMarginTwoPanelLandscape="34"
+            launcher:horizontalMarginTwoPanelPortrait="37.5"
+            launcher:hotseatBarBottomSpaceTwoPanelLandscape="24"
+            launcher:hotseatBarBottomSpaceTwoPanelPortrait="36"
+            launcher:hotseatQsbSpace="24"
+            launcher:hotseatQsbSpaceTwoPanelLandscape="24"
+            launcher:hotseatQsbSpaceTwoPanelPortrait="36"
+            launcher:iconImageSize="66"
+            launcher:iconSizeLandscape="57"
+            launcher:iconSizeTwoPanelLandscape="57"
+            launcher:iconSizeTwoPanelPortrait="57"
+            launcher:iconTextSize="14"
+            launcher:iconTextSizeTwoPanelLandscape="12"
+            launcher:iconTextSizeTwoPanelPortrait="12"
+            launcher:minCellHeight="112"
+            launcher:minCellHeightTwoPanelLandscape="79"
+            launcher:minCellHeightTwoPanelPortrait="109"
+            launcher:minCellWidth="90"
+            launcher:minCellWidthTwoPanelLandscape="101"
+            launcher:minCellWidthTwoPanelPortrait="80"
+            launcher:minHeightDps="777.52"
+            launcher:minWidthDps="413.48"
+            launcher:name="Pixel (Split Display) small"
+            launcher:startAlignTaskbar="true"
+            launcher:startAlignTaskbarLandscape="true"
+            launcher:transientTaskbarIconSize="52.8"/>
+        <display-option
+            launcher:allAppsBorderSpaceHorizontal="16"
+            launcher:allAppsBorderSpaceTwoPanelLandscapeHorizontal="16"
+            launcher:allAppsBorderSpaceTwoPanelLandscapeVertical="8"
+            launcher:allAppsBorderSpaceTwoPanelPortraitHorizontal="16"
+            launcher:allAppsBorderSpaceTwoPanelPortraitVertical="8"
+            launcher:allAppsBorderSpaceVertical="12"
+            launcher:allAppsCellHeight="73"
+            launcher:allAppsCellHeightTwoPanelLandscape="104"
+            launcher:allAppsCellHeightTwoPanelPortrait="104"
+            launcher:allAppsCellWidth="65"
+            launcher:allAppsCellWidthTwoPanelLandscape="70"
+            launcher:allAppsCellWidthTwoPanelPortrait="58"
+            launcher:allAppsIconSize="57"
+            launcher:allAppsIconSizeTwoPanelLandscape="48"
+            launcher:allAppsIconSizeTwoPanelPortrait="52"
+            launcher:allAppsIconTextSize="14"
+            launcher:allAppsIconTextSizeTwoPanelLandscape="12"
+            launcher:allAppsIconTextSizeTwoPanelPortrait="12"
+            launcher:borderSpaceHorizontal="16"
+            launcher:borderSpaceTwoPanelLandscapeHorizontal="16"
+            launcher:borderSpaceTwoPanelLandscapeVertical="16"
+            launcher:borderSpaceTwoPanelPortraitHorizontal="16"
+            launcher:borderSpaceTwoPanelPortraitVertical="16"
+            launcher:borderSpaceVertical="16"
+            launcher:horizontalMargin="22"
+            launcher:horizontalMarginTwoPanelLandscape="25"
+            launcher:horizontalMarginTwoPanelPortrait="13"
+            launcher:hotseatBarBottomSpaceTwoPanelLandscape="36"
+            launcher:hotseatBarBottomSpaceTwoPanelPortrait="38"
+            launcher:hotseatQsbSpace="24"
+            launcher:hotseatQsbSpaceTwoPanelLandscape="24"
+            launcher:hotseatQsbSpaceTwoPanelPortrait="34"
+            launcher:iconImageSize="57"
+            launcher:iconSizeLandscape="52"
+            launcher:iconSizeTwoPanelLandscape="48"
+            launcher:iconSizeTwoPanelPortrait="52"
+            launcher:iconTextSize="14"
+            launcher:iconTextSizeTwoPanelLandscape="12"
+            launcher:iconTextSizeTwoPanelPortrait="12"
+            launcher:minCellHeight="73"
+            launcher:minCellHeightTwoPanelLandscape="65"
+            launcher:minCellHeightTwoPanelPortrait="83"
+            launcher:minCellWidth="65"
+            launcher:minCellWidthTwoPanelLandscape="70"
+            launcher:minCellWidthTwoPanelPortrait="58"
+            launcher:minHeightDps="564.89"
+            launcher:minWidthDps="300.4"
+            launcher:name="Pixel (Split Display) large"
+            launcher:startAlignTaskbar="true"
+            launcher:startAlignTaskbarLandscape="true"
+            launcher:transientTaskbarIconSize="52.8"/>
+    </grid-option>
+
 </profiles>
\ No newline at end of file
diff --git a/lawnchair/res/xml/paddings_split_4x5.xml b/lawnchair/res/xml/paddings_split_4x5.xml
new file mode 100644
index 00000000000..aaf00e7d3d6
--- /dev/null
+++ b/lawnchair/res/xml/paddings_split_4x5.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <device-padding launcher:maxEmptySpace="24dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="0"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="44dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="8dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="8dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="96dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="3dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="3dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="0"/>
+    </device-padding>
+    <device-padding launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.4"
+            launcher:c="36dp"/>
+        <workspaceBottomPadding
+            launcher:a="0.6"
+            launcher:c="36dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="36dp"/>
+    </device-padding>
+</device-paddings>
\ No newline at end of file
diff --git a/lawnchair/res/xml/spec_all_apps_cell_match_workspace.xml b/lawnchair/res/xml/spec_all_apps_cell_match_workspace.xml
new file mode 100644
index 00000000000..65ec082deb1
--- /dev/null
+++ b/lawnchair/res/xml/spec_all_apps_cell_match_workspace.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cellSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_landscape">
+        <cellSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <iconDrawablePadding launcher:matchWorkspace="true"/>
+            <iconSize launcher:matchWorkspace="true"/>
+            <iconTextSize launcher:matchWorkspace="true"/>
+        </cellSpec>
+    </specs>
+</cellSpecs>
\ No newline at end of file
diff --git a/lawnchair/res/xml/spec_foldable_all_apps_4x5_unfolded.xml b/lawnchair/res/xml/spec_foldable_all_apps_4x5_unfolded.xml
new file mode 100644
index 00000000000..8fe5be8eb0f
--- /dev/null
+++ b/lawnchair/res/xml/spec_foldable_all_apps_4x5_unfolded.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<allAppsSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_portrait_and_square">
+        <allAppsSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="0dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:matchWorkspace="true"/>
+        </allAppsSpec>
+        <allAppsSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="32dp"/>
+            <endPadding launcher:fixedSize="32dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:matchWorkspace="true"/>
+        </allAppsSpec>
+    </specs>
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_landscape">
+        <allAppsSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="0dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:matchWorkspace="true"/>
+        </allAppsSpec>
+        <allAppsSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="32dp"/>
+            <endPadding launcher:fixedSize="32dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:matchWorkspace="true"/>
+        </allAppsSpec>
+    </specs>
+</allAppsSpecs>
\ No newline at end of file
diff --git a/lawnchair/res/xml/spec_foldable_folder_4x5_unfolded.xml b/lawnchair/res/xml/spec_foldable_folder_4x5_unfolded.xml
new file mode 100644
index 00000000000..f3387566e97
--- /dev/null
+++ b/lawnchair/res/xml/spec_foldable_folder_4x5_unfolded.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<folderSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_portrait_and_square">
+        <folderSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="16dp"/>
+            <endPadding launcher:fixedSize="16dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize
+                launcher:matchWorkspace="true"
+                launcher:maxSize="68dp"/>
+        </folderSpec>
+        <folderSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="24dp"/>
+            <endPadding launcher:fixedSize="56dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize
+                launcher:matchWorkspace="true"
+                launcher:maxSize="89dp"/>
+        </folderSpec>
+    </specs>
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_landscape">
+        <folderSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="16dp"/>
+            <endPadding launcher:fixedSize="16dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize
+                launcher:matchWorkspace="true"
+                launcher:maxSize="84dp"/>
+        </folderSpec>
+        <folderSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="459dp">
+            <startPadding launcher:fixedSize="24dp"/>
+            <endPadding launcher:fixedSize="56dp"/>
+            <gutter launcher:matchWorkspace="true"/>
+            <cellSize
+                launcher:matchWorkspace="true"
+                launcher:maxSize="79dp"/>
+        </folderSpec>
+        <folderSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="24dp"/>
+            <endPadding launcher:fixedSize="56dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize
+                launcher:matchWorkspace="true"
+                launcher:maxSize="79dp"/>
+        </folderSpec>
+    </specs>
+</folderSpecs>
\ No newline at end of file
diff --git a/lawnchair/res/xml/spec_foldable_hotseat_4x5_unfolded.xml b/lawnchair/res/xml/spec_foldable_hotseat_4x5_unfolded.xml
new file mode 100644
index 00000000000..8a6cc2ccf2a
--- /dev/null
+++ b/lawnchair/res/xml/spec_foldable_hotseat_4x5_unfolded.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<hotseatSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_portrait_and_square">
+        <hotseatSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="840dp">
+            <hotseatQsbSpace launcher:fixedSize="24dp"/>
+            <edgePadding launcher:fixedSize="31dp"/>
+        </hotseatSpec>
+        <hotseatSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <hotseatQsbSpace launcher:fixedSize="36dp"/>
+            <edgePadding launcher:fixedSize="31dp"/>
+        </hotseatSpec>
+    </specs>
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_landscape">
+        <hotseatSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <hotseatQsbSpace launcher:fixedSize="24dp"/>
+            <edgePadding launcher:fixedSize="19dp"/>
+        </hotseatSpec>
+    </specs>
+</hotseatSpecs>
\ No newline at end of file
diff --git a/lawnchair/res/xml/spec_foldable_workspace_4x5_unfolded.xml b/lawnchair/res/xml/spec_foldable_workspace_4x5_unfolded.xml
new file mode 100644
index 00000000000..e240ac6952d
--- /dev/null
+++ b/lawnchair/res/xml/spec_foldable_workspace_4x5_unfolded.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<workspaceSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_portrait_and_square">
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="495dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="24dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="591dp">
+            <startPadding launcher:ofRemainderSpace="0.2"/>
+            <endPadding launcher:ofRemainderSpace="0.8"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:fixedSize="88dp"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:ofAvailableSpace="0.0956"/>
+            <endPadding launcher:ofAvailableSpace="0.0925"/>
+            <gutter launcher:ofAvailableSpace="0.0255"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:ofRemainderSpace="0.5"/>
+            <endPadding launcher:ofRemainderSpace="0.5"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:ofAvailableSpace="0.097"/>
+        </workspaceSpec>
+    </specs>
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_landscape">
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="459dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="16dp"/>
+            <gutter launcher:fixedSize="9dp"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="506dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="32dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="16dp"/>
+            <endPadding launcher:ofRemainderSpace="1"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:ofAvailableSpace="0.156"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:ofAvailableSpace="0.0345"/>
+            <endPadding launcher:ofAvailableSpace="0.0345"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+    </specs>
+</workspaceSpecs>
\ No newline at end of file
diff --git a/lawnchair/res/xml/spec_foldable_workspace_cell_4x5_unfolded.xml b/lawnchair/res/xml/spec_foldable_workspace_cell_4x5_unfolded.xml
new file mode 100644
index 00000000000..d26c4479ad9
--- /dev/null
+++ b/lawnchair/res/xml/spec_foldable_workspace_cell_4x5_unfolded.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cellSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_portrait_and_square">
+        <cellSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <iconDrawablePadding launcher:fixedSize="12dp"/>
+            <iconSize launcher:fixedSize="@dimen/iconSize52dp"/>
+            <iconTextSize launcher:fixedSize="12sp"/>
+        </cellSpec>
+    </specs>
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_landscape">
+        <cellSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="645dp">
+            <iconDrawablePadding launcher:fixedSize="4dp"/>
+            <iconSize launcher:fixedSize="@dimen/iconSize48dp"/>
+            <iconTextSize launcher:fixedSize="12sp"/>
+        </cellSpec>
+        <cellSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="700dp">
+            <iconDrawablePadding launcher:fixedSize="8dp"/>
+            <iconSize launcher:fixedSize="@dimen/iconSize48dp"/>
+            <iconTextSize launcher:fixedSize="12sp"/>
+        </cellSpec>
+        <cellSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <iconDrawablePadding launcher:fixedSize="4dp"/>
+            <iconSize launcher:fixedSize="@dimen/iconSize52dp"/>
+            <iconTextSize launcher:fixedSize="12sp"/>
+        </cellSpec>
+    </specs>
+</cellSpecs>
\ No newline at end of file
diff --git a/lawnchair/res/xml/spec_handheld_all_apps.xml b/lawnchair/res/xml/spec_handheld_all_apps.xml
new file mode 100644
index 00000000000..ce700eb5cd2
--- /dev/null
+++ b/lawnchair/res/xml/spec_handheld_all_apps.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<allAppsSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_portrait">
+        <allAppsSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="0dp"/>
+            <gutter launcher:matchWorkspace="true"/>
+            <cellSize launcher:matchWorkspace="true"/>
+        </allAppsSpec>
+        <allAppsSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:matchWorkspace="true"/>
+            <endPadding launcher:matchWorkspace="true"/>
+            <gutter launcher:matchWorkspace="true"/>
+            <cellSize launcher:matchWorkspace="true"/>
+        </allAppsSpec>
+    </specs>
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_landscape">
+        <allAppsSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="0dp"/>
+            <gutter launcher:matchWorkspace="true"/>
+            <cellSize launcher:matchWorkspace="true"/>
+        </allAppsSpec>
+        <allAppsSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:ofRemainderSpace="0.5"/>
+            <endPadding launcher:ofRemainderSpace="0.5"/>
+            <gutter launcher:matchWorkspace="true"/>
+            <cellSize launcher:matchWorkspace="true"/>
+        </allAppsSpec>
+    </specs>
+</allAppsSpecs>
\ No newline at end of file
diff --git a/lawnchair/res/xml/spec_handheld_folder_4x5.xml b/lawnchair/res/xml/spec_handheld_folder_4x5.xml
new file mode 100644
index 00000000000..52c1b2ecb9c
--- /dev/null
+++ b/lawnchair/res/xml/spec_handheld_folder_4x5.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<folderSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_portrait">
+        <folderSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="16dp"/>
+            <endPadding launcher:fixedSize="16dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize
+                launcher:matchWorkspace="true"
+                launcher:maxSize="80dp"/>
+        </folderSpec>
+        <folderSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="24dp"/>
+            <endPadding launcher:fixedSize="56dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize
+                launcher:matchWorkspace="true"
+                launcher:maxSize="94dp"/>
+        </folderSpec>
+    </specs>
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_landscape">
+        <folderSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="16dp"/>
+            <endPadding launcher:fixedSize="16dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:fixedSize="66dp"/>
+        </folderSpec>
+        <folderSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="318dp">
+            <startPadding launcher:fixedSize="16dp"/>
+            <endPadding launcher:fixedSize="32dp"/>
+            <gutter launcher:fixedSize="0dp"/>
+            <cellSize launcher:fixedSize="72dp"/>
+        </folderSpec>
+        <folderSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="16dp"/>
+            <endPadding launcher:fixedSize="48dp"/>
+            <gutter launcher:fixedSize="0dp"/>
+            <cellSize launcher:fixedSize="80dp"/>
+        </folderSpec>
+    </specs>
+</folderSpecs>
\ No newline at end of file
diff --git a/lawnchair/res/xml/spec_handheld_hotseat_4x5.xml b/lawnchair/res/xml/spec_handheld_hotseat_4x5.xml
new file mode 100644
index 00000000000..f9c55a6cc5c
--- /dev/null
+++ b/lawnchair/res/xml/spec_handheld_hotseat_4x5.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<hotseatSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_portrait">
+        <hotseatSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="847dp">
+            <hotseatQsbSpace launcher:fixedSize="24dp"/>
+            <edgePadding launcher:fixedSize="48dp"/>
+        </hotseatSpec>
+        <hotseatSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <hotseatQsbSpace launcher:fixedSize="36dp"/>
+            <edgePadding launcher:fixedSize="48dp"/>
+        </hotseatSpec>
+    </specs>
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_landscape">
+        <hotseatSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="743dp">
+            <hotseatQsbSpace launcher:fixedSize="0dp"/>
+            <edgePadding launcher:fixedSize="48dp"/>
+        </hotseatSpec>
+        <hotseatSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <hotseatQsbSpace launcher:fixedSize="0dp"/>
+            <edgePadding launcher:fixedSize="64dp"/>
+        </hotseatSpec>
+    </specs>
+</hotseatSpecs>
\ No newline at end of file
diff --git a/lawnchair/res/xml/spec_handheld_workspace_4x5.xml b/lawnchair/res/xml/spec_handheld_workspace_4x5.xml
new file mode 100644
index 00000000000..74b33499146
--- /dev/null
+++ b/lawnchair/res/xml/spec_handheld_workspace_4x5.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<workspaceSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_portrait">
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="556dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="32dp"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="612dp">
+            <startPadding launcher:ofRemainderSpace="0.1481"/>
+            <endPadding launcher:ofRemainderSpace="0.8519"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:ofAvailableSpace="0.158"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="637dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:ofRemainderSpace="1"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:fixedSize="104dp"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="639dp">
+            <startPadding launcher:fixedSize="8dp"/>
+            <endPadding launcher:ofRemainderSpace="1"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:fixedSize="104dp"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="659dp">
+            <startPadding launcher:fixedSize="16dp"/>
+            <endPadding launcher:ofRemainderSpace="1"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:fixedSize="104dp"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="679dp">
+            <startPadding launcher:fixedSize="36dp"/>
+            <endPadding launcher:ofRemainderSpace="1"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:fixedSize="104dp"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:ofRemainderSpace="0.1481"/>
+            <endPadding launcher:ofRemainderSpace="0.8519"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:ofAvailableSpace="0.158"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="412dp">
+            <startPadding launcher:ofRemainderSpace="0.5"/>
+            <endPadding launcher:ofRemainderSpace="0.5"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:ofAvailableSpace="0.1898"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:ofRemainderSpace="0.5"/>
+            <endPadding launcher:ofRemainderSpace="0.5"/>
+            <gutter launcher:fixedSize="16dp"/>
+            <cellSize launcher:ofAvailableSpace="0.1941"/>
+        </workspaceSpec>
+    </specs>
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_landscape">
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="300dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="24dp"/>
+            <gutter launcher:fixedSize="6dp"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="371dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="24dp"/>
+            <gutter launcher:fixedSize="10dp"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="29dp"/>
+            <gutter launcher:fixedSize="10dp"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="602dp">
+            <startPadding launcher:fixedSize="0dp"/>
+            <endPadding launcher:fixedSize="36dp"/>
+            <gutter launcher:fixedSize="12dp"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="716dp">
+            <startPadding launcher:fixedSize="16dp"/>
+            <endPadding launcher:fixedSize="64dp"/>
+            <gutter launcher:fixedSize="12dp"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+        <workspaceSpec
+            launcher:dimensionType="width"
+            launcher:maxAvailableSize="9999dp">
+            <startPadding launcher:fixedSize="36dp"/>
+            <endPadding launcher:fixedSize="80dp"/>
+            <gutter launcher:fixedSize="12dp"/>
+            <cellSize launcher:ofRemainderSpace="1"/>
+        </workspaceSpec>
+    </specs>
+</workspaceSpecs>
\ No newline at end of file
diff --git a/lawnchair/res/xml/spec_handheld_workspace_cell_4x5.xml b/lawnchair/res/xml/spec_handheld_workspace_cell_4x5.xml
new file mode 100644
index 00000000000..3dc494318a5
--- /dev/null
+++ b/lawnchair/res/xml/spec_handheld_workspace_cell_4x5.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cellSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_portrait">
+        <cellSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <iconDrawablePadding launcher:fixedSize="8dp"/>
+            <iconSize launcher:fixedSize="@dimen/iconSize60dp"/>
+            <iconTextSize launcher:fixedSize="14sp"/>
+        </cellSpec>
+    </specs>
+    <specs launcher:maxAspectRatio="@dimen/aspect_ratio_landscape">
+        <cellSpec
+            launcher:dimensionType="height"
+            launcher:maxAvailableSize="9999dp">
+            <iconDrawablePadding launcher:fixedSize="4dp"/>
+            <iconSize launcher:fixedSize="@dimen/iconSize52dp"/>
+            <iconTextSize launcher:fixedSize="12sp"/>
+        </cellSpec>
+    </specs>
+</cellSpecs>
\ No newline at end of file
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 03da5361672..51a91fd740c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -166,6 +166,7 @@
 import androidx.annotation.UiThread;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.os.BuildCompat;
+import androidx.window.embedding.RuleController;
 
 import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
@@ -605,11 +606,11 @@ protected void onCreate(Bundle savedInstanceState) {
         setTitle(R.string.home_screen);
         mStartupLatencyLogger.logEnd(LAUNCHER_LATENCY_STARTUP_ACTIVITY_ON_CREATE);
 
-//        if (BuildCompat.isAtLeastV()
-//                && com.android.launcher3.Flags.enableTwoPaneLauncherSettings()) {
-//            RuleController.getInstance(this).setRules(
-//                    RuleController.parseRules(this, R.xml.split_configuration));
-//        }
+        if (BuildCompat.isAtLeastV()
+                && com.android.launcher3.Flags.enableTwoPaneLauncherSettings()) {
+            RuleController.getInstance(this).setRules(
+                    RuleController.parseRules(this, R.xml.split_configuration));
+        }
     }
 
     protected ModelCallbacks createModelCallbacks() {

From f92bb5e5aee52e5eaa5e8cde01496fd13f89539a Mon Sep 17 00:00:00 2001
From: MrSluffy <werdna.jac@gmail.com>
Date: Sat, 1 Feb 2025 13:35:48 +0800
Subject: [PATCH 2/2] enh : update private space lock icon

---
 lawnchair/res/drawable/ic_pr_lock.xml | 24 ++++++++++++++++++++++++
 res/layout/private_space_header.xml   |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 lawnchair/res/drawable/ic_pr_lock.xml

diff --git a/lawnchair/res/drawable/ic_pr_lock.xml b/lawnchair/res/drawable/ic_pr_lock.xml
new file mode 100644
index 00000000000..055e6b43f0b
--- /dev/null
+++ b/lawnchair/res/drawable/ic_pr_lock.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2024 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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="?attr/materialColorOnPrimaryFixed"
+        android:pathData="M263.72,864Q234,864 213,842.85Q192,821.7 192,792L192,408Q192,378.3 213.15,357.15Q234.3,336 264,336L288,336L288,240Q288,160.32 344.23,104.16Q400.45,48 480.23,48Q560,48 616,104.16Q672,160.32 672,240L672,336L696,336Q725.7,336 746.85,357.15Q768,378.3 768,408L768,792Q768,821.7 746.84,842.85Q725.68,864 695.96,864L263.72,864ZM264,792L696,792Q696,792 696,792Q696,792 696,792L696,408Q696,408 696,408Q696,408 696,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792ZM480.21,672Q510,672 531,650.79Q552,629.58 552,599.79Q552,570 530.79,549Q509.58,528 479.79,528Q450,528 429,549.21Q408,570.42 408,600.21Q408,630 429.21,651Q450.42,672 480.21,672ZM360,336L600,336L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,336ZM264,792Q264,792 264,792Q264,792 264,792L264,408Q264,408 264,408Q264,408 264,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792L264,792Z"/>
+</vector>
diff --git a/res/layout/private_space_header.xml b/res/layout/private_space_header.xml
index 9c0f129b12c..128d87e7d7f 100644
--- a/res/layout/private_space_header.xml
+++ b/res/layout/private_space_header.xml
@@ -59,7 +59,7 @@
                 android:layout_marginTop="@dimen/ps_lock_icon_margin_top"
                 android:layout_marginBottom="@dimen/ps_lock_icon_margin_bottom"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_lock"
+                android:src="@drawable/ic_pr_lock"
                 app:tint="@color/material_color_primary_fixed_dim"
                 android:scaleType="center"/>
             <TextView