Merge commit '16502e9479f96e3fc484192e0cd4c852c4fc8ea6' into gingerbread-plus-aosp
* commit '16502e9479f96e3fc484192e0cd4c852c4fc8ea6':
Allow users to create shortcuts to the VPN settings on the Home Screen.
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 '83c3b64ff7235e1382712a899ab0a269ce8a28d6' into gingerbread-plus-aosp
* commit '83c3b64ff7235e1382712a899ab0a269ce8a28d6':
BT: The Phone doesn't "wake up" when trying to pair with it.
To improve the pairing request usability:
- In the case where a notification shall be used the standard
notification sound is added
- When the screen is off notification is always used.
Change-Id: I751a7913517c64de5d7ba06d7c17358197d002c5
Merge commit '5774d5d34b2339135feab01b998fcd111ebdde4d' into gingerbread-plus-aosp
* commit '5774d5d34b2339135feab01b998fcd111ebdde4d':
Show correct process dependency for providers.
Merge commit '22aa2130fe40952d477a998ba60dea99ada32711' into gingerbread-plus-aosp
* commit '22aa2130fe40952d477a998ba60dea99ada32711':
Make power control widget be more responsive. Fix StrictMode violations.
Merge commit '92669a512a80fb99b71cbdf22aca9d91ae006b01' into gingerbread-plus-aosp
* commit '92669a512a80fb99b71cbdf22aca9d91ae006b01':
Import revised translations. DO NOT MERGE
Also use new location providers changed broadcast intent, and fix a bug
introduced in Froyo where we stopped observing the SYSTEM_CLOSE_DIALOGS
intent so we fell out of sync (more often) with the sync settings.
Now even responsive during the boot I/O storm! (except for toggling
brightness, which still does disk writes from the UI thread...)
BUG=2956025
Change-Id: I77876ff6e0be2325c15d5f08bb2970edf233f839
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 '3673546205ebf1b4c83c212c1032eea38c8adbe7' into gingerbread-plus-aosp
* commit '3673546205ebf1b4c83c212c1032eea38c8adbe7':
More version info.
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