diff options
| author | Jim Miller <jaggies@google.com> | 2012-06-19 16:17:19 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-06-19 16:17:19 -0700 |
| commit | a7da8afe6dc866786acab8b06524d0079caa3fd7 (patch) | |
| tree | ef654cee961b787113da00871bb52ea1be50ce6d /packages | |
| parent | c2585467107995f3130872eb7b721f3dbbcdf505 (diff) | |
| download | frameworks_base-a7da8afe6dc866786acab8b06524d0079caa3fd7.zip frameworks_base-a7da8afe6dc866786acab8b06524d0079caa3fd7.tar.gz frameworks_base-a7da8afe6dc866786acab8b06524d0079caa3fd7.tar.bz2 | |
Fix 6693743: update animation ring for keyguard and search panel
This is a partial revert of change Ibce96f45eb6a94582c694108b99e243fd57b1955.
This change:
- shows the expanding ring animation on keyguard and navbar search
- disables the first ping wave animation on both.
- restores the outer ring
Change-Id: I429d23a49ca2868dc00872b8b8fde000d6a53a6d
Diffstat (limited to 'packages')
5 files changed, 5 insertions, 5 deletions
diff --git a/packages/SystemUI/res/drawable/navbar_search_outerring.xml b/packages/SystemUI/res/drawable/navbar_search_outerring.xml index 8a8785f..689dbf0 100644 --- a/packages/SystemUI/res/drawable/navbar_search_outerring.xml +++ b/packages/SystemUI/res/drawable/navbar_search_outerring.xml @@ -19,5 +19,5 @@ <size android:height="@dimen/navbar_search_outerring_diameter" android:width="@dimen/navbar_search_outerring_diameter" /> <solid android:color="#00000000" /> - <stroke android:color="#00000000" android:width="2dp" /> + <stroke android:color="#40ffffff" android:width="2dp" /> </shape> 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 f91e5d6..c8a120d 100644 --- a/packages/SystemUI/res/layout-land/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-land/status_bar_search_panel.xml @@ -54,7 +54,7 @@ prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" - prvandroid:feedbackCount="1" + prvandroid:feedbackCount="0" prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:alwaysTrackFinger="true" prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" 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 2556aca..1e4bb57 100644 --- a/packages/SystemUI/res/layout-port/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-port/status_bar_search_panel.xml @@ -54,7 +54,7 @@ prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" - prvandroid:feedbackCount="1" + prvandroid:feedbackCount="0" prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:alwaysTrackFinger="true" prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" 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 459fac9..3b6c52e 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml @@ -40,7 +40,7 @@ prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" - prvandroid:feedbackCount="1" + prvandroid:feedbackCount="0" prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:alwaysTrackFinger="true" prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" 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 d2e26db..8c2360e 100644 --- a/packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml @@ -41,7 +41,7 @@ prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" - prvandroid:feedbackCount="1" + prvandroid:feedbackCount="0" prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:alwaysTrackFinger="true" prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" |