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

am 46fba3b9: am 52e70b25: Add title to recent apps dialog.

Browse Source 
Merge commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873' into kraken

* commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873':
  Add title to recent apps dialog.
This commit is contained in:
Joe Onorato
2010-04-21 11:12:29 -07:00
committed by Android Git Automerger
parent d29eafdba5 46fba3b9e1
commit a8624186a6
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,15 @@
android:paddingBottom="3dip" android:paddingBottom="3dip"
android:orientation="vertical"> android:orientation="vertical">
<!-- Title -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/windowTitleStyle"
android:layout_marginTop="5dip"
android:layout_marginBottom="15dip"
android:text="@android:string/recent_tasks_title" />
<!-- This is only intended to be visible when all buttons (below) are invisible --> <!-- This is only intended to be visible when all buttons (below) are invisible -->
<TextView <TextView
android:id="@+id/no_applications_message" android:id="@+id/no_applications_message"
@@ -44,7 +53,8 @@
<LinearLayout <LinearLayout
android:layout_width="320dip" android:layout_width="320dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal"
>
<include <include
layout="@android:layout/recent_apps_icon" layout="@android:layout/recent_apps_icon"

4
core/res/res/values/strings.xml
View File

@@ -279,7 +279,9 @@
<!-- Shutdown Confirmation Dialog. When the user chooses to power off the phone, there will be a confirmation dialog. This is the message. --> <!-- Shutdown Confirmation Dialog. When the user chooses to power off the phone, there will be a confirmation dialog. This is the message. -->
<string name="shutdown_confirm">Your phone will shut down.</string> <string name="shutdown_confirm">Your phone will shut down.</string>
<!-- Recent Tasks dialog --> <!-- Recent Tasks dialog: title -->
<string name="recent_tasks_title">Recent</string>
<!-- Recent Tasks dialog: message when there are no recent applications -->
<string name="no_recent_tasks">No recent applications.</string> <string name="no_recent_tasks">No recent applications.</string>
<!-- Title of the Global Actions Dialog --> <!-- Title of the Global Actions Dialog -->