diff options
| author | Winson Chung <winsonc@google.com> | 2014-04-24 00:27:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-24 00:27:28 +0000 |
| commit | d937bb24b8e3459f3ae7d031aee9837f58d96b21 (patch) | |
| tree | 66438d87298ae096d943f44dbc2e2a867df06d7d /packages/SystemUI/res | |
| parent | 75e27e43709fcedc2f007d05b199562380d7f0d6 (diff) | |
| parent | 628f89667410f8c1d7e8892292aa36634f3e3384 (diff) | |
| download | frameworks_base-d937bb24b8e3459f3ae7d031aee9837f58d96b21.zip frameworks_base-d937bb24b8e3459f3ae7d031aee9837f58d96b21.tar.gz frameworks_base-d937bb24b8e3459f3ae7d031aee9837f58d96b21.tar.bz2 | |
am 628f8966: Merge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)"
* commit '628f89667410f8c1d7e8892292aa36634f3e3384':
Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/recents_task_view.xml | 30 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/colors.xml | 10 |
2 files changed, 25 insertions, 15 deletions
diff --git a/packages/SystemUI/res/layout/recents_task_view.xml b/packages/SystemUI/res/layout/recents_task_view.xml index 4442bca..ddc0dbf 100644 --- a/packages/SystemUI/res/layout/recents_task_view.xml +++ b/packages/SystemUI/res/layout/recents_task_view.xml @@ -22,26 +22,26 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> <com.android.systemui.recents.views.TaskInfoView - android:id="@+id/task_view_info_pane" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="invisible" - android:background="#e6444444"> + android:id="@+id/task_view_info_pane" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="invisible" + android:background="@color/recents_task_bar_default_background_color"> <Button - android:id="@+id/task_view_app_info_button" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="20dp" - android:layout_marginEnd="20dp" - android:layout_gravity="top|center_horizontal" - android:text="@string/recents_app_info_button_label" /> + android:id="@+id/task_view_app_info_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" + android:layout_gravity="top|center_horizontal" + android:text="@string/recents_app_info_button_label" /> </com.android.systemui.recents.views.TaskInfoView> <com.android.systemui.recents.views.TaskBarView android:id="@+id/task_view_bar" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top|center_horizontal" - android:background="#e6444444"> + android:background="@color/recents_task_bar_default_background_color"> <ImageView android:id="@+id/application_icon" android:layout_width="@dimen/recents_task_view_application_icon_size" @@ -54,8 +54,8 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical|left" android:layout_marginStart="@dimen/recents_task_view_application_icon_size" - android:layout_marginEnd="@dimen/recents_task_view_activity_icon_size" - android:textSize="24sp" + android:layout_marginEnd="8dp" + android:textSize="22sp" android:textColor="#ffffffff" android:text="@string/recents_empty_message" android:fontFamily="sans-serif-thin" diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 59e8360..9281265 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -49,4 +49,14 @@ <!-- Tint color for the content on the notification overflow card. --> <color name="keyguard_overflow_content_color">#ff666666</color> + + <!-- The default recents task bar background color. --> + <color name="recents_task_bar_default_background_color">#e6444444</color> + <!-- The default recents task bar text color. --> + <color name="recents_task_bar_default_text_color">#ffffffff</color> + <!-- The recents task bar light text color to be drawn on top of dark backgrounds. --> + <color name="recents_task_bar_light_text_color">#ffffffff</color> + <!-- The recents task bar dark text color to be drawn on top of light backgrounds. --> + <color name="recents_task_bar_dark_text_color">#ff222222</color> + </resources> |