Commit Graph

2036 Commits

Author SHA1 Message Date
Michael Chan
746fac2d55 am d9db9e76: Merge "b/2498180 b/2568119 Retry if BT dock disconnects unexpectedly" into froyo
Merge commit 'd9db9e762190f4cf46df0109139867c7a77746fe' into kraken

* commit 'd9db9e762190f4cf46df0109139867c7a77746fe':
  b/2498180 b/2568119 Retry if BT dock disconnects unexpectedly
2010-04-07 13:19:51 -07:00
Michael Chan
d9db9e7621 Merge "b/2498180 b/2568119 Retry if BT dock disconnects unexpectedly" into froyo 2010-04-07 13:12:33 -07:00
Adam Powell
7cf4320422 am bdbb57b6: Merge "Fix bug 2564450 - prevent deadlock in BT settings" into froyo
Merge commit 'bdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4' into kraken

* commit 'bdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4':
  Fix bug 2564450 - prevent deadlock in BT settings
2010-04-07 09:54:29 -07:00
Adam Powell
bdbb57b6ab Merge "Fix bug 2564450 - prevent deadlock in BT settings" into froyo 2010-04-07 09:48:28 -07:00
Brad Fitzpatrick
a494ff40bd am 6e29e073: Merge "Make Power Control widget a bit more responsive." into froyo
Merge commit '6e29e07357cb733ff204de21bfb4bf45833d4861' into kraken

* commit '6e29e07357cb733ff204de21bfb4bf45833d4861':
  Make Power Control widget a bit more responsive.
2010-04-07 09:25:06 -07:00
Brad Fitzpatrick
6e29e07357 Merge "Make Power Control widget a bit more responsive." into froyo 2010-04-07 09:19:14 -07:00
Charles Chen
e2dabc7634 am 473111bc: Fixing bug #2575499 - TextToSpeech Settings did not verify that the current default language was still supported when the default engine changes.
Merge commit '473111bcfca1342fdbd74af10189931a386c8f24' into kraken

* commit '473111bcfca1342fdbd74af10189931a386c8f24':
  Fixing bug #2575499 - TextToSpeech Settings did not verify that the
2010-04-06 17:46:18 -07:00
Charles Chen
473111bcfc Fixing bug #2575499 - TextToSpeech Settings did not verify that the
current default language was still supported when the default engine
changes.

Change-Id: I2f4b986311161ceaa9d4b9cf3a495f536d9425cd
2010-04-06 16:03:33 -07:00
Brad Fitzpatrick
046915c4c8 Make Power Control widget a bit more responsive.
Based on a lot of timings on Sapphire.

Also, initially this CL improved the speed of Toasts, but now it just
removes the use of Toasts in the widget after eng/UX discussions with
various people.

BUG=2535155

Change-Id: I134a730f17ebee8a119b7796984f00b22e0d6120
2010-04-06 15:44:30 -07:00
Michael Chan
732c1dad5a b/2498180 b/2568119 Retry if BT dock disconnects unexpectedly
Change-Id: Ic4771e7c305192fee56f5f80c6cabeecf11a99dc
2010-04-06 15:42:04 -07:00
Adam Powell
54f334489c Fix bug 2564450 - prevent deadlock in BT settings
Change-Id: Iea5d341d771d18e5d9bf7c6686995ba6cbbf2172
2010-04-06 13:32:35 -07:00
Irfan Sheriff
dbb0a7ed4d am 6e74d41b: Fix network disable on connect
Merge commit '6e74d41bd0525459c43ed010e8f049ffc20ca362' into kraken

* commit '6e74d41bd0525459c43ed010e8f049ffc20ca362':
  Fix network disable on connect
2010-04-05 09:39:52 -07:00
Irfan Sheriff
6e74d41bd0 Fix network disable on connect
If we dont have an updated access point list
when we are re-enabling networks after connecting,
we could end up keeping some networks disabled.

This could happen if there is no event that
triggers an access point before enabling networks

Update the current access point list
right before enabling all networks.

Bug: 2567770
Change-Id: Ieb1ac8147d4acb05a6d13c44396653f0af94643d
2010-04-05 09:28:25 -07:00
Kenny Root
6e117870e8 am af05891d: Import revised translations
Merge commit 'af05891d31bf86e12910602be305a61fdcf1ace7' into kraken

* commit 'af05891d31bf86e12910602be305a61fdcf1ace7':
  Import revised translations
2010-04-03 14:13:50 -07:00
Kenny Root
af05891d31 Import revised translations
Change-Id: I7ce7aa7745bfb57870f1239dba8bd0bd714590dd
2010-04-03 14:02:57 -07:00
Daniel Sandler
f57e067056 am 1ce25342: Merge "Restore dependency between volume settings and silent mode." into froyo
Merge commit '1ce25342bfe918f60a895f5dc6b7feac3e1d6174' into kraken

