diff options
| author | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
|---|---|---|
| committer | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
| commit | 826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec (patch) | |
| tree | 1ba6f2151cba45b5e7d07cd61a44f6b59a3f828f /res/values-sw600dp/config.xml | |
| parent | ca83eeb0919b690350d86a9562f58a5a56d196bf (diff) | |
| parent | a3e22d6a362260d5b81feefbc91e4757e3d58958 (diff) | |
| download | android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.gz android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.bz2 android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.zip | |
resolved conflicts for merge of a3e22d6a to master
Change-Id: I8770574acf86e280a9d15d4309686111260e09d9
Diffstat (limited to 'res/values-sw600dp/config.xml')
| -rw-r--r-- | res/values-sw600dp/config.xml | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml index d97e3c2d4..a701e69d1 100644 --- a/res/values-sw600dp/config.xml +++ b/res/values-sw600dp/config.xml @@ -1,21 +1,12 @@ <resources> - <bool name="config_largeHeap">true</bool> - -<!-- AllApps/Customize/AppsCustomize --> - <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. --> - <integer name="config_workspaceSpringLoadShrinkPercentage">90</integer> - -<!-- Workspace --> - <!-- Whether or not the drop targets drop down as opposed to fade in --> - <bool name="config_useDropTargetDownTransition">true</bool> - <!-- Whether or not to fade the side pages --> - <bool name="config_workspaceFadeAdjacentScreens">true</bool> - - <!-- When shrinking the workspace, this is the percentage of its original size. --> - <integer name="config_workspaceShrinkPercent">17</integer> + <integer name="cell_count_x">6</integer> + <integer name="cell_count_y">6</integer> + <integer name="hotseat_cell_count">7</integer> + <integer name="hotseat_all_apps_index">3</integer> +<!-- Folders --> <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y - >= folder_max_num_items. When these are set to -1, they are automatically determined. --> + >= folder_max_num_items. When these are set to -1, they are automatically determined. --> <integer name="folder_max_count_x">-1</integer> <integer name="folder_max_count_y">-1</integer> <integer name="folder_max_num_items">-1</integer> |