PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cded8478: Merge change 24553 into eclair

Browse Source 
Merge commit 'cded847838c726342bfe56e69d417d160c73f212' into eclair-plus-aosp

* commit 'cded847838c726342bfe56e69d417d160c73f212':
  Make running services show dependent processes.
This commit is contained in:
Dianne Hackborn
2009-09-10 13:05:53 -07:00
committed by Android Git Automerger
parent 0da7d948df cded847838
commit 21ee9c2403
4 changed files with 383 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/arrays.xml
View File

@@ -50,10 +50,10 @@
<!-- Display settings. The type of animations to show. -->
<string-array name="animations_entries">
<item>Off</item>
<item>Some</item>
<item>All</item>
<item>Slow</item>
<item>No animations</item>
<item>Some animations</item>
<item>All animations</item>
<item>Slower all animations</item>
</string-array>
<!-- Display settings. Summary for each type of animation. -->

6
res/values/strings.xml
View File

@@ -1422,9 +1422,13 @@ found in the list of installed applications.</string>
<!-- Running services, button to cancel stopping of a service -->
<string name="confirm_stop_cancel">Cancel</string>
<!-- Running services, description for a service in the started state -->
<string name="service_started_by_app">Started by application</string>
<string name="service_started_by_app">Started by application: select to stop</string>
<!-- Running services, description for a service in the started state -->
<string name="service_client_name"><xliff:g id="client_name">%1$s</xliff:g>: select to manage</string>
<!-- Running services, summary of background processes -->
<string name="service_background_processes">Background procs: <xliff:g id="client_name">%1$d</xliff:g></string>
<!-- Running services, summary of foreground processes -->
<string name="service_foreground_processes">Foreground procs: <xliff:g id="client_name">%1$d</xliff:g></string>
<!-- Language Settings --> <skip />
<!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings realted to locale and text -->