Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4483 into donut

Browse Source 
* changes:
  Fixes #1414069. Display recent activities with two lines of text.
This commit is contained in:
Android (Google) Code Review
2009-06-17 10:58:47 -07:00
parent 07ca8c71f4 d20927410c
commit ef29f6afb4
2 changed files with 72 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
core/res/res/layout/recent_apps_dialog.xml
View File

@@ -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_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 <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="3dip" android:orientation="horizontal" >
android:orientation="vertical">
<include
<!-- This is only intended to be visible when all buttons (below) are invisible --> layout="@android:layout/recent_apps_icon"
<TextView android:id="@+id/button4" />
android:id="@+id/no_applications_message"
android:layout_width="285dip" <include
android:layout_height="wrap_content" layout="@android:layout/recent_apps_icon"
android:layout_marginTop="15dip" android:id="@+id/button5" />
android:layout_marginBottom="15dip"
android:gravity="center" <include
android:textAppearance="?android:attr/textAppearanceMedium" layout="@android:layout/recent_apps_icon"
android:text="@android:string/no_recent_tasks" /> android:id="@+id/button6" />
<!-- 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: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> </LinearLayout>
</FrameLayout> </LinearLayout>

41
core/res/res/layout/recent_apps_icon.xml
View File

@@ -18,27 +18,22 @@
--> -->
<!-- This is not a standalone element - it is imported into recent_apps_dialog.xml --> <!-- This is not a standalone element - it is imported into recent_apps_dialog.xml -->
<TextView
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="87dip" android:id="@+id/label"
android:layout_height="78dip"
android:layout_margin="3dip"
android:orientation="vertical"
android:gravity="center_vertical"
style="?android:attr/buttonStyle" style="?android:attr/buttonStyle"
android:background="@drawable/btn_application_selector"> android:background="@drawable/btn_application_selector"
<ImageView android:id="@+id/icon" android:layout_width="87dip"
android:layout_width="@android:dimen/app_icon_size" android:layout_height="88dip"
android:layout_height="@android:dimen/app_icon_size" android:layout_margin="3dip"
android:layout_gravity="center_horizontal" android:textColor="@color/primary_text_dark_focused"
android:scaleType="fitCenter" />
<TextView android:id="@+id/label" android:paddingTop="5dip"
android:layout_width="fill_parent" android:paddingBottom="2dip"
android:layout_height="wrap_content" android:drawablePadding="0dip"
android:textSize="12dip"
android:maxLines="1" android:textSize="13dip"
android:ellipsize="end" android:maxLines="2"
android:duplicateParentState="true" android:ellipsize="marquee"
android:textColor="@color/primary_text_dark_focused" android:fadingEdge="horizontal"
android:gravity="center_horizontal" /> android:gravity="top|center_horizontal" />
</LinearLayout>