* commit '1ce25342bfe918f60a895f5dc6b7feac3e1d6174':
  Restore dependency between volume settings and silent mode.
2010-04-02 11:00:27 -07:00
Daniel Sandler
1ce25342bf Merge "Restore dependency between volume settings and silent mode." into froyo 2010-04-02 10:53:17 -07:00
Dianne Hackborn
b4ecbb3644 am 07f63605: Fix issue #2549511 Crash while moving the installed app to Phone
Merge commit '07f636059a2fb45f2d8284fedbbbba2c78b05157' into kraken

* commit '07f636059a2fb45f2d8284fedbbbba2c78b05157':
  Fix issue #2549511 Crash while moving the installed app to Phone
2010-03-31 11:14:27 -07:00
Dianne Hackborn
07f636059a Fix issue #2549511 Crash while moving the installed app to Phone
android.view.WindowManager$BadTokenException: Unable to add window

Change-Id: Ie844fd9cde05134431695f4f5bd27827e9e23ce5
2010-03-31 10:00:16 -07:00
Jeff Brown
a13be2908c am 9c0cc3b8: Merge "Refresh apps when they become (un)available." into froyo
Merge commit '9c0cc3b8ee5f32c485ced17e72a2d9dc551e1caa' into kraken

* commit '9c0cc3b8ee5f32c485ced17e72a2d9dc551e1caa':
  Refresh apps when they become (un)available.
2010-03-31 09:33:40 -07:00
Jeff Brown
9c0cc3b8ee Merge "Refresh apps when they become (un)available." into froyo 2010-03-31 09:27:25 -07:00
Dianne Hackborn
45c4bc1ae5 am d4fb738a: Merge "Fix issue# 2544176: running services list update outside of ui thread." into froyo
Merge commit 'd4fb738aa721f5bd16e5fa71bb3bbbe14d85a450' into kraken

* commit 'd4fb738aa721f5bd16e5fa71bb3bbbe14d85a450':
  Fix issue# 2544176: running services list update outside of ui thread.
2010-03-30 18:32:33 -07:00
Dianne Hackborn
d4fb738aa7 Merge "Fix issue# 2544176: running services list update outside of ui thread." into froyo 2010-03-30 18:25:10 -07:00
Dianne Hackborn
309f236255 Fix issue# 2544176: running services list update outside of ui thread.
Also fix to put the services in a somewhat reasonable order.

Change-Id: I564c4d3fb1c0d803fe795c3d3a4a1d1d731f77fa
2010-03-30 18:14:38 -07:00
Robert Greenwalt
5a7e9a663c am 388b4a87: Merge "Add Title to the Tether help dialog" into froyo
Merge commit '388b4a8726459c20827bc44488ffb9eb890080ee' into kraken

* commit '388b4a8726459c20827bc44488ffb9eb890080ee':
  Add Title to the Tether help dialog
2010-03-30 16:00:11 -07:00
Robert Greenwalt
388b4a8726 Merge "Add Title to the Tether help dialog" into froyo 2010-03-30 15:54:47 -07:00
Mike LeBeau
e81d23819c am 38947ddc: Fix the build - doh.
Merge commit '38947ddcfb2411d380d631ebfc29d66b11821879' into kraken

* commit '38947ddcfb2411d380d631ebfc29d66b11821879':
  Fix the build - doh.
2010-03-30 14:53:38 -07:00
Mike LeBeau
38947ddcfb Fix the build - doh.
Change-Id: Iffaf7276340c00b3652e38580abdb218e5907917
2010-03-30 14:45:00 -07:00
Mike LeBeau
898c7e1862 am e076bef9: Add new string to identify what speech recognizer the settings are for.
Merge commit 'e076bef97d4ec83b6ef3a27ca7b8143d8ad306f2' into kraken

* commit 'e076bef97d4ec83b6ef3a27ca7b8143d8ad306f2':
  Add new string to identify what speech recognizer the settings are for.
2010-03-30 14:24:55 -07:00
Mike LeBeau
e076bef97d Add new string to identify what speech recognizer the settings are for.
http://b/2546173

Change-Id: I7d59a69eba0e4f3c87586c968574d291a200352c
2010-03-30 14:16:34 -07:00
Jim Miller
9b0a726efc am 43630806: Merge "Fix 2527411: Remove unusable display timeouts from Settings." into froyo
Merge commit '43630806bbe4dab6509fe825938ce28b0b4b76c8' into kraken

* commit '43630806bbe4dab6509fe825938ce28b0b4b76c8':
  Fix 2527411: Remove unusable display timeouts from Settings.
