diff options
author | Winson Chung <winsonc@google.com> | 2013-11-01 17:26:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 17:26:31 -0700 |
commit | 476883c54ed12a0b4130adcda73ca322f08f6238 (patch) | |
tree | 5ed448b3499fd637b5a3153e39188e356d996a80 /res | |
parent | 7e43e905ab4018389737b3d4f5479dd97b71d963 (diff) | |
parent | e494aaf70fbe95d0fb7e0b64736f28884b044713 (diff) | |
download | android_packages_apps_Trebuchet-476883c54ed12a0b4130adcda73ca322f08f6238.tar.gz android_packages_apps_Trebuchet-476883c54ed12a0b4130adcda73ca322f08f6238.tar.bz2 android_packages_apps_Trebuchet-476883c54ed12a0b4130adcda73ca322f08f6238.zip |
am e494aaf7: Merge "Initial changes to support AllApps on various form factors." into jb-ub-now-jetsonic
* commit 'e494aaf70fbe95d0fb7e0b64736f28884b044713':
Initial changes to support AllApps on various form factors.
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 3 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout/apps_customize_pane.xml | 8 | ||||
-rw-r--r-- | res/values-sw600dp-land/dimens.xml | 6 | ||||
-rw-r--r-- | res/values/config.xml | 6 | ||||
-rw-r--r-- | res/values/dimens.xml | 1 |
6 files changed, 12 insertions, 14 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 5874c8081..bf670d4a4 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -36,8 +36,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - launcher:defaultScreen="@integer/config_workspaceDefaultScreen" - launcher:pageIndicator="@id/page_indicator" /> + launcher:defaultScreen="@integer/config_workspaceDefaultScreen" /> <include layout="@layout/hotseat" android:id="@+id/hotseat" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 49e6b6a71..2b3cf81a4 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -35,7 +35,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" launcher:defaultScreen="@integer/config_workspaceDefaultScreen" - launcher:pageIndicator="@id/page_indicator"> + launcher:pageIndicator="@+id/page_indicator"> </com.android.launcher3.Workspace> <include layout="@layout/hotseat" diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index 11a938fbb..eae216e93 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -56,13 +56,12 @@ android:id="@+id/apps_customize_pane_content" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginBottom="@dimen/apps_customize_page_indicator_offset" launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" launcher:clingFocusedX="@integer/apps_customize_cling_focused_x" launcher:clingFocusedY="@integer/apps_customize_cling_focused_y" launcher:maxGap="@dimen/workspace_max_gap" - launcher:pageIndicator="@+id/page_indicator" /> + launcher:pageIndicator="@+id/apps_customize_page_indicator" /> <FrameLayout android:id="@+id/animation_buffer" android:layout_width="match_parent" @@ -70,12 +69,11 @@ android:background="#FF000000" android:visibility="gone" /> <include - android:id="@+id/page_indicator" + android:id="@+id/apps_customize_page_indicator" layout="@layout/page_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|center_horizontal" - android:layout_marginBottom="@dimen/apps_customize_page_indicator_margin" /> + android:layout_gravity="center_horizontal|bottom" /> </FrameLayout> </LinearLayout> </com.android.launcher3.AppsCustomizeTabHost> diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index 7f5594de3..f9ca01bee 100644 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -15,12 +15,6 @@ --> <resources> -<!-- AppsCustomize --> - <dimen name="apps_customize_pageLayoutWidthGap">36dp</dimen> - <dimen name="apps_customize_pageLayoutHeightGap">8dp</dimen> - <dimen name="apps_customize_pageLayoutPaddingTop">20dp</dimen> - <dimen name="apps_customize_pageLayoutPaddingBottom">14dp</dimen> - <!-- QSB --> <dimen name="toolbar_button_vertical_padding">12dip</dimen> <dimen name="toolbar_button_horizontal_padding">20dip</dimen> diff --git a/res/values/config.xml b/res/values/config.xml index 497828125..1a83556fb 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -1,4 +1,10 @@ <resources> +<!-- Dynamic Grid --> + <integer name="config_dynamic_grid_max_long_edge_cell_count">6</integer> + <integer name="config_dynamic_grid_max_short_edge_cell_count">5</integer> + <integer name="config_dynamic_grid_min_edge_cell_count">3</integer> + +<!-- Miscellaneous --> <bool name="config_largeHeap">false</bool> <bool name="is_tablet">false</bool> <bool name="is_large_tablet">false</bool> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 4242cc768..740393ea5 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -21,6 +21,7 @@ <dimen name="dynamic_grid_search_bar_height">48dp</dimen> <dimen name="dynamic_grid_page_indicator_height">24dp</dimen> <dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen> + <dimen name="dynamic_grid_all_apps_cell_padding">18dp</dimen> <dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen> <!-- Wallpaper picker --> |