diff options
| author | Jim Miller <jaggies@google.com> | 2012-05-12 14:12:03 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-05-12 14:23:23 -0700 |
| commit | c6e523ea9bc15f18c9cbf04b05e8d2c90298453f (patch) | |
| tree | c4fdf60dcb485839bd40eb479fab52a7f99703d5 /packages | |
| parent | d83fdd03a1daaf577d80c8abda86c7c01bf6d3bb (diff) | |
| download | frameworks_base-c6e523ea9bc15f18c9cbf04b05e8d2c90298453f.zip frameworks_base-c6e523ea9bc15f18c9cbf04b05e8d2c90298453f.tar.gz frameworks_base-c6e523ea9bc15f18c9cbf04b05e8d2c90298453f.tar.bz2 | |
Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet
This fixes a problem where the bounds of the view weren't being
calculated properly when a separate outer radius was specified.
The code now takes the maximum of the ring drawable's width/height
and that specified in the resource files.
This gives it the best default look on all devices while still
allowing minor tweaks.
Change-Id: I5daa40ff4f14653c8cc89b39102816afb976e4f7
Diffstat (limited to 'packages')
6 files changed, 0 insertions, 10 deletions
diff --git a/packages/SystemUI/res/layout-land/status_bar_search_panel.xml b/packages/SystemUI/res/layout-land/status_bar_search_panel.xml index 5d4d989..392a8b5 100644 --- a/packages/SystemUI/res/layout-land/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-land/status_bar_search_panel.xml @@ -52,7 +52,6 @@ prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" prvandroid:handleDrawable="@drawable/navbar_search_handle" prvandroid:waveDrawable="@drawable/navbar_search_outerring" - prvandroid:outerRadius="@dimen/navbar_search_target_placement_radius" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:hitRadius="@dimen/navbar_search_hit_radius" prvandroid:feedbackCount="0" diff --git a/packages/SystemUI/res/layout-port/status_bar_search_panel.xml b/packages/SystemUI/res/layout-port/status_bar_search_panel.xml index 2486b75..371c575 100644 --- a/packages/SystemUI/res/layout-port/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-port/status_bar_search_panel.xml @@ -52,7 +52,6 @@ prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" prvandroid:handleDrawable="@drawable/navbar_search_handle" prvandroid:waveDrawable="@drawable/navbar_search_outerring" - prvandroid:outerRadius="@dimen/navbar_search_target_placement_radius" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:hitRadius="@dimen/navbar_search_hit_radius" prvandroid:feedbackCount="0" diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml b/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml index 4b2fbc7..0ccfe95 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml @@ -61,7 +61,6 @@ prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" prvandroid:handleDrawable="@drawable/navbar_search_handle" prvandroid:waveDrawable="@drawable/navbar_search_outerring" - prvandroid:outerRadius="@dimen/navbar_search_target_placement_radius" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:hitRadius="@dimen/navbar_search_hit_radius" prvandroid:feedbackCount="0" diff --git a/packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml b/packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml index ac2472c..0a5390a 100644 --- a/packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml @@ -61,7 +61,6 @@ prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" prvandroid:handleDrawable="@drawable/navbar_search_handle" prvandroid:waveDrawable="@drawable/navbar_search_outerring" - prvandroid:outerRadius="@dimen/navbar_search_target_placement_radius" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:hitRadius="@dimen/navbar_search_hit_radius" prvandroid:feedbackCount="0" diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index 2cb99ff..07d55f1 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -27,9 +27,6 @@ <!-- 0x33 = center_horizontal|top --> <integer name="notification_panel_layout_gravity">0x31</integer> - <!-- Default target placement radius for navigation bar search target --> - <dimen name="navbar_search_target_placement_radius">182dip</dimen> - <!-- Diameter of outer shape drawable shown in navbar search--> <dimen name="navbar_search_outerring_diameter">364dp</dimen> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 21e5fd7..f548166 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -105,9 +105,6 @@ <!-- The width of the view containing the menu status bar icon --> <dimen name="navigation_menu_key_width">40dip</dimen> - <!-- Default target placement radius for navigation bar search target --> - <dimen name="navbar_search_target_placement_radius">150dip</dimen> - <!-- Default distance beyond which snaps to the target radius --> <dimen name="navbar_search_snap_margin">20dip</dimen> |