diff options
| author | Winson Chung <winsonc@google.com> | 2014-09-18 18:44:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-18 18:44:44 +0000 |
| commit | e274b8f7110f4635288ee2799b659cdb33fc5ea0 (patch) | |
| tree | 4e0eace9181bb0c34477567a1bd066c0ae2a6aea /packages/SystemUI/res | |
| parent | 9a3fa7a5b592ad3296c1c6a678ec86b4f39ade6d (diff) | |
| parent | bf5dbf1c151eb64f4068f233e72b0a867348bf8c (diff) | |
| download | frameworks_base-e274b8f7110f4635288ee2799b659cdb33fc5ea0.zip frameworks_base-e274b8f7110f4635288ee2799b659cdb33fc5ea0.tar.gz frameworks_base-e274b8f7110f4635288ee2799b659cdb33fc5ea0.tar.bz2 | |
am f7093202: Enabling recents stack clipping
* commit 'f709320263f370145780270fdc825cfbc48912d1':
Enabling recents stack clipping
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/recents_task_view.xml | 43 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 9 |
2 files changed, 30 insertions, 22 deletions
diff --git a/packages/SystemUI/res/layout/recents_task_view.xml b/packages/SystemUI/res/layout/recents_task_view.xml index 1b982fb..d1d3828 100644 --- a/packages/SystemUI/res/layout/recents_task_view.xml +++ b/packages/SystemUI/res/layout/recents_task_view.xml @@ -18,26 +18,31 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:focusable="true"> - <com.android.systemui.recents.views.TaskViewThumbnail - android:id="@+id/task_view_thumbnail" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - <include layout="@layout/recents_task_view_header" /> <FrameLayout - android:id="@+id/lock_to_app_fab" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_gravity="bottom|right" - android:layout_marginRight="15dp" - android:layout_marginBottom="15dp" - android:translationZ="3dp" - android:contentDescription="@string/recents_lock_to_app_button_label" - android:background="@drawable/recents_lock_to_task_button_bg"> - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_gravity="center" - android:src="@drawable/recents_lock_to_app_pin" /> + android:id="@+id/task_view_content" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <com.android.systemui.recents.views.TaskViewThumbnail + android:id="@+id/task_view_thumbnail" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <include layout="@layout/recents_task_view_header" /> + <FrameLayout + android:id="@+id/lock_to_app_fab" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="bottom|right" + android:layout_marginRight="15dp" + android:layout_marginBottom="15dp" + android:translationZ="2dp" + android:contentDescription="@string/recents_lock_to_app_button_label" + android:background="@drawable/recents_lock_to_task_button_bg"> + <ImageView + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_gravity="center" + android:src="@drawable/recents_lock_to_app_pin" /> + </FrameLayout> </FrameLayout> </com.android.systemui.recents.views.TaskView> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index e0cddb8..9346906 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -154,9 +154,12 @@ duration of the transition in to recents from home. --> <integer name="recents_animate_task_enter_from_home_delay">150</integer> <!-- The min animation duration for animating the task in when transitioning from home. --> - <integer name="recents_animate_task_enter_from_home_duration">275</integer> - <!-- The animation stagger to apply to each task animation when transitioning from home. --> - <integer name="recents_animate_task_enter_from_home_stagger_delay">10</integer> + <integer name="recents_animate_task_enter_from_home_duration">200</integer> + <!-- The total animation stagger delay when entering from home. --> + <integer name="recents_animate_task_enter_from_home_stagger_delay">110</integer> + <!-- The total animation duration added to the last card when entering from home. + This value is partialy also added to the previous tasks --> + <integer name="recents_animate_task_enter_from_home_stagger_duration">72</integer> <!-- The short duration when animating in/out the lock to app button. --> <integer name="recents_animate_lock_to_app_button_short_duration">150</integer> <!-- The long duration when animating in/out the lock to app button. --> |