2010-03-30 13:58:03 -07:00
Jim Miller
43630806bb Merge "Fix 2527411: Remove unusable display timeouts from Settings." into froyo 2010-03-30 13:51:43 -07:00
Robert Greenwalt
b6b3d17007 Add Title to the Tether help dialog
bug:2546313
Change-Id: Ib70118b40289abd3cafdecf7fc814ca48bce2960
2010-03-30 13:48:27 -07:00
Daniel Sandler
7811009111 Restore dependency between volume settings and silent mode.
Volume (of the ringer, notifications, media, and alarms) may
no longer be adjusted while the phone is in silent mode.
This was the behavior in Eclair and earlier releases.

This rolls back a small portion of change I724c43aa in the
interest of stability (see bugs listed below for weirdness
that occurs when the ringer's SeekBarVolumizer is visible
when the ringtone stream is muted).

Bug: 2552268
Bug: 2544706
Change-Id: I4858e6d85e5ec8c4bba83b649e24dd5915252eb2
2010-03-30 14:55:23 -04:00
Kenny Root
bb2ddbba63 am c0b5624c: Import revised translations
Merge commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b' into kraken

* commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b':
  Import revised translations
2010-03-30 09:46:20 -07:00
Kenny Root
c0b5624ccc Import revised translations
Change-Id: Ib730899be1485cc95ed6254279bae0c9413332b3
2010-03-30 09:33:49 -07:00
Jim Miller
d90b5a84d8 Fix 2527411: Remove unusable display timeouts from Settings.
This fix removes unusable display timeouts from Settings when
a device policy is enabled.

Patch 3 catches the case where not having any active policies clears the list.

Change-Id: I5b08d420c73b1c2e6fe2bb4e65656790290574cd
2010-03-29 22:16:55 -07:00
Jeff Brown
347c9a0544 Refresh apps when they become (un)available.
This fixes a bug in the current code that causes apps to be removed
from the list when they become unavailable.

Change-Id: Ic0b4c0fa34662ce3c458117b6807742448ec6575
2010-03-29 17:51:23 -07:00
Oscar Montemayor
dcdbfc5178 am 316c0db4: (-s ours) Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo
Merge commit '316c0db4ebe4ba491e147cad3eb6ac87ba31095d' into kraken

* commit '316c0db4ebe4ba491e147cad3eb6ac87ba31095d':
  DO NOT MERGE
2010-03-29 16:30:34 -07:00
Oscar Montemayor
316c0db4eb Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 2010-03-29 16:23:53 -07:00
Suchi Amalapurapu
29c8037335 Merge "Return empty string for new error code. The new string will be defined later." into froyo 2010-03-29 15:31:34 -07:00
Suchi Amalapurapu
9a3a1a4e58 Return empty string for new error code.
The new string will be defined later.

Change-Id: I7dc80ca96461e083cd8d8fba4815ac263dac61a4
2010-03-29 15:18:34 -07:00
San Mehat
8439822289 Settings: Fix for http://b/issue?id=2538399 (ANR while formatting sd)
Change-Id: I94b84a45557cbce706c37d5088d398283a639c80
Signed-off-by: San Mehat <san@google.com>
2010-03-29 14:32:02 -07:00
Oscar Montemayor
6f72be68c1 DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: Ib3321f3c0e3edf7dff947917ba9bad0f7da93c89
2010-03-26 18:45:05 -07:00
Dianne Hackborn
39e64e76c1 API council: don't allow admin add from new task.
Change-Id: I45f75f8e2c43ba0dae51d37e104d18d0b1a2cdbf
2010-03-26 13:24:39 -07:00
Jim Miller
449708b123 Merge "Fix 2535700: Add support for enforcing password quality" 2010-03-25 19:55:54 -07:00
Jim Miller
af366a3ed6 Fix 2535700: Add support for enforcing password quality
Change-Id: I908b4229d46061f3d450adec72b04276fe10afc1
2010-03-25 18:45:22 -07:00
Jaikumar Ganesh
9166a9635e Merge "Stop scanning as soon as device is picked in the device picker." 2010-03-25 15:57:17 -07:00
Jaikumar Ganesh
cdc5e6eea2 Stop scanning as soon as device is picked in the device picker.
This improves OPP transfer time by a couple of seconds.

Change-Id: I40e8f092ca3950a2d180b78f07f1cc717f2daaf6
2010-03-25 14:21:10 -07:00
Irfan Sheriff
9303d97e6a Remember Wifi state prior to tethering
We now remember whether Wifi was enabled
prior to enabling tethering. This will
allow us to restore Wifi when tethering
is disabled.

Bug: 2537983
Change-Id: Ia530563bd5647856d62cd59b67ae5156de6fd5d9
2010-03-25 12:23:18 -07:00