Commit Graph

2153 Commits

Author SHA1 Message Date
Amith Yamasani
f8093b330a Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread 2010-09-27 11:20:52 -07:00
Amith Yamasani
740edeaa42 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
2010-09-27 11:20:00 -07:00
Jean-Baptiste Queru
4d34b227b4 am 32d54b19: reconcile froyo-release into gingerbread
Merge commit '32d54b19367505547a67c2b717047fdab375db94' into gingerbread-plus-aosp

* commit '32d54b19367505547a67c2b717047fdab375db94':
  Remove Search from the system Settings app DO NOT MERGE
2010-09-26 17:42:25 -07:00
Jean-Baptiste Queru
32d54b1936 reconcile froyo-release into gingerbread
Change-Id: I2386774732d4d0d0e46a5791dfc1b8cbeb60494b
2010-09-26 17:30:50 -07:00
Jean-Baptiste Queru
d312529325 am 3f1ba01d: Merge "BT: The Phone doesn\'t "wake up" when trying to pair with it."
Merge commit '3f1ba01d552f03faeb1aa9796dce8d9bf66d8e13' into gingerbread-plus-aosp

* commit '3f1ba01d552f03faeb1aa9796dce8d9bf66d8e13':
  BT: The Phone doesn't "wake up" when trying to pair with it.
2010-09-26 08:41:23 -07:00
Jean-Baptiste Queru
3f1ba01d55 Merge "BT: The Phone doesn't "wake up" when trying to pair with it." 2010-09-26 08:05:46 -07:00
Jake Hamby
68c6188b91 am dd79a33b: Auto-connect Bluetooth device only when user initiates pairing.
Merge commit 'dd79a33ba53fec530094f4d2fe37f0538530d9f8' into gingerbread-plus-aosp

* commit 'dd79a33ba53fec530094f4d2fe37f0538530d9f8':
  Auto-connect Bluetooth device only when user initiates pairing.
2010-09-24 17:16:37 -07:00
Jake Hamby
dd79a33ba5 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
2010-09-24 14:23:26 -07:00
Eric Fischer
4cc41d87f6 am b2fa8719: Import revised translations. DO NOT MERGE
Merge commit 'b2fa8719a483a3ab36a8d919641714551c470bb8' into gingerbread-plus-aosp

* commit 'b2fa8719a483a3ab36a8d919641714551c470bb8':
  Import revised translations.  DO NOT MERGE
2010-09-24 11:08:52 -07:00
Eric Fischer
b2fa8719a4 Import revised translations. DO NOT MERGE
Change-Id: Iad9da8a6c0559c93c87a3b9f7e8a9258d677705b
2010-09-24 10:26:20 -07:00
Jake Hamby
5496db047d am 59091c08: Fix Bluetooth device name max length checking.
Merge commit '59091c08f4d0ad8f42013f58ce9bd23ac3306336' into gingerbread-plus-aosp

* commit '59091c08f4d0ad8f42013f58ce9bd23ac3306336':
  Fix Bluetooth device name max length checking.
2010-09-22 16:26:02 -07:00
Jake Hamby
59091c08f4 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
2010-09-22 16:04:50 -07:00
Bjorn Bringert
50c529220a 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
2010-09-21 13:56:16 -07:00
Bjorn Bringert
e2b102de67 am 28580b4d: 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
2010-09-21 03:05:25 -07:00
Bjorn Bringert
28580b4d9a 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
2010-09-21 10:51:45 +01:00
Dianne Hackborn
7cad4e2c88 am 3a6bb47d: Merge "Some improvements to the manage apps code:" into gingerbread
Merge commit '3a6bb47d9f97ff55d75a23fac85c0febbabcb2eb' into gingerbread-plus-aosp

* commit '3a6bb47d9f97ff55d75a23fac85c0febbabcb2eb':
  Some improvements to the manage apps code:
2010-09-20 17:09:39 -07:00
Dianne Hackborn
3a6bb47d9f Merge "Some improvements to the manage apps code:" into gingerbread 2010-09-20 17:06:58 -07:00
Dianne Hackborn
19df79af26 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
2010-09-20 17:06:17 -07:00
Bjorn Bringert
2441c93def am 8fdaff05: am f4d359d3: (-s ours) 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
2010-09-20 12:58:42 -07:00
Bjorn Bringert
8fdaff05d1 am f4d359d3: (-s ours) 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
2010-09-20 12:48:11 -07:00
Imre Sunyi
524146698f Support showing "Cold" battery health.
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
2010-09-20 18:02:28 +02:00
Bjorn Bringert
f4d359d3c8 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
2010-09-20 13:16:25 +01:00
Dianne Hackborn
7222997e34 am cb818619: 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.
2010-09-17 15:20:06 -07:00
Dianne Hackborn
cb818619c6 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
2010-09-17 11:28:08 -07:00
Jaikumar Ganesh
356745ecc6 am 213d579f: Merge "Don\'t disconnect the same device before connecting." into gingerbread
Merge commit '213d579f98a83145989f11cfdbd47631b64de000' into gingerbread-plus-aosp

* commit '213d579f98a83145989f11cfdbd47631b64de000':
  Don't disconnect the same device before connecting.
2010-09-16 22:15:50 -07:00
Jaikumar Ganesh
213d579f98 Merge "Don't disconnect the same device before connecting." into gingerbread 2010-09-16 19:08:32 -07:00
Jaikumar Ganesh
84905edb63 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
2010-09-16 18:56:30 -07:00
Dianne Hackborn
e2fc49ac1b am 5c2a4684: Merge "Supercalifragilisticexpialidocious." into gingerbread
Merge commit '5c2a46848133c0ad6b2197aa1d6f5ae2ba9c8119' into gingerbread-plus-aosp

