Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp
* commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025':
Revise the Language & keyboard settings layout.
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)
Heavily modified to remove dead code.
Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
Make it so that the app's explanation comes before the list of possible
policies. This gives the app a chance to explain itself instead of having
the explanation hidden below the fold. To avoid situations in which one
bunch of text items can obscure the other, use an expandable/ellipsizable
TextView with an indicator image. This resolves b/2992594.
Change-Id: I0eb0d0c46bb4be2ec2e019d741915537e1fcc592
Merge commit '54e21852f221c183eba12e1706650cdc7e0a395f' into gingerbread-plus-aosp
* commit '54e21852f221c183eba12e1706650cdc7e0a395f':
Trim unwanted whitespace from translations. DO NOT MERGE
Merge commit 'b2fa8719a483a3ab36a8d919641714551c470bb8' into gingerbread-plus-aosp
* commit 'b2fa8719a483a3ab36a8d919641714551c470bb8':
Import revised translations. DO NOT MERGE
Merge commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9' into gingerbread-plus-aosp
* commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9':
Remove Search from the system Settings app DO NOT MERGE
The search settings acitivity lives in the system search app,
which is build-dependent. Also, since the Browser no longer
looks at the SHOW_WEB_SUGGESTIONS system preference, none
of the search settings affect the behavior of any other
platform apps.
The search settings will henceforth only be
available from within the search app (e.g. QuickSearchBox).
This is a cherry-pick of change I08f3979cd8cdc0742efbc49be95aa59753c94c0d
to gingerbread.
Bug: 3017365
Change-Id: I55df30e3a0e1f307ad6f23900f54d3018efda59f
Merge commit 'cb818619c669d4257a4df969dd03eff479ba84d0' into gingerbread-plus-aosp
* commit 'cb818619c669d4257a4df969dd03eff479ba84d0':
Update power usage UI to follow WIFI data changes.
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
Merge commit '33319b1228d8af25797e1371b088fc8491349c21' into gingerbread-plus-aosp
* commit '33319b1228d8af25797e1371b088fc8491349c21':
Bluetooth PIN is not password style
Merge commit 'be45f642cafdd27e5ffeb79b13aa3e33a83ae823' into gingerbread-plus-aosp
* commit 'be45f642cafdd27e5ffeb79b13aa3e33a83ae823':
Import revised translations. DO NOT MERGE
Merge commit '1a886f805be579ed2f32c861870e35aba37111bd' into gingerbread-plus-aosp
* commit '1a886f805be579ed2f32c861870e35aba37111bd':
Preserve old translations for changed strings. DO NOT MERGE
Bluetooth PIN is changed to password style to
comform with how passwords are normally shown
in the UI.
Change-Id: I293e94cf3766f9b5b82b9bb89e5aed4bd494ef71
Merge commit '0293009389eb3a4e8a3f2d08060e864f53f3c532' into gingerbread-plus-aosp
* commit '0293009389eb3a4e8a3f2d08060e864f53f3c532':
Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
Merge commit '92669a512a80fb99b71cbdf22aca9d91ae006b01' into gingerbread-plus-aosp
* commit '92669a512a80fb99b71cbdf22aca9d91ae006b01':
Import revised translations. DO NOT MERGE
Merge commit 'a457719c5042f944540f76c03b5e61ecd0ffae39' into gingerbread-plus-aosp
* commit 'a457719c5042f944540f76c03b5e61ecd0ffae39':
Add new string for the notification to be displayed when the user
Merge commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a' into gingerbread-plus-aosp
* commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a':
A couple small settings fixes:
- Correctly position WIFI/GPS charts.
- Start out with running services hidden in case we need to show
the progress bar.
Change-Id: I8852f334f68f4e9122b5d688d9fd57d0f94d94d8
Merge commit 'f8a91b535b05619061dad5870db2318b012bbc0b' into gingerbread-plus-aosp
* commit 'f8a91b535b05619061dad5870db2318b012bbc0b':
Import revised translations. DO NOT MERGE
Merge commit 'be5994d20152c7194aac79eb8152240655fd3373' into gingerbread-plus-aosp
* commit 'be5994d20152c7194aac79eb8152240655fd3373':
Some improvements to the battery usage UI:
- 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
Merge commit '38f157820750b90434208ef66330dcab52882ede' into gingerbread-plus-aosp
* commit '38f157820750b90434208ef66330dcab52882ede':
Import revised translations. DO NOT MERGE
Merge commit '4d9d75a42471ca65670fd2adc80d37bca43a69f6' into gingerbread-plus-aosp
* commit '4d9d75a42471ca65670fd2adc80d37bca43a69f6':
Import revised translations. DO NOT MERGE
- 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
Merge commit '49f4ba4adc255b812d562b7d802f91cb6d8d0671' into gingerbread-plus-aosp
* commit '49f4ba4adc255b812d562b7d802f91cb6d8d0671':
Various small UI cleanup in settings.
Merge commit '9db5ee35d5345e13e6e6b857dbad5a83e9f037d1' into gingerbread-plus-aosp
* commit '9db5ee35d5345e13e6e6b857dbad5a83e9f037d1':
Add facility to disable system packages.
- 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
