diff options
| author | Winson Chung <winsonc@google.com> | 2014-05-03 01:46:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-03 01:46:01 +0000 |
| commit | 56c4370eeef577d71747fde43f9db4f1914c2776 (patch) | |
| tree | 73aa282da9ecd33abbecbdaab9941766457d71d2 /packages/SystemUI/res | |
| parent | b66ef989d6fcf9122ec98a5bc88930c398b54c2d (diff) | |
| parent | 7e78b8d3dbacac82bbacffde065a5c0863f1b791 (diff) | |
| download | frameworks_base-56c4370eeef577d71747fde43f9db4f1914c2776.zip frameworks_base-56c4370eeef577d71747fde43f9db4f1914c2776.tar.gz frameworks_base-56c4370eeef577d71747fde43f9db4f1914c2776.tar.bz2 | |
am ee9b42a9: Merge "Incorporating theme colors into task views."
* commit 'ee9b42a9a330b3225182761c542a095801835354':
Incorporating theme colors into task views.
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/recents_task_view.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/res/layout/recents_task_view.xml b/packages/SystemUI/res/layout/recents_task_view.xml index ddc0dbf..f7df18eb 100644 --- a/packages/SystemUI/res/layout/recents_task_view.xml +++ b/packages/SystemUI/res/layout/recents_task_view.xml @@ -58,7 +58,7 @@ android:textSize="22sp" android:textColor="#ffffffff" android:text="@string/recents_empty_message" - android:fontFamily="sans-serif-thin" + android:fontFamily="sans-serif-light" android:singleLine="true" android:maxLines="2" android:ellipsize="marquee" diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 722ca15..024f1eb 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -115,8 +115,10 @@ <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. --> + <!-- The min animation duration for animating the task bar in. --> <integer name="recents_animate_task_bar_enter_duration">200</integer> + <!-- The min animation duration for animating the task bar out. --> + <integer name="recents_animate_task_bar_exit_duration">150</integer> <!-- The animation duration for animating in the info pane. --> <integer name="recents_animate_task_view_info_pane_duration">150</integer> <!-- The minimum alpha for the dim applied to cards that go deeper into the stack. --> |