Commit Graph

2036 Commits

Author SHA1 Message Date
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
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
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
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
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
Charles Chen
681d0b8a9e Fixing bug 2577511 - incorrectly trying to access a setting.
Change-Id: I50f3b2f4878bea1392aa36d47015cd312a59e23a
2010-04-12 13:15:46 -07:00
Jim Miller
bbb4afa19f Fix 2579923: Make changing lock screen method more discoverable.
This changes the organization of lock screen security settings
to make choosing an alternate unlock method more discoverable.

Instead of having to disable the old lock method to use a new
one, the user now just has one set/change option in lock settings,
with a list of method-specific setting below it.

In addition, we ask the user to confirm their old credentials
before prompting them to choose a new one, which eliminates one
source of confusion.

Also, ChooseLockGeneric now shows a UI if quality isn't specified.
Any unlock method less secure than minimum specified by
DevicePolicyManager (if active) is greyed out.

Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
2010-04-11 23:28:33 -07:00
Irfan Sheriff
a4bbf55305 am 3957b3c1: Merge "scan only when wifi is enabled" into froyo
Merge commit '3957b3c147673d631feef2df49f1177289e08d41' into kraken

* commit '3957b3c147673d631feef2df49f1177289e08d41':
  scan only when wifi is enabled
2010-04-10 11:47:09 -07:00
Irfan Sheriff
3957b3c147 Merge "scan only when wifi is enabled" into froyo 2010-04-10 09:42:15 -07:00
Irfan Sheriff
2215c7f868 scan only when wifi is enabled
Bug: 2570611
Change-Id: Ibb51dee8ec110179ec28f9469526a1fe61e74d00
2010-04-09 17:52:26 -07:00
Charles Chen
df7d8ee6a5 am 8c8185b2: Fixing bugs 2577511 and 2581920. Making sure that the language, country, and variant defaults are always set to something to ensure that there won\'t be an NPE. Dismissing the ListPreference dialogs before a rotation to avoid list data corruption caused by
Merge commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f' into kraken

* commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f':
  Fixing bugs 2577511 and 2581920.
2010-04-08 22:42:14 -07:00
Charles Chen
8c8185b260 Fixing bugs 2577511 and 2581920.
Making sure that the language, country, and variant defaults are always
set to something to ensure that there won't be an NPE.
Dismissing the ListPreference dialogs before a rotation to avoid list
data corruption caused by the list being displayed while its data is
being re-initialized.

Change-Id: Iecdb3b4d415542dc8a4db162c930e6a6570a55f2
2010-04-08 16:51:35 -07:00
Jim Miller
d86cfddae6 am 2088c1ad: Merge "Fix 2579481: Fix change alphanumeric password security hole" into froyo
Merge commit '2088c1ada1f1997e7f363a5897dfc26b3635c80e' into kraken

* commit '2088c1ada1f1997e7f363a5897dfc26b3635c80e':
  Fix 2579481: Fix change alphanumeric password security hole
2010-04-08 13:44:55 -07:00
Jim Miller
2088c1ada1 Merge "Fix 2579481: Fix change alphanumeric password security hole" into froyo 2010-04-08 13:39:57 -07:00
Charles Chen
add29bfbbb am 755cb302: Merge "Fix for 2579445 - Using the correct strings for accessing Intent extras now." into froyo
Merge commit '755cb302e90b06820b313c09abfdf35ab899132c' into kraken

* commit '755cb302e90b06820b313c09abfdf35ab899132c':
  Fix for  2579445 - Using the correct strings for accessing Intent extras now.
2010-04-08 09:52:18 -07:00
Charles Chen
755cb302e9 Merge "Fix for 2579445 - Using the correct strings for accessing Intent extras now." into froyo 2010-04-08 09:45:17 -07:00
Jim Miller
9c1e7f8c4c Fix 2579481: Fix change alphanumeric password security hole
This fixes a bug where changing an alphanumeric password didn't
ask for the old password first.

Change-Id: I8ef4d2b4b87d02c6ddd23da3177e6802fc579c64
2010-04-08 00:48:52 -07:00
Suchi Amalapurapu
e6683e0ce1 am 3a95f926: Merge "Fix 2579461 Disable move when manifest option for install location is unspecified and install location is auto/internal" into froyo
Merge commit '3a95f92650e6bd9a994048878abda0950c11ec8b' into kraken

* commit '3a95f92650e6bd9a994048878abda0950c11ec8b':
  Fix 2579461
2010-04-07 21:32:26 -07:00
Suchi Amalapurapu
3a95f92650 Merge "Fix 2579461 Disable move when manifest option for install location is unspecified and install location is auto/internal" into froyo 2010-04-07 21:24:44 -07:00
Suchi Amalapurapu
4056459e9e Fix 2579461
Disable move when manifest option for install location is unspecified
and install location is auto/internal

Change-Id: Ic7a493ecbbed6017326e2ec728e25c6ea9de8223
2010-04-07 20:50:26 -07:00
Charles Chen
510bc4a2c3 Fix for 2579445 - Using the correct strings for accessing Intent extras now.
Change-Id: I8a0b8f3add637ffffed4119b976c800ab3251b72
2010-04-07 17:41:07 -07:00
Michael Chan
12b01014da am 0557a706: Merge "b/2174155 Remove debug logging in bluetooth" into froyo
Merge commit '0557a7062d4e40d895cbc86253a39cfe7f720f06' into kraken

* commit '0557a7062d4e40d895cbc86253a39cfe7f720f06':
  b/2174155 Remove debug logging in bluetooth
2010-04-07 16:35:48 -07:00
Charles Chen
ecfe14cb62 am 263b7704: Merge "Fix for bug #2577984 - Settings app was trying to access the TTS before the TTS was ready." into froyo
Merge commit '263b7704bc7567429a9ed145d8f572066e510c5f' into kraken

* commit '263b7704bc7567429a9ed145d8f572066e510c5f':
  Fix for bug #2577984 - Settings app was trying to access the TTS
2010-04-07 16:35:46 -07:00
Michael Chan
0557a7062d Merge "b/2174155 Remove debug logging in bluetooth" into froyo 2010-04-07 15:48:07 -07:00
Charles Chen
263b7704bc Merge "Fix for bug #2577984 - Settings app was trying to access the TTS before the TTS was ready." into froyo 2010-04-07 15:40:21 -07:00
Irfan Sheriff
0e10c0881f am 0b266964: Fix window leak on orientation change
Merge commit '0b2669647f1328d2df79fd2d259bc9d15433ba0a' into kraken

* commit '0b2669647f1328d2df79fd2d259bc9d15433ba0a':
  Fix window leak on orientation change
2010-04-07 15:04:07 -07:00
Irfan Sheriff
0b2669647f Fix window leak on orientation change
Use Activity managed dialogs

Bug: 2571764
Bug: 2571820
Change-Id: Id506988abd4200155774e92b31dd132519e29172
2010-04-07 14:38:42 -07:00
Charles Chen
cf31e652d6 Fix for bug #2577984 - Settings app was trying to access the TTS
before the TTS was ready.

Change-Id: Ic8127f12a2608982fb35e126c7522cf6747b93ac
2010-04-07 14:26:31 -07:00
Michael Chan
293867bd10 b/2174155 Remove debug logging in bluetooth
Change-Id: Ia40af3bb362fe99fbfda1a23cdcb04fb96af7ca8
2010-04-07 13:31:21 -07:00