diff options
author | Adam Cohen <adamcohen@google.com> | 2013-10-31 21:35:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-31 21:35:51 +0000 |
commit | fc6175df7d2f82e13a27bb78170aec480a72d355 (patch) | |
tree | 18b10d03d18157b6ef643c4d1a5ec9e2896daa01 /res | |
parent | 49ac59cbb3ca0d2d948992c90c19be7cd7f096f7 (diff) | |
parent | 3b185e2513bcc3318753c21d3909d8dab2291e31 (diff) | |
download | android_packages_apps_Trebuchet-fc6175df7d2f82e13a27bb78170aec480a72d355.tar.gz android_packages_apps_Trebuchet-fc6175df7d2f82e13a27bb78170aec480a72d355.tar.bz2 android_packages_apps_Trebuchet-fc6175df7d2f82e13a27bb78170aec480a72d355.zip |
Merge "Fixing up PagedView to work in landscape mode" into jb-ub-now-jetsonic
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 1 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 1 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 1 | ||||
-rw-r--r-- | res/values-land/dimens.xml | 5 | ||||
-rw-r--r-- | res/values-port/dimens.xml | 3 | ||||
-rw-r--r-- | res/values-sw720dp-land/dimens.xml | 3 | ||||
-rw-r--r-- | res/values-sw720dp-port/dimens.xml | 1 | ||||
-rw-r--r-- | res/values/attrs.xml | 3 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 |
9 files changed, 2 insertions, 18 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 77ea2e9aa..5874c8081 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -37,7 +37,6 @@ android:layout_height="match_parent" android:layout_gravity="center" launcher:defaultScreen="@integer/config_workspaceDefaultScreen" - launcher:pageSpacing="@dimen/workspace_page_spacing" launcher:pageIndicator="@id/page_indicator" /> <include layout="@layout/hotseat" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 6fbf7c717..49e6b6a71 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -35,7 +35,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" launcher:defaultScreen="@integer/config_workspaceDefaultScreen" - launcher:pageSpacing="@dimen/workspace_page_spacing" launcher:pageIndicator="@id/page_indicator"> </com.android.launcher3.Workspace> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 951e63a39..7dac2718c 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -36,7 +36,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" launcher:defaultScreen="@integer/config_workspaceDefaultScreen" - launcher:pageSpacing="@dimen/workspace_page_spacing" launcher:pageIndicator="@id/page_indicator"> </com.android.launcher3.Workspace> diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 5961b1936..07d92798d 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -19,11 +19,6 @@ <dimen name="toolbar_button_vertical_padding">8dip</dimen> <dimen name="toolbar_button_horizontal_padding">0dip</dimen> -<!-- Workspace --> - <!-- We really want the page spacing to be the max of either the button bar - height or the qsb bar height --> - <dimen name="workspace_page_spacing">-1dp</dimen> - <!-- AppsCustomize --> <dimen name="apps_customize_tab_bar_height">42dp</dimen> <integer name="apps_customize_widget_cell_count_x">3</integer> diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml index 7194a2a77..7753ab318 100644 --- a/res/values-port/dimens.xml +++ b/res/values-port/dimens.xml @@ -15,9 +15,6 @@ --> <resources> -<!-- Workspace --> - <dimen name="workspace_page_spacing">-1dp</dimen> - <!-- AppsCustomize --> <integer name="apps_customize_cling_focused_x">1</integer> <integer name="apps_customize_cling_focused_y">1</integer> diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml index eb8f83c43..433a5d40d 100644 --- a/res/values-sw720dp-land/dimens.xml +++ b/res/values-sw720dp-land/dimens.xml @@ -21,9 +21,6 @@ <integer name="apps_customize_cling_focused_x">4</integer> <integer name="apps_customize_cling_focused_y">2</integer> -<!-- Workspace --> - <dimen name="workspace_page_spacing">50dp</dimen> - <!-- the area at the edge of the screen that makes the workspace go left or right while you're dragging. --> <dimen name="scroll_zone">100dip</dimen> diff --git a/res/values-sw720dp-port/dimens.xml b/res/values-sw720dp-port/dimens.xml index 62bdaaa97..9fe312bfe 100644 --- a/res/values-sw720dp-port/dimens.xml +++ b/res/values-sw720dp-port/dimens.xml @@ -19,7 +19,6 @@ <!-- the area at the edge of the screen that makes the workspace go left or right while you're dragging. --> <dimen name="scroll_zone">40dp</dimen> - <dimen name="workspace_page_spacing">24dp</dimen> <integer name="apps_customize_cling_focused_x">2</integer> <integer name="apps_customize_cling_focused_y">2</integer> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index a2d3a83e0..0006a7455 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -103,8 +103,7 @@ <attr name="pageLayoutPaddingBottom" format="dimension" /> <attr name="pageLayoutPaddingLeft" format="dimension" /> <attr name="pageLayoutPaddingRight" format="dimension" /> - <!-- The space between adjacent pages of the PagedView. --> - <attr name="pageSpacing" format="dimension" /> + <!-- The page indicator for this workspace --> <attr name="pageIndicator" format="reference" /> </declare-styleable> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index dcddc09ad..d87fb1431 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_workspace_page_spacing">8dp</dimen> <!-- Wallpaper picker --> <dimen name="wallpaperThumbnailWidth">106.5dp</dimen> @@ -41,7 +42,6 @@ <!-- Workspace --> <dimen name="workspace_max_gap">16dp</dimen> <dimen name="workspace_overscroll_drawable_padding">0dp</dimen> - <dimen name="workspace_spring_loaded_page_spacing">15dp</dimen> <dimen name="overview_panel_bottom_padding">50dp</dimen> <dimen name="overview_panel_buttonSpacing">60dp</dimen> <dimen name="overview_mode_page_offset">130dp</dimen> |