am 15f9939b: am c01b0c83: Allow user to see and stop heavy-weight processes.

Merge commit '15f9939b84542319fee7039b55dacb77d1fc2789'

* commit '15f9939b84542319fee7039b55dacb77d1fc2789':
  Allow user to see and stop heavy-weight processes.
This commit is contained in:
Dianne Hackborn
2010-06-24 12:44:37 -07:00
committed by Android Git Automerger
5 changed files with 242 additions and 148 deletions

View File

@@ -1838,6 +1838,9 @@ found in the list of installed applications.</string>
<!-- Running service details, default description for services that are started. -->
<string name="service_stop_description">This service was started by its
application. Stopping it may cause the application to fail.</string>
<!-- Running service details, description for running heavy-weight process. -->
<string name="heavy_weight_stop_description">This application can not safely
be stopped. Doing so may lose some of your current work.</string>
<!-- Running service details, default description for services that are managed. -->
<string name="service_manage_description"><xliff:g id="client_name">%1$s</xliff:g>:
currently in use. Touch Settings to control it.</string>