diff options
| author | Joe Onorato <joeo@android.com> | 2010-04-21 11:12:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-21 11:12:29 -0700 |
| commit | a8624186a6f7a29697bf5a112e46a80ca796c9c5 (patch) | |
| tree | e2a26b36ddcab86323521d6dc778be28bd1619c3 | |
| parent | d29eafdba5ca887631648a470dbec30b82cfd9dc (diff) | |
| parent | 46fba3b9e1bb02aa603ffbb17907f081be0ca873 (diff) | |
| download | frameworks_base-a8624186a6f7a29697bf5a112e46a80ca796c9c5.zip frameworks_base-a8624186a6f7a29697bf5a112e46a80ca796c9c5.tar.gz frameworks_base-a8624186a6f7a29697bf5a112e46a80ca796c9c5.tar.bz2 | |
am 46fba3b9: am 52e70b25: Add title to recent apps dialog.
Merge commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873' into kraken
* commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873':
Add title to recent apps dialog.
| -rw-r--r-- | core/res/res/layout/recent_apps_dialog.xml | 12 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/core/res/res/layout/recent_apps_dialog.xml b/core/res/res/layout/recent_apps_dialog.xml index 6bacc58..03340cd 100644 --- a/core/res/res/layout/recent_apps_dialog.xml +++ b/core/res/res/layout/recent_apps_dialog.xml @@ -26,6 +26,15 @@ android:paddingBottom="3dip" 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 --> <TextView android:id="@+id/no_applications_message" @@ -44,7 +53,8 @@ <LinearLayout android:layout_width="320dip" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:orientation="horizontal" + > <include layout="@android:layout/recent_apps_icon" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 45d7aea..a76c70c 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -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. --> <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> <!-- Title of the Global Actions Dialog --> |