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/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/config.xml')
| -rw-r--r-- | res/values/config.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 45ab54472..31ef18a13 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -1,6 +1,7 @@ <resources> <bool name="config_hardwareAccelerated">true</bool> <bool name="config_largeHeap">false</bool> + <bool name="is_large_screen">false</bool> <!-- AllApps/Customize/AppsCustomize --> <!-- The alpha of the AppsCustomize bg in spring loaded mode --> @@ -69,4 +70,9 @@ <integer name="folder_max_count_x">4</integer> <integer name="folder_max_count_y">4</integer> <integer name="folder_max_num_items">16</integer> + + <integer name="cell_count_x">4</integer> + <integer name="cell_count_y">4</integer> + <integer name="hotseat_cell_count">5</integer> + <integer name="hotseat_all_apps_index">2</integer> </resources> |