Merge commit '8fdaff05d1154c93b467b9647b8fc2702eca1699' into gingerbread-plus-aosp
* commit '8fdaff05d1154c93b467b9647b8fc2702eca1699':
Remove Search from the system Settings app DO NOT MERGE
Merge commit 'f4d359d3c83d0e84319603ecc0f4dce120708612' into gingerbread
* commit 'f4d359d3c83d0e84319603ecc0f4dce120708612':
Remove Search from the system Settings app DO NOT MERGE
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
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).
Bug: 3017365
Change-Id: I08f3979cd8cdc0742efbc49be95aa59753c94c0d
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 '213d579f98a83145989f11cfdbd47631b64de000' into gingerbread-plus-aosp
* commit '213d579f98a83145989f11cfdbd47631b64de000':
Don't disconnect the same device before connecting.
We Pair: Remote device sends incoming connection, we get connected.
We get BondingState change and we connect.
Settings app disconnects connected profiles and then connects
without checking whether we are disconnecting the same device itself.
How was it working before ? Settings app used to queue all
commands. The disconnect followed by the connect would work
but unnecessarily disconnect and then connect.
With the queuing moved to framework, the connect fails
since the disconnect status has not been broadcasted.
Settings app shouldn't be disconnecting connected profiles.
That logic should reside in the framework. There is an open bug
and when the new APIs get implemented this will get removed.
Change-Id: I32a7fa36ff3c3321691c55071498f985dcdcfe8e
Merge commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb' into gingerbread-plus-aosp
* commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb':
Use new apply() instead of commit().
apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.
Change-Id: I0f528607319d7eb5136bb11fce0b24d8741ccdf9
Merge commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257' into gingerbread-plus-aosp
* commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257':
Enable the call setting when the VoIP feature is supported.
If the VoIP feature is included, the user need to be able to
configure the internet call settings even if it is in airplan mode.
Change-Id: I00d73fb0d9213162b8a9887cad0f800418446787
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
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
