Initial Changes for Dynamic Grid
Change-Id: I9e6f1e5167791cf8dc140778dfa447f86424e9bf
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 09b8804..bf4748c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -106,9 +106,6 @@
<attr name="pageSpacing" format="dimension" />
<!-- The page indicator for this workspace -->
<attr name="pageIndicator" format="reference" />
- <!-- The padding for the scroll indicator area -->
- <attr name="scrollIndicatorPaddingLeft" format="dimension" />
- <attr name="scrollIndicatorPaddingRight" format="dimension" />
</declare-styleable>
<!-- AppsCustomizePagedView specific attributes. These attributes are used to
diff --git a/res/values/config.xml b/res/values/config.xml
index 2fc3473..14e5a56 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,6 +1,7 @@
<resources>
<bool name="config_largeHeap">false</bool>
- <bool name="is_large_screen">false</bool>
+ <bool name="is_tablet">false</bool>
+ <bool name="is_large_tablet">false</bool>
<bool name="allow_rotation">false</bool>
<!-- Max number of page indicators to show -->
@@ -40,7 +41,7 @@
<!-- Workspace -->
<!-- Whether or not the drop targets drop down as opposed to fade in -->
- <bool name="config_useDropTargetDownTransition">true</bool>
+ <bool name="config_useDropTargetDownTransition">false</bool>
<!-- Whether or not to fade the side pages -->
<bool name="config_workspaceFadeAdjacentScreens">false</bool>
@@ -72,25 +73,11 @@
<!-- Camera distance for the overscroll effect -->
<integer name="config_cameraDistance">6500</integer>
- <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
- >= folder_max_num_items. If any values are set to 0, the values will be determined automatically.
- A value of -1 indicates unbounded -->
- <integer name="folder_max_count_x">4</integer>
- <integer name="folder_max_count_y">-1</integer>
- <integer name="folder_max_num_items">-1</integer>
-
- <integer name="cell_count_x">4</integer>
- <integer name="cell_count_y">4</integer>
-
<!-- Whether or not to use custom clings if a custom workspace layout is passed in -->
<bool name="config_useCustomClings">false</bool>
<!-- Hotseat -->
<bool name="hotseat_transpose_layout_with_orientation">true</bool>
- <integer name="hotseat_cell_count">5</integer>
- <integer name="hotseat_all_apps_index">2</integer>
- <!-- must be between 0 and 100 -->
- <integer name="hotseat_item_scale_percentage">100</integer>
<!-- Memory debugging, including a memory dump icon -->
<bool name="debug_memory_enabled">true</bool>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 13a15e3..6e24481 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -15,48 +15,30 @@
-->
<resources>
+<!-- Dynamic Grid -->
+ <dimen name="dynamic_grid_edge_margin">6dp</dimen>
+ <dimen name="dynamic_grid_search_bar_max_width">500dp</dimen>
+ <dimen name="dynamic_grid_search_bar_height">48dp</dimen>
+ <dimen name="dynamic_grid_page_indicator_height">24dp</dimen>
+
<!-- Cling -->
<dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
<dimen name="folderClingMarginTop">20dp</dimen>
<!-- The offset for the text in the cling -->
<dimen name="cling_text_block_offset_x">0dp</dimen>
<dimen name="cling_text_block_offset_y">0dp</dimen>
- <dimen name="reveal_radius">48dp</dimen>
<!-- entries for custom clings, will be set in overlays -->
<add-resource type="dimen" name="custom_cling_margin_top" />
<add-resource type="dimen" name="custom_cling_margin_right" />
<add-resource type="dimen" name="custom_cling_margin_left" />
<!-- Workspace -->
- <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding
- that we put on each page for allowing folders to draw out of bounds -->
- <dimen name="qsb_bar_height_inset">34dp</dimen>
- <dimen name="qsb_bar_height">40dp</dimen>
- <dimen name="qsb_padding_left">0dp</dimen>
- <dimen name="qsb_padding_right">0dp</dimen>
- <dimen name="search_bar_height">40dp</dimen>
<dimen name="workspace_max_gap">16dp</dimen>
- <dimen name="folder_cell_width">74dp</dimen>
- <dimen name="folder_cell_height">82dp</dimen>
- <dimen name="folder_icon_padding_top">2dp</dimen>
- <dimen name="workspace_divider_padding_left">3dp</dimen>
- <dimen name="workspace_divider_padding_right">3dp</dimen>
- <dimen name="workspace_divider_padding_top">0dp</dimen>
- <dimen name="workspace_divider_padding_bottom">0dp</dimen>
- <dimen name="hotseat_cell_width">64dp</dimen>
- <dimen name="hotseat_cell_height">64dp</dimen>
- <dimen name="hotseat_width_gap">-1dp</dimen>
- <dimen name="hotseat_height_gap">-1dp</dimen>
<dimen name="workspace_overscroll_drawable_padding">0dp</dimen>
- <dimen name="workspace_icon_text_size">12sp</dimen>
<dimen name="workspace_spring_loaded_page_spacing">15dp</dimen>
<dimen name="overview_panel_bottom_padding">50dp</dimen>
<dimen name="overview_panel_buttonSpacing">40dp</dimen>
- <dimen name="app_icon_drawable_padding">6dp</dimen>
- <dimen name="app_icon_drawable_padding_land">2dp</dimen>
- <dimen name="app_icon_padding_top">8dp</dimen>
-
<!-- QSB -->
<dimen name="toolbar_button_vertical_padding">4dip</dimen>
<dimen name="toolbar_button_horizontal_padding">12dip</dimen>
@@ -83,16 +65,6 @@
<dimen name="apps_customize_page_indicator_height">12dp</dimen>
<dimen name="apps_customize_page_indicator_margin">4dp</dimen>
- <!-- height of the bottom row of controls -->
- <dimen name="button_bar_height">62dip</dimen>
- <!-- Because portal animations go beyond the bounds of an icon, we need
- to make the dock layout slightly larger than the button_bar_height -->
- <dimen name="button_bar_height_top_padding">8dp</dimen>
- <dimen name="button_bar_height_bottom_padding">0dp</dimen>
- <dimen name="button_bar_width_left_padding">0dp</dimen>
- <dimen name="button_bar_width_right_padding">0dp</dimen>
- <dimen name="button_bar_height_plus_padding">70dp</dimen>
-
<!-- Drag padding to add to the bottom of drop targets -->
<dimen name="drop_target_drag_padding">14dp</dimen>
@@ -123,42 +95,7 @@
<dimen name="shortcut_preview_padding_top">0dp</dimen>
<!-- Folders -->
- <!-- The size of the image which sits behind the preview of the folder contents -->
- <dimen name="folder_preview_size">62dp</dimen>
<!-- The amount that the preview contents are inset from the preview background -->
<dimen name="folder_preview_padding">4dp</dimen>
<dimen name="folder_name_padding">10dp</dimen>
- <dimen name="folder_width_gap">0dp</dimen>
- <dimen name="folder_height_gap">0dp</dimen>
- <dimen name="folder_padding">0dp</dimen>
-
-<!-- CellLayout padding -->
- <dimen name="cell_layout_left_padding_port">0dp</dimen>
- <dimen name="cell_layout_left_padding_land">0dp</dimen>
- <dimen name="cell_layout_right_padding_port">0dp</dimen>
- <dimen name="cell_layout_right_padding_land">0dp</dimen>
- <dimen name="cell_layout_top_padding_port">6dp</dimen>
- <dimen name="cell_layout_top_padding_land">0dp</dimen>
- <dimen name="cell_layout_bottom_padding_port">0dp</dimen>
- <dimen name="cell_layout_bottom_padding_land">0dp</dimen>
-
-<!-- Workspace padding -->
- <dimen name="workspace_left_padding_port">0dp</dimen>
- <dimen name="workspace_left_padding_land">@dimen/qsb_bar_height</dimen>
- <dimen name="workspace_right_padding_port">0dp</dimen>
- <dimen name="workspace_right_padding_land">@dimen/button_bar_height</dimen>
- <dimen name="workspace_top_padding_port">@dimen/qsb_bar_height_inset</dimen>
- <dimen name="workspace_top_padding_land">0dp</dimen>
- <dimen name="workspace_bottom_padding_port">@dimen/button_bar_height</dimen>
- <dimen name="workspace_bottom_padding_land">0dp</dimen>
-
-<!-- Workspace cell size -->
- <dimen name="workspace_cell_width_land">106dp</dimen>
- <dimen name="workspace_cell_width_port">80dp</dimen>
- <dimen name="workspace_cell_height_land">74dp</dimen>
- <dimen name="workspace_cell_height_port">100dp</dimen>
- <dimen name="workspace_width_gap_land">0dp</dimen>
- <dimen name="workspace_width_gap_port">0dp</dimen>
- <dimen name="workspace_height_gap_land">0dp</dimen>
- <dimen name="workspace_height_gap_port">0dp</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 872244c..9f5ade4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -63,38 +63,14 @@
<item name="android:gravity">center_horizontal</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">marquee</item>
- <item name="android:textSize">@dimen/workspace_icon_text_size</item>
<item name="android:textColor">@color/workspace_icon_text_color</item>
<item name="android:shadowRadius">2.0</item>
<item name="android:shadowColor">#B0000000</item>
</style>
<style name="WorkspaceIcon.Portrait">
- <item name="android:drawablePadding">@dimen/app_icon_drawable_padding</item>
- <item name="android:paddingStart">4dp</item>
- <item name="android:paddingEnd">4dp</item>
- <item name="android:paddingTop">@dimen/app_icon_padding_top</item>
- <item name="android:paddingBottom">4dp</item>
</style>
-
<style name="WorkspaceIcon.Landscape">
- <item name="android:drawablePadding">@dimen/app_icon_drawable_padding_land</item>
- <item name="android:paddingStart">4dp</item>
- <item name="android:paddingEnd">4dp</item>
- <item name="android:paddingTop">@dimen/app_icon_padding_top</item>
- <item name="android:paddingBottom">4dp</item>
- </style>
-
- <style name="WorkspaceIcon.Portrait.Folder">
- <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow -->
- <item name="android:drawablePadding">0dp</item>
- <item name="android:paddingTop">@dimen/folder_icon_padding_top</item>
- </style>
- <style name="WorkspaceIcon.Landscape.Folder">
- <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow -->
- <item name="android:drawablePadding">0dp</item>
- <item name="android:paddingTop">0dp</item>
- <item name="android:layout_marginTop">-2dp</item>
</style>
<style name="WorkspaceIcon.Portrait.AppsCustomize">
@@ -118,22 +94,10 @@
<style name="QSBBar">
<item name="android:orientation">horizontal</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">@dimen/qsb_bar_height</item>
- <item name="android:layout_gravity">top|center_horizontal</item>
- <item name="android:paddingStart">@dimen/qsb_padding_left</item>
- <item name="android:paddingEnd">@dimen/qsb_padding_right</item>
</style>
<style name="SearchDropTargetBar">
- <item name="android:orientation">horizontal</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">match_parent</item>
- <item name="android:layout_gravity">bottom|center_horizontal</item>
</style>
<style name="SearchButton">
- <item name="android:layout_gravity">center_vertical</item>
- <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
- <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
</style>
<style name="DropTargetButtonContainer">
<item name="android:layout_width">0dp</item>