* commit '5c2a46848133c0ad6b2197aa1d6f5ae2ba9c8119':
  Supercalifragilisticexpialidocious.
2010-09-14 12:33:38 -07:00
Dianne Hackborn
5c2a468481 Merge "Supercalifragilisticexpialidocious." into gingerbread 2010-09-14 12:31:20 -07:00
Dianne Hackborn
44178e2801 Supercalifragilisticexpialidocious.
Change-Id: Ifaece97c80b859cb455eab56230e076eca916f4a
2010-09-14 12:29:32 -07:00
Brad Fitzpatrick
f8a473c398 am c5c8dad0: Use new apply() instead of commit().
Merge commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb' into gingerbread-plus-aosp

* commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb':
  Use new apply() instead of commit().
2010-09-14 10:29:35 -07:00
Brad Fitzpatrick
c5c8dad0af 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
2010-09-14 09:26:51 -07:00
Jaikumar Ganesh
1647d472a8 am e714898a: Merge "OutOfband pairing user dialog." into gingerbread
Merge commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120' into gingerbread-plus-aosp

* commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120':
  OutOfband pairing user dialog.
2010-09-13 11:52:15 -07:00
Jaikumar Ganesh
e714898a1a Merge "OutOfband pairing user dialog." into gingerbread 2010-09-13 11:43:01 -07:00
Chung-yih Wang
2af8a0076e am e5e4282a: Enable the call setting when the VoIP feature is supported.
Merge commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257' into gingerbread-plus-aosp

* commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257':
  Enable the call setting when the VoIP feature is supported.
2010-09-10 19:52:31 -07:00
Chung-yih Wang
e5e4282af1 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
2010-09-11 10:24:46 +08:00
Jean-Baptiste Queru
8ce1853fff am 16502e94: Merge "Allow users to create shortcuts to the VPN settings on the Home Screen."
Merge commit '16502e9479f96e3fc484192e0cd4c852c4fc8ea6' into gingerbread-plus-aosp

* commit '16502e9479f96e3fc484192e0cd4c852c4fc8ea6':
  Allow users to create shortcuts to the VPN settings on the Home Screen.
2010-09-10 15:47:21 -07:00
Erik Ljungberg
40230c1490 am 33319b12: Bluetooth PIN is not password style
Merge commit '33319b1228d8af25797e1371b088fc8491349c21' into gingerbread-plus-aosp

* commit '33319b1228d8af25797e1371b088fc8491349c21':
  Bluetooth PIN is not password style
2010-09-10 15:47:18 -07:00
Jean-Baptiste Queru
16502e9479 Merge "Allow users to create shortcuts to the VPN settings on the Home Screen." 2010-09-10 14:27:49 -07:00
Eric Fischer
a27ffa47aa am be45f642: Import revised translations. DO NOT MERGE
Merge commit 'be45f642cafdd27e5ffeb79b13aa3e33a83ae823' into gingerbread-plus-aosp

* commit 'be45f642cafdd27e5ffeb79b13aa3e33a83ae823':
  Import revised translations.  DO NOT MERGE
2010-09-10 13:24:06 -07:00
Eric Fischer
be45f642ca Import revised translations. DO NOT MERGE
Change-Id: I3a1f1eeb653d982ddc30c765a4a530aa48a364bf
2010-09-10 13:07:48 -07:00
Jaikumar Ganesh
a197eea307 OutOfband pairing user dialog.
Change-Id: I2f996067b983ad4678814040eb0773fa3968be13
2010-09-09 15:29:03 -07:00
Eric Fischer
11bf335adb am 1a886f80: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '1a886f805be579ed2f32c861870e35aba37111bd' into gingerbread-plus-aosp

* commit '1a886f805be579ed2f32c861870e35aba37111bd':
  Preserve old translations for changed strings.  DO NOT MERGE
2010-09-07 11:11:00 -07:00
Eric Fischer
1a886f805b Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread 2010-09-07 11:04:17 -07:00
Erik Ljungberg
33319b1228 Bluetooth PIN is not password style
Bluetooth PIN is changed to password style to
comform with how passwords are normally shown
in the UI.

Change-Id: I293e94cf3766f9b5b82b9bb89e5aed4bd494ef71
2010-09-06 18:19:36 +02:00
Eric Fischer
8f32a38393 Preserve old translations for changed strings. DO NOT MERGE
Change-Id: I7ce80a0d57a6ff09dd12abab5ba6df9019d740ca
2010-09-03 17:42:59 -07:00
Dianne Hackborn
1cc3202d0e am 2d5cd1df: Follow rename.
Merge commit '2d5cd1dfbc635fef3321694f33faf38ffa993d3f' into gingerbread-plus-aosp

* commit '2d5cd1dfbc635fef3321694f33faf38ffa993d3f':
  Follow rename.
2010-09-03 13:29:51 -07:00
Dianne Hackborn
2d5cd1dfbc Follow rename.
Change-Id: I255df1429b999943d7b3d2ca2b453045f195fdb9
2010-09-03 12:53:20 -07:00
Dianne Hackborn
356102e39a am 02930093: Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
Merge commit '0293009389eb3a4e8a3f2d08060e864f53f3c532' into gingerbread-plus-aosp

* commit '0293009389eb3a4e8a3f2d08060e864f53f3c532':
  Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
2010-09-02 19:02:47 -07:00
Dianne Hackborn
0293009389 Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
Change-Id: Ifd08744d909c2d87e5cdf4eedcc5af1a86548e60
2010-09-02 18:19:02 -07:00