Merge commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38' into gingerbread-plus-aosp
* commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38':
Fix the build. A "--" token is not just text in an XML comment.
Merge commit '69827524365ae448d19b2089c46534e925cc2bfd' into gingerbread-plus-aosp
* commit '69827524365ae448d19b2089c46534e925cc2bfd':
Try to fix bug3119318 without breaking the build this time
Merge commit 'af06d7a94a69d82ef5f2d8082e75c368f4204afb' into gingerbread-plus-aosp
* commit 'af06d7a94a69d82ef5f2d8082e75c368f4204afb':
Fix bug3119318, missing Mount USB storage strings
Merge commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0' into gingerbread-plus-aosp
* commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0':
Del "erase" from new unmount setting subtext
Merge commit '8abc40bb11690125fa441775041e0a64c79acc43' into gingerbread-plus-aosp
* commit '8abc40bb11690125fa441775041e0a64c79acc43':
Correct some typos, impose more consistency.
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command
Implements requested UI changes. Also some final tweaks to
Manage Applications.
Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89
Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp
* commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed':
Make summary appear for both checked and unchecked NFC checkbox in Settings.
Merge commit '2c4899737be92b858a9e2d9d743709cae310149b' into gingerbread-plus-aosp
* commit '2c4899737be92b858a9e2d9d743709cae310149b':
Change USB tab to USB storage if it fits
Merge commit 'd3abea0d70648e77e694780b7e139b0ed36ba483' into gingerbread-plus-aosp
* commit 'd3abea0d70648e77e694780b7e139b0ed36ba483':
Fix a few more cases of USB storage missed at 4am pass...
Merge commit '3018639200a3f04d274166e26c98307ab07fc3b9' into gingerbread-plus-aosp
* commit '3018639200a3f04d274166e26c98307ab07fc3b9':
With luck, final take on bug3076083, re back up settting
The German translators would like to be able to hyphenate the name
shown in the Launcher but to keep the name shown within the activity
as a single word.
Change-Id: I22402c41186fdcdaed2712933ddf0f215b3a3329
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)
Heavily modified to remove dead code.
Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
The Linux kernel supports reporting "cold" battery health to sysfs.
Android framework has not implemented this and it defaults to "unknown"
This adds handling the cold battery health.
Change-Id: Idfc7029fabcdfdaaf2b5c95977c11e0eb3fd76a7
Now handles WIFI start times being distributed across applications,
and collapses all work done in WIFI uid procs (esp that supplicant
thing) into the apps and overall WIFI category.
Change-Id: I341e5d63c45eeb0fb4121beed62474d947f9de11
- Show wake lock usage in the battery history.
- Show WIFI usage in the battery history.
- Show the amount an app has held a wake lock in the app details.
- Also fix service run time computation in running services.
Change-Id: I5aa959857f83808fbc709f65204f59bbfb73935b
- Running services now keeps a single data structure to make
switching through the UI a lot faster.
- Display text when there are no apps.
- Fix deadlock.
- Add new preference entry to view manage apps for storage use.
- Etc.
Change-Id: I0f5babf407ed7e84169f59584ddcb6cd0e9d67d9
- Remove title bar in various places where it is not useful.
- Tighten up some text to avoid spilling across lines.
- Remove strong wording about turning off GPS to save battery.
Change-Id: Ieed9f8f3a3cf6a892a49362677594b447a266925
Adds a full-screen version of the battery history visualization,
which you can get to by tapping on the battery history chart in
the summary screen.
Change-Id: Ibca5ef3d0883ff6ffa80b6ddca3c8ac838c85842
Also clean up to remove dead code for running services and old
battery usage UI.
Finally some string improvements from Roy.
Change-Id: I8765a4c744b92edd1505f14c47fea57b918e5d7b
