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 '0adb8460bcb736d67f87bf1b56150bfac9c9c130' into gingerbread-plus-aosp
* commit '0adb8460bcb736d67f87bf1b56150bfac9c9c130':
Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
Merge commit '54e21852f221c183eba12e1706650cdc7e0a395f' into gingerbread-plus-aosp
* commit '54e21852f221c183eba12e1706650cdc7e0a395f':
Trim unwanted whitespace from translations. DO NOT MERGE
Merge commit 'f8093b330adf3f307b203fcc8b568ec7be9348b8' into gingerbread-plus-aosp
* commit 'f8093b330adf3f307b203fcc8b568ec7be9348b8':
Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.
Earlier refactoring seems to have messed it up. Added a position value to the state trackers.
Bug: 2980926
Change-Id: I31df4b1ae0b835d801d67747154594299498c4cf
Merge commit '32d54b19367505547a67c2b717047fdab375db94' into gingerbread-plus-aosp
* commit '32d54b19367505547a67c2b717047fdab375db94':
Remove Search from the system Settings app DO NOT MERGE
Merge commit '3f1ba01d552f03faeb1aa9796dce8d9bf66d8e13' into gingerbread-plus-aosp
* commit '3f1ba01d552f03faeb1aa9796dce8d9bf66d8e13':
BT: The Phone doesn't "wake up" when trying to pair with it.
Merge commit 'dd79a33ba53fec530094f4d2fe37f0538530d9f8' into gingerbread-plus-aosp
* commit 'dd79a33ba53fec530094f4d2fe37f0538530d9f8':
Auto-connect Bluetooth device only when user initiates pairing.
Fix bug 2271901: do not auto-connect to services on a BT device
when pairing was initiated by the device (e.g. for OPP file transfer).
Also corrected some typos and removed an unneeded lock object in
LocalBluetoothManager (synchronize on .class object instead, like
android.bluetooth.BluetoothDevice.getService() does).
Change-Id: I121105c6eee2658129f6094786754bbc7932d324
Merge commit 'b2fa8719a483a3ab36a8d919641714551c470bb8' into gingerbread-plus-aosp
* commit 'b2fa8719a483a3ab36a8d919641714551c470bb8':
Import revised translations. DO NOT MERGE
Merge commit '59091c08f4d0ad8f42013f58ce9bd23ac3306336' into gingerbread-plus-aosp
* commit '59091c08f4d0ad8f42013f58ce9bd23ac3306336':
Fix Bluetooth device name max length checking.
The Bluetooth device name has a maximum length of 248 bytes in UTF-8
encoding. The settings app previously limited the Bluetooth device
name entered by the user based on the number of characters, which is
incorrect when the name includes non-ASCII characters.
Created a new Utf8ByteLengthFilter class for BluetoothNamePreference
which counts UTF-8 bytes instead of Unicode characters, along with
unit tests.
We can move Utf8ByteLengthFilter into the framework in the future
if it would be useful elsewhere in the system or for applications.
Change-Id: I9debface09659f09d750f3bfe8ad6ddfd34c75c5
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 '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 '3a6bb47d9f97ff55d75a23fac85c0febbabcb2eb' into gingerbread-plus-aosp
* commit '3a6bb47d9f97ff55d75a23fac85c0febbabcb2eb':
Some improvements to the manage apps code:
- Battery stats now aggregates bluetooth usage.
- Battery stats now uses new history iterator API.
- Battery stats chart is refectored to have the start of a
common facility for building tick charts.
- Manage apps will now asynchronously wait for the apps list
if it is taking >.25ms to build.
Change-Id: I568dd74beedf9a0a5a4c88ab567510cee9af8299
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 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
