diff options
| author | Winson Chung <winsonc@google.com> | 2014-04-03 21:07:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-03 21:07:56 +0000 |
| commit | b9a7d8c2c46e71f756da69d7682bfc594b2a91ed (patch) | |
| tree | d636abb255ca6d6cf773804b8d5740572e172aa6 /packages/SystemUI/res | |
| parent | eb6387c16149e4d84dcb15427bb7ca8d0495554d (diff) | |
| parent | 5e3e5d8945249cfeb8bd59de112be88954ba62bf (diff) | |
| download | frameworks_base-b9a7d8c2c46e71f756da69d7682bfc594b2a91ed.zip frameworks_base-b9a7d8c2c46e71f756da69d7682bfc594b2a91ed.tar.gz frameworks_base-b9a7d8c2c46e71f756da69d7682bfc594b2a91ed.tar.bz2 | |
Merge "Adding activity icon to the task view"
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/recents_task_view.xml | 18 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 7 |
2 files changed, 18 insertions, 7 deletions
diff --git a/packages/SystemUI/res/layout/recents_task_view.xml b/packages/SystemUI/res/layout/recents_task_view.xml index f5ce222..96da21f 100644 --- a/packages/SystemUI/res/layout/recents_task_view.xml +++ b/packages/SystemUI/res/layout/recents_task_view.xml @@ -28,21 +28,29 @@ android:layout_gravity="top|center_horizontal" android:background="#e6444444"> <ImageView - android:id="@+id/activity_icon" - android:layout_width="@dimen/recents_task_view_icon_size" - android:layout_height="@dimen/recents_task_view_icon_size" - android:layout_gravity="top|left" + android:id="@+id/application_icon" + android:layout_width="@dimen/recents_task_view_application_icon_size" + android:layout_height="@dimen/recents_task_view_application_icon_size" + android:layout_gravity="center_vertical|left" android:padding="8dp" /> <TextView android:id="@+id/activity_description" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical|left" - android:layout_marginLeft="@dimen/recents_task_view_icon_size" + android:layout_marginLeft="@dimen/recents_task_view_application_icon_size" + android:layout_marginRight="@dimen/recents_task_view_activity_icon_size" android:textSize="24sp" android:textColor="#ffffffff" android:text="@string/recents_empty_message" android:fontFamily="sans-serif-thin" /> + <ImageView + android:id="@+id/activity_icon" + android:layout_width="@dimen/recents_task_view_activity_icon_size" + android:layout_height="@dimen/recents_task_view_activity_icon_size" + android:layout_gravity="center_vertical|right" + android:padding="12dp" + android:visibility="invisible" /> </com.android.systemui.recents.views.TaskBarView> </com.android.systemui.recents.views.TaskView> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 38e1083..1c6d5ad 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -230,8 +230,11 @@ <!-- Default distance from each snap target that GlowPadView considers a "hit" --> <dimen name="glowpadview_inner_radius">15dip</dimen> - <!-- The size of the icon in the recents task view. --> - <dimen name="recents_task_view_icon_size">60dp</dimen> + <!-- The size of the application icon in the recents task view. --> + <dimen name="recents_task_view_application_icon_size">60dp</dimen> + + <!-- The size of the activity icon in the recents task view. --> + <dimen name="recents_task_view_activity_icon_size">60dp</dimen> <!-- Space below the notification stack --> <dimen name="notification_stack_margin_bottom">0dp</dimen> |