Merge commit 'b2fa8719a483a3ab36a8d919641714551c470bb8' into gingerbread-plus-aosp
* commit 'b2fa8719a483a3ab36a8d919641714551c470bb8':
Import revised translations. DO NOT MERGE
Static IP selection uses strings to match, use
ids instead.
Also, add CHAR LIMIT to the new strings added
Change-Id: I7d632cfd672527be3a9676634b9ac4ea6983b626
The WPS available option is shown
for networks in scan results. Upon
selecting a network, the user has
the option of manually entering passwords
or choosing WPS for connection
Bug: 2277571
Change-Id: Ia12eb1742f1bf17128d51fa09e56dc4c3f067fa5
Merge commit '5496db047df21a44280c56984dbc296e2a1d7968'
* commit '5496db047df21a44280c56984dbc296e2a1d7968':
Fix Bluetooth device name max length checking.
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
User can now enable auto-time but disable auto-timezone, especially
if we don't have NITZ time from the cell network (or wifi only)
and only have NTP time that gives us date and time.
Merge commit 'e2b102de6723b06d26dd5df986884881f72335ea'
* commit 'e2b102de6723b06d26dd5df986884881f72335ea':
Remove Search from the system Settings app 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 '7cad4e2c88949b8fffc3cb85de3bbf01f9749cbb'
* commit '7cad4e2c88949b8fffc3cb85de3bbf01f9749cbb':
Some improvements to the manage apps code:
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 '2441c93def76c398eb3615f6109606dc021c4f27'
* commit '2441c93def76c398eb3615f6109606dc021c4f27':
Remove Search from the system Settings app DO NOT MERGE
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 '7222997e342920efb45edc312318fc5751c9a0ef'
* commit '7222997e342920efb45edc312318fc5751c9a0ef':
Update power usage UI to follow WIFI data changes.
Merge commit 'cb818619c669d4257a4df969dd03eff479ba84d0' into gingerbread-plus-aosp
* commit 'cb818619c669d4257a4df969dd03eff479ba84d0':
Update power usage UI to follow WIFI data changes.
On changing security type with the spinner,
the password/eap fields should change accordingly.
Due to a bug with checking of the spinner, this
was not happening. fix it.
Bug: 1654928
Change-Id: I9bb174448694671206293ccdc380a9aad14a3f12
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
- Add activity-alias for the Activity.
- Copy the Activity from AccountsAndSyncSettings.
- Fragmentize ManageAccountsSettings.
- Remove dependency toward AccountPreferenceBase, which is
used in AccountsAndSyncSettings widely.
- Add missing implementation derived from AccountPrefernceBase.
- Copy dependent drawables.
- Copy dependent xmls
- Copy AccountPrefernce.java.
- Copy strings, adding CHAR LIMIT.
- Remove the logic which remove the preference when its destination
Activity is missing. We already have the destination as
Fragment, and it never disappear.
Change-Id: Id41c63d7064aebeaae31bcd84bf4fd20a5636dfe
Merge commit '356745ecc63419a2569345186e8612a5b0ced28d'
* commit '356745ecc63419a2569345186e8612a5b0ced28d':
Don't disconnect the same device before connecting.
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
