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
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
5536c4a052
am a4bbf553: am 3957b3c1: Merge "scan only when wifi is enabled" into froyo
2010-04-10 11:58:12 -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
eb26cd99ae
am df7d8ee6: 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 corrup
2010-04-09 08:52:49 -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
62208929dd
am d86cfdda: am 2088c1ad: Merge "Fix 2579481: Fix change alphanumeric password security hole" into froyo
2010-04-08 13:56:54 -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
fea270154d
am add29bfb: am 755cb302: Merge "Fix for 2579445 - Using the correct strings for accessing Intent extras now." into froyo
2010-04-08 09:57:06 -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
9656a7f65e
am e6683e0c: am 3a95f926: 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:36:55 -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
648e368876
am 12b01014: am 0557a706: Merge "b/2174155 Remove debug logging in bluetooth" into froyo
2010-04-07 16:42:53 -07:00
Charles Chen
d08c58dc03
am ecfe14cb: am 263b7704: Merge "Fix for bug #2577984 - Settings app was trying to access the TTS before the TTS was ready." into froyo
2010-04-07 16:42:51 -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
7c85ce9242
am 0e10c088: am 0b266964: Fix window leak on orientation change
2010-04-07 15:09:43 -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
fa931df4f2
am 746fac2d: am d9db9e76: Merge "b/2498180 b/2568119 Retry if BT dock disconnects unexpectedly" into froyo
2010-04-07 13:53:00 -07:00
Michael Chan
293867bd10
b/2174155 Remove debug logging in bluetooth
...
Change-Id: Ia40af3bb362fe99fbfda1a23cdcb04fb96af7ca8
2010-04-07 13:31:21 -07:00
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
49c0cbd121
am 7cf43204: am bdbb57b6: Merge "Fix bug 2564450 - prevent deadlock in BT settings" into froyo
2010-04-07 10:00:24 -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
0d457f29f2
am a494ff40: am 6e29e073: Merge "Make Power Control widget a bit more responsive." into froyo
2010-04-07 09:33:41 -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
9389961b42
am e2dabc76: am 473111bc: Fixing bug #2575499 - TextToSpeech Settings did not verify that the current default language was still supported when the default engine changes.
2010-04-06 17:58:24 -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
