summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-04-09 23:50:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-09 23:50:33 +0000
commit2adb95860f9682ed2c4893da58679540cd8cac56 (patch)
tree74362aca810b438d0adcc8653820dc2b0e9321f0 /packages/SystemUI/res
parentbc1a8f42d9eb5f1d91c872904a9a283781291fcb (diff)
parent0d767551c55d9e594a0b944bd1926c21a344b5ae (diff)
downloadframeworks_base-2adb95860f9682ed2c4893da58679540cd8cac56.zip
frameworks_base-2adb95860f9682ed2c4893da58679540cd8cac56.tar.gz
frameworks_base-2adb95860f9682ed2c4893da58679540cd8cac56.tar.bz2
Merge "Allow for different rects when animating to a single task stack view and a multiple task stack view."
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r--packages/SystemUI/res/layout/recents_task_view.xml6
-rw-r--r--packages/SystemUI/res/values/config.xml2
2 files changed, 7 insertions, 1 deletions
diff --git a/packages/SystemUI/res/layout/recents_task_view.xml b/packages/SystemUI/res/layout/recents_task_view.xml
index 96da21f..8297878 100644
--- a/packages/SystemUI/res/layout/recents_task_view.xml
+++ b/packages/SystemUI/res/layout/recents_task_view.xml
@@ -43,7 +43,11 @@
android:textSize="24sp"
android:textColor="#ffffffff"
android:text="@string/recents_empty_message"
- android:fontFamily="sans-serif-thin" />
+ android:fontFamily="sans-serif-thin"
+ android:singleLine="true"
+ android:maxLines="2"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
<ImageView
android:id="@+id/activity_icon"
android:layout_width="@dimen/recents_task_view_activity_icon_size"
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 77944c8..672c1d0 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -112,5 +112,7 @@
<integer name="recents_filter_animate_current_views_min_duration">175</integer>
<!-- The min animation duration for animating views that are newly visible. -->
<integer name="recents_filter_animate_new_views_min_duration">125</integer>
+ <!-- The min animation duration for animating views that are newly visible. -->
+ <integer name="recents_animate_task_bar_enter_duration">200</integer>
</resources>