diff options
| author | Jim Miller <jaggies@google.com> | 2012-05-23 17:03:27 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-05-29 12:49:23 -0700 |
| commit | a073e570789e5b49e8339af44516444b13db4428 (patch) | |
| tree | 67e0a1bba05474dd69f8a957788da88e39cad1be /packages/SystemUI/res/layout-sw600dp | |
| parent | a66c75a87e3485773430974b9bc314d010ba3542 (diff) | |
| download | frameworks_base-a073e570789e5b49e8339af44516444b13db4428.zip frameworks_base-a073e570789e5b49e8339af44516444b13db4428.tar.gz frameworks_base-a073e570789e5b49e8339af44516444b13db4428.tar.bz2 | |
Fix 6398209: General animation improvements for swipe to search
This cleans up the animation for swipe to search from the navbar. In particular:
1. Wait for initial animation to finish if gesture was too quick.
2. Better fade animation
3. Hide background and fade in when ring is selected
4. Smoother target and outer ring animation when switching between states.
Change-Id: I401197760cf9f06b6ff3e1cdb80bee86a03ef276
Diffstat (limited to 'packages/SystemUI/res/layout-sw600dp')
| -rw-r--r-- | packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml | 69 |
1 files changed, 21 insertions, 48 deletions
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 4da05d9..74a15f2 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml @@ -22,53 +22,26 @@ xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android" xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/search_panel_container" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:paddingBottom="0dip"> - - <RelativeLayout - android:id="@+id/search_bg_protect" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <RelativeLayout - android:id="@+id/search_panel_container" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true"> - - <View - android:layout_width="0dip" - android:layout_height="0dip" - android:layout_alignTop="@id/multi_wave_view" - android:layout_alignLeft="@id/multi_wave_view" - android:layout_alignRight="@id/multi_wave_view" - android:layout_alignBottom="@id/multi_wave_view" - android:layout_marginBottom="@dimen/navigation_bar_size" - android:background="@drawable/navbar_search_bg_scrim"/> - - <com.android.internal.widget.multiwaveview.MultiWaveView - android:id="@+id/multi_wave_view" - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_height="@dimen/navbar_search_panel_height" - android:layout_alignParentBottom="true" - android:gravity="top" - - prvandroid:targetDrawables="@array/navbar_search_targets" - prvandroid:targetDescriptions="@array/navbar_search_target_descriptions" - prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" - prvandroid:handleDrawable="@drawable/navbar_search_handle" - prvandroid:waveDrawable="@drawable/navbar_search_outerring" - prvandroid:snapMargin="@dimen/navbar_search_snap_margin" - prvandroid:hitRadius="@dimen/navbar_search_hit_radius" - prvandroid:feedbackCount="0" - prvandroid:vibrationDuration="@integer/config_vibration_duration" - prvandroid:alwaysTrackFinger="true"/> - - </RelativeLayout> - - </RelativeLayout> + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <com.android.internal.widget.multiwaveview.MultiWaveView + android:id="@+id/multi_wave_view" + android:layout_width="wrap_content" + android:layout_height="@dimen/navbar_search_panel_height" + android:layout_gravity="center_horizontal|bottom" + android:gravity="center_horizontal|top" + android:background="@drawable/navbar_search_bg_scrim" + + prvandroid:targetDrawables="@array/navbar_search_targets" + prvandroid:targetDescriptions="@array/navbar_search_target_descriptions" + prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" + prvandroid:handleDrawable="@drawable/navbar_search_handle" + prvandroid:waveDrawable="@drawable/navbar_search_outerring" + prvandroid:snapMargin="@dimen/navbar_search_snap_margin" + prvandroid:hitRadius="@dimen/navbar_search_hit_radius" + prvandroid:feedbackCount="0" + prvandroid:vibrationDuration="@integer/config_vibration_duration" + prvandroid:alwaysTrackFinger="true"/> </com.android.systemui.SearchPanelView> |