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/layout-port | |
| 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/layout-port')
| -rw-r--r-- | res/layout-port/hotseat.xml | 2 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml index 035d95884..b93704339 100644 --- a/res/layout-port/hotseat.xml +++ b/res/layout-port/hotseat.xml @@ -17,7 +17,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" android:background="@drawable/hotseat_bg_panel" - launcher:cellCountX="5" + launcher:cellCountX="@integer/hotseat_cell_count" launcher:cellCountY="1"> <com.android.launcher2.CellLayout android:id="@+id/layout" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index d7b3fee40..f6ff2e820 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -47,8 +47,8 @@ android:paddingTop="@dimen/qsb_bar_height_inset" android:paddingBottom="@dimen/button_bar_height" launcher:defaultScreen="2" - launcher:cellCountX="4" - launcher:cellCountY="4" + launcher:cellCountX="@integer/cell_count_x" + launcher:cellCountY="@integer/cell_count_y" launcher:pageSpacing="@dimen/workspace_page_spacing" launcher:scrollIndicatorPaddingLeft="@dimen/workspace_divider_padding_left" launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right"> |