diff options
| -rw-r--r-- | core/res/res/layout/recent_apps_dialog.xml | 112 | ||||
| -rw-r--r-- | core/res/res/layout/recent_apps_icon.xml | 39 |
2 files changed, 71 insertions, 80 deletions
diff --git a/core/res/res/layout/recent_apps_dialog.xml b/core/res/res/layout/recent_apps_dialog.xml index 852b2f17ea1d..c4ee95d0a82a 100644 --- a/core/res/res/layout/recent_apps_dialog.xml +++ b/core/res/res/layout/recent_apps_dialog.xml @@ -17,67 +17,63 @@ */ --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" - android:layout_height="wrap_content"> - + android:layout_height="wrap_content" + android:padding="3dip" + android:orientation="vertical"> + + <!-- This is only intended to be visible when all buttons (below) are invisible --> + <TextView + android:id="@+id/no_applications_message" + android:layout_width="285dip" + android:layout_height="wrap_content" + android:layout_marginTop="15dip" + android:layout_marginBottom="15dip" + android:gravity="center" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@android:string/no_recent_tasks" /> + + <!-- The first row has a fixed-width because the UI spec requires the box + to display with full-width no matter how many icons are visible, but to + adjust height based on number of rows. --> + <!-- TODO Adjust all sizes, padding, etc. to meet pixel-perfect specs --> + <LinearLayout + android:layout_width="285dip" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <include + layout="@android:layout/recent_apps_icon" + android:id="@+id/button1" /> + + <include + layout="@android:layout/recent_apps_icon" + android:id="@+id/button2" /> + + <include + layout="@android:layout/recent_apps_icon" + android:id="@+id/button3" /> + + </LinearLayout> + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="3dip" - android:orientation="vertical"> - - <!-- This is only intended to be visible when all buttons (below) are invisible --> - <TextView - android:id="@+id/no_applications_message" - android:layout_width="285dip" - android:layout_height="wrap_content" - android:layout_marginTop="15dip" - android:layout_marginBottom="15dip" - android:gravity="center" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@android:string/no_recent_tasks" /> - - <!-- The first row has a fixed-width because the UI spec requires the box - to display with full-width no matter how many icons are visible, but to - adjust height based on number of rows. --> - <!-- TODO Adjust all sizes, padding, etc. to meet pixel-perfect specs --> - <LinearLayout - android:layout_width="285dip" - android:layout_height="wrap_content" - android:orientation="horizontal" > + android:orientation="horizontal" > + + <include + layout="@android:layout/recent_apps_icon" + android:id="@+id/button4" /> + + <include + layout="@android:layout/recent_apps_icon" + android:id="@+id/button5" /> + + <include + layout="@android:layout/recent_apps_icon" + android:id="@+id/button6" /> - <include - layout="@android:layout/recent_apps_icon" - android:id="@+id/button1" /> - - <include - layout="@android:layout/recent_apps_icon" - android:id="@+id/button2" /> - - <include - layout="@android:layout/recent_apps_icon" - android:id="@+id/button3" /> - - </LinearLayout> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <include - layout="@android:layout/recent_apps_icon" - android:id="@+id/button4" /> - - <include - layout="@android:layout/recent_apps_icon" - android:id="@+id/button5" /> - - <include - layout="@android:layout/recent_apps_icon" - android:id="@+id/button6" /> - - </LinearLayout> </LinearLayout> -</FrameLayout> +</LinearLayout>
\ No newline at end of file diff --git a/core/res/res/layout/recent_apps_icon.xml b/core/res/res/layout/recent_apps_icon.xml index b8cf08964697..d32643cb15dd 100644 --- a/core/res/res/layout/recent_apps_icon.xml +++ b/core/res/res/layout/recent_apps_icon.xml @@ -18,27 +18,22 @@ --> <!-- This is not a standalone element - it is imported into recent_apps_dialog.xml --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/label" + style="?android:attr/buttonStyle" + android:background="@drawable/btn_application_selector" android:layout_width="87dip" - android:layout_height="78dip" + android:layout_height="88dip" android:layout_margin="3dip" - android:orientation="vertical" - android:gravity="center_vertical" - style="?android:attr/buttonStyle" - android:background="@drawable/btn_application_selector"> - <ImageView android:id="@+id/icon" - android:layout_width="@android:dimen/app_icon_size" - android:layout_height="@android:dimen/app_icon_size" - android:layout_gravity="center_horizontal" - android:scaleType="fitCenter" /> - <TextView android:id="@+id/label" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textSize="12dip" - android:maxLines="1" - android:ellipsize="end" - android:duplicateParentState="true" - android:textColor="@color/primary_text_dark_focused" - android:gravity="center_horizontal" /> -</LinearLayout> + android:textColor="@color/primary_text_dark_focused" + + android:paddingTop="5dip" + android:paddingBottom="2dip" + android:drawablePadding="0dip" + + android:textSize="13dip" + android:maxLines="2" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:gravity="top|center_horizontal" /> |