Irfan Sheriff
c02e258eaa
am e7879010: am ea87b6d7: Merge "Stop scanning after errors" into froyo
2010-04-17 09:44:54 -07:00
Irfan Sheriff
e7879010e3
am ea87b6d7: Merge "Stop scanning after errors" into froyo
...
Merge commit 'ea87b6d75cf04051b327c89338951c7d1377c16f' into kraken
* commit 'ea87b6d75cf04051b327c89338951c7d1377c16f':
Stop scanning after errors
2010-04-17 09:38:26 -07:00
Irfan Sheriff
ea87b6d75c
Merge "Stop scanning after errors" into froyo
2010-04-17 09:28:21 -07:00
Freeman Ng
73f877a68d
text changes to language picker
...
bug: 2129684
Change-Id: I0a525c32b1b2712d6d38fa202834931a3deeed2d
2010-04-16 17:43:32 -07:00
Irfan Sheriff
e81497095b
Stop scanning after errors
...
When scan fails for 3 times, we show a
failure toast and continue to scan.
In one case this caused infinite toasts,
until the user stopped wifi.
Its not clear what can cause this kind of
a state since wifi disable broadcast should
stop the scans. This fix will stop scans
after 3 continuous failures. Any wifi state
change will restart scan.
Bug: 2601937
Change-Id: I68733394cb3c9b76ffb15f7579e7af6c1f54d39c
2010-04-16 14:56:54 -07:00
Kenny Root
38750b4736
am 6fc1ded0: am 82164c36: Set encoding for HTML assets to UTF-8
2010-04-15 22:13:51 -07:00
Kenny Root
6fc1ded00b
am 82164c36: Set encoding for HTML assets to UTF-8
...
Merge commit '82164c365a01af8e3535c0e67b1fc3ed479391f0' into kraken
* commit '82164c365a01af8e3535c0e67b1fc3ed479391f0':
Set encoding for HTML assets to UTF-8
2010-04-15 22:09:34 -07:00
Kenny Root
82164c365a
Set encoding for HTML assets to UTF-8
...
Change-Id: Ia6989e94efc93e359b4035a1e0a99ab9262b7424
2010-04-15 21:40:34 -07:00
Kenny Root
1b606f02a8
am 9789ca7d: am ee381422: Merge "Import revised translations" into froyo
2010-04-15 13:31:54 -07:00
Robert Greenwalt
a05aa7243f
am e11b8812: am ddd1b875: Merge "Update the tethering help with correct link." into froyo
2010-04-15 12:32:51 -07:00
Irfan Sheriff
24e5193e3f
am 39a7379a: am c190c4f5: Merge "Grey out wifi tethering in airplane mode" into froyo
2010-04-15 12:32:49 -07:00
Jim Miller
73de1fdeed
am 02b57620: am c02a09aa: Merge "Fix 2594148: confirm PIN/Password before resetting device" into froyo
2010-04-15 12:32:46 -07:00
Suchi Amalapurapu
1ea77c43c8
am bbeb7365: am 6023d0b9: Merge "Fix 258181 Enable moving apps to external storage if install location is set and they had been moved to internal storage." into froyo
2010-04-15 12:32:44 -07:00
Kenny Root
9789ca7df0
am ee381422: Merge "Import revised translations" into froyo
...
Merge commit 'ee3814226706eb0600928c573254997c4ac148b9' into kraken
* commit 'ee3814226706eb0600928c573254997c4ac148b9':
Import revised translations
2010-04-15 06:43:16 -07:00
Jean-Baptiste Queru
379ec7b707
am 6e61b217: fix unintentional drift
2010-04-15 06:36:25 -07:00
Kenny Root
ee38142267
Merge "Import revised translations" into froyo
2010-04-15 05:56:36 -07:00
Kenny Root
398213ec34
Import revised translations
...
Change-Id: Ia29e5c15fbd147579185c31d03844ccc5a11032e
2010-04-14 20:34:50 -07:00
Robert Greenwalt
e11b881208
am ddd1b875: Merge "Update the tethering help with correct link." into froyo
...
Merge commit 'ddd1b8757e11fe4d3c65485c1142143bdbd2d1e9' into kraken
* commit 'ddd1b8757e11fe4d3c65485c1142143bdbd2d1e9':
Update the tethering help with correct link.
2010-04-14 16:30:55 -07:00
Irfan Sheriff
39a7379ad0
am c190c4f5: Merge "Grey out wifi tethering in airplane mode" into froyo
...
Merge commit 'c190c4f5350eeac9faa78690f0a8a359ace55f48' into kraken
* commit 'c190c4f5350eeac9faa78690f0a8a359ace55f48':
Grey out wifi tethering in airplane mode
2010-04-14 16:30:53 -07:00
Jim Miller
02b576205f
am c02a09aa: Merge "Fix 2594148: confirm PIN/Password before resetting device" into froyo
...
Merge commit 'c02a09aa565318f37d9481d05d50610fe722e4b4' into kraken
* commit 'c02a09aa565318f37d9481d05d50610fe722e4b4':
Fix 2594148: confirm PIN/Password before resetting device
2010-04-14 16:30:49 -07:00
Suchi Amalapurapu
bbeb73656c
am 6023d0b9: Merge "Fix 258181 Enable moving apps to external storage if install location is set and they had been moved to internal storage." into froyo
...
Merge commit '6023d0b93d18c868450c3390a43984acdfbad1eb' into kraken
* commit '6023d0b93d18c868450c3390a43984acdfbad1eb':
Fix 258181
2010-04-14 16:30:47 -07:00
Robert Greenwalt
ddd1b8757e
Merge "Update the tethering help with correct link." into froyo
2010-04-14 16:18:43 -07:00
Irfan Sheriff
c190c4f535
Merge "Grey out wifi tethering in airplane mode" into froyo
2010-04-14 15:32:32 -07:00
Irfan Sheriff
2d4e135fec
Grey out wifi tethering in airplane mode
...
When airplane mode is enabled, wifi tethering
should be disabled since there is no real
use case for it.
This also addresses the issue
of trying to restore Wifi (with tethering on)
when airplane mode is disabled.
Bug: 2594720
Change-Id: I7379ebed74a58b148ae82ed589d09aa2b9ca767d
2010-04-14 15:15:09 -07:00
Jim Miller
c02a09aa56
Merge "Fix 2594148: confirm PIN/Password before resetting device" into froyo
2010-04-14 14:47:48 -07:00
Suchi Amalapurapu
6023d0b93d
Merge "Fix 258181 Enable moving apps to external storage if install location is set and they had been moved to internal storage." into froyo
2010-04-14 14:05:38 -07:00
Jean-Baptiste Queru
6e61b2177b
fix unintentional drift
...
Change-Id: Ie13a72e323e9a1d2c9ec3c034c33792be6634fec
2010-04-14 10:40:48 -07:00
Robert Greenwalt
697d8c2e96
Update the tethering help with correct link.
...
Also adding localized versions.
bug:2561337
bug:2591665
Change-Id: Ic2543d0c524738f67c3bbf51e0c707117671b0e4
2010-04-14 09:49:32 -07:00
Jim Miller
2deec7edc9
Fix 2594148: confirm PIN/Password before resetting device
...
This fixes a bug where user was allowed to factory reset the device
without entering their PIN/Password.
It also fixes the same issue with MediaFormat (Settings->SD Card->Format).
Change-Id: I0677a50aa771ad8663513fd7ec398a70953dcde2
2010-04-14 01:15:05 -07:00
Jim Miller
c146eb7458
am 301827fd: am 838234f4: am fc5a0222: Fix 2582241: Update selection based on user setting instead.
2010-04-13 16:31:55 -07:00
Jim Miller
301827fd9d
am 838234f4: am fc5a0222: Fix 2582241: Update selection based on user setting instead.
2010-04-13 16:29:19 -07:00
Jim Miller
838234f46b
am fc5a0222: Fix 2582241: Update selection based on user setting instead.
...
Merge commit 'fc5a02225e8bca21f07543f55e1b51a33670c501' into kraken
* commit 'fc5a02225e8bca21f07543f55e1b51a33670c501':
Fix 2582241: Update selection based on user setting instead.
2010-04-13 16:25:58 -07:00
android-build SharedAccount
70d1edebdb
am 985e4245: Merge commit \'ec3f64cbcb5ba9719b0b132a0ce62248fac359ce\' into kraken-plus-aosp
2010-04-13 16:07:31 -07:00
android-build SharedAccount
985e4245a4
Merge commit 'ec3f64cbcb5ba9719b0b132a0ce62248fac359ce' into kraken-plus-aosp
2010-04-13 16:03:47 -07:00
Jim Miller
fc5a02225e
Fix 2582241: Update selection based on user setting instead.
...
When the user adds a DPM, Settings removes all display
timeout options with t > maxTimeout. It was incorrectly
setting the preference to maxTimeout.
The corrected code picks the user's preference if less
than maxTimeout or nothing otherwise.
Change-Id: I5a47fdce89f4cf216fd76bb585c3c0120b39db92
2010-04-13 15:31:41 -07:00
Suchi Amalapurapu
30de84777b
Fix 258181
...
Enable moving apps to external storage if install location is set and they had been
moved to internal storage.
Change-Id: I54b24303872dc525a86294c3d2b8c0c76dd366c5
2010-04-13 13:15:59 -07:00
Jean-Michel Trivi
ec3f64cbcb
am fced1268: Fix bug 2577511 NPE in TTS Settings A previous bug had caused incorrect settings to be saved, in particular the default language variant was not stored, unlike the default language and country. When settings were restored, this caused an invalid group of
...
Merge commit 'fced126829a74c9cbe9cbe993a3c54d1ff015a73' into kraken
* commit 'fced126829a74c9cbe9cbe993a3c54d1ff015a73':
Fix bug 2577511 NPE in TTS Settings
2010-04-13 11:53:47 -07:00
Jean-Michel Trivi
fced126829
Fix bug 2577511 NPE in TTS Settings
...
A previous bug had caused incorrect settings to be saved, in
particular the default language variant was not stored, unlike
the default language and country. When settings were restored, this
caused an invalid group of settings to be loaded, with a null
language variant. The fix consists in:
- discarding invalid default language settings
- reevaluating which language should be selected in the list of
available languages.
Change-Id: If58882a9acc28f14a78f6142fefa17d04ca4ad5d
2010-04-13 09:08:09 -07:00
Charles Chen
59e1ed6d9a
am c06bb82f: Merge "Fixing bug #2591288 " into froyo
...
Merge commit 'c06bb82f37f476813ea69dfd9f1514551719ac3b' into kraken
* commit 'c06bb82f37f476813ea69dfd9f1514551719ac3b':
Fixing bug #2591288
2010-04-12 20:42:40 -07:00
Charles Chen
c06bb82f37
Merge "Fixing bug #2591288 " into froyo
2010-04-12 20:38:32 -07:00
Charles Chen
8ca7d88c1b
Fixing bug #2591288
...
The language pref needs to be set after populating the entries
based on the selected engine.
Change-Id: I16db4428eee83052ff7c5115942eef4bf3d87454
2010-04-12 18:32:33 -07:00
Jim Miller
96db15ddff
am 4b2209e9: am 91523d60: Fix 2579923: Update language to make consistent with related feature.
2010-04-12 18:04:05 -07:00
Jim Miller
4b2209e9ef
am 91523d60: Fix 2579923: Update language to make consistent with related feature.
...
Merge commit '91523d601a6569ce9295a5617ca92a24582ff502' into kraken
* commit '91523d601a6569ce9295a5617ca92a24582ff502':
Fix 2579923: Update language to make consistent with related feature.
2010-04-12 17:55:56 -07:00
Jim Miller
91523d601a
Fix 2579923: Update language to make consistent with related feature.
...
Change-Id: I2f07b92d717e4661ec3a2c25775fa90ef62caed3
2010-04-12 17:43:41 -07:00
Charles Chen
065333c88e
am ac8398a9: am 28e7651f: Merge "Fixing bug 2577511 - incorrectly trying to access a setting." into froyo
2010-04-12 17:01:32 -07:00
Jim Miller
79f03eaaaf
am e587fb67: am 0b326a6f: Merge "Fix 2579923: Make changing lock screen method more discoverable." into froyo
2010-04-12 17:01:30 -07:00
Charles Chen
ac8398a9d7
am 28e7651f: Merge "Fixing bug 2577511 - incorrectly trying to access a setting." into froyo
...
Merge commit '28e7651f804003ee7843be8aed92fd72854496ee' into kraken
* commit '28e7651f804003ee7843be8aed92fd72854496ee':
Fixing bug 2577511 - incorrectly trying to access a setting.
2010-04-12 14:29:23 -07:00
Charles Chen
28e7651f80
Merge "Fixing bug 2577511 - incorrectly trying to access a setting." into froyo
2010-04-12 14:21:59 -07:00
Jim Miller
e587fb670a
am 0b326a6f: Merge "Fix 2579923: Make changing lock screen method more discoverable." into froyo
...
Merge commit '0b326a6fad8caf250b61cc49b962495202562a5c' into kraken
* commit '0b326a6fad8caf250b61cc49b962495202562a5c':
Fix 2579923: Make changing lock screen method more discoverable.
2010-04-12 13:55:43 -07:00
Jim Miller
0b326a6fad
Merge "Fix 2579923: Make changing lock screen method more discoverable." into froyo
2010-04-12 13:48:36 -07:00
