OSDN Git Service
Michael Chan [Wed, 28 Apr 2010 20:17:36 +0000 (13:17 -0700)]
am
3a1204f7: am
6078d450: Merge "b/
2630339 Fixed the crash when an app requests BT to be enabled" into froyo
Merge commit '
3a1204f7cd231ed1c451ca90901eae082541b9ef' into kraken
* commit '
3a1204f7cd231ed1c451ca90901eae082541b9ef':
b/
2630339 Fixed the crash when an app requests BT to be enabled
Michael Chan [Wed, 28 Apr 2010 20:14:35 +0000 (13:14 -0700)]
am
6078d450: Merge "b/
2630339 Fixed the crash when an app requests BT to be enabled" into froyo
Merge commit '
6078d4503d6bc29fe6d2ff7784124a66fe48186e' into froyo-plus-aosp
* commit '
6078d4503d6bc29fe6d2ff7784124a66fe48186e':
b/
2630339 Fixed the crash when an app requests BT to be enabled
Michael Chan [Wed, 28 Apr 2010 19:43:00 +0000 (12:43 -0700)]
Merge "b/
2630339 Fixed the crash when an app requests BT to be enabled" into froyo
Michael Chan [Wed, 28 Apr 2010 18:10:40 +0000 (11:10 -0700)]
b/
2630339 Fixed the crash when an app requests BT to be enabled
For AlertActivity, the dialog needs to display at onCreate() time.
Otherwise, the decor view would be made. Trying to display the
dialog afterward would crash. Changed to AlertDialog instead.
Change-Id: I2ea8463b4c475b9b54746d0a722fa80eea3d4529
Kenny Root [Wed, 28 Apr 2010 16:47:07 +0000 (09:47 -0700)]
am
9fef437e: am
b3c872bf: Merge "Import revised translations" into froyo
Merge commit '
9fef437e04edd18f6406a49095403a1b71becf58' into kraken
* commit '
9fef437e04edd18f6406a49095403a1b71becf58':
Import revised translations
Kenny Root [Wed, 28 Apr 2010 16:34:05 +0000 (09:34 -0700)]
am
b3c872bf: Merge "Import revised translations" into froyo
Merge commit '
b3c872bf581e3f1ec3c6f03fbb90e43690de75b5' into froyo-plus-aosp
* commit '
b3c872bf581e3f1ec3c6f03fbb90e43690de75b5':
Import revised translations
Kenny Root [Wed, 28 Apr 2010 16:23:34 +0000 (09:23 -0700)]
Merge "Import revised translations" into froyo
Kenny Root [Tue, 27 Apr 2010 21:07:54 +0000 (14:07 -0700)]
Import revised translations
Change-Id: I91401f661d61a86d166baac1cad14b8897d0a467
Amith Yamasani [Tue, 27 Apr 2010 22:09:49 +0000 (15:09 -0700)]
am
567ca080: am
64ab5338: Fix regression in removing settings that aren\'t relevant for a platform.
Merge commit '
567ca0805e884c124e537edc7eac5cecf8d4e202' into kraken
* commit '
567ca0805e884c124e537edc7eac5cecf8d4e202':
Fix regression in removing settings that aren't relevant for a platform.
Amith Yamasani [Tue, 27 Apr 2010 22:08:20 +0000 (15:08 -0700)]
am
64ab5338: Fix regression in removing settings that aren\'t relevant for a platform.
Merge commit '
64ab5338cb0f90f8ee0787b0b98611670e6dee7e' into froyo-plus-aosp
* commit '
64ab5338cb0f90f8ee0787b0b98611670e6dee7e':
Fix regression in removing settings that aren't relevant for a platform.
Amith Yamasani [Tue, 27 Apr 2010 19:36:33 +0000 (12:36 -0700)]
Fix regression in removing settings that aren't relevant for a platform.
Bug:
2630695
The PreferenceCategories added into the hierarchy caused removePreference() to
not work, since the preferences to be removed were not immediate children of
the preference screen.
Create empty PreferenceCategory elements and pull the preferences to the same
depth as the categories.
Change-Id: I34826ea4d84cda0ecab75c66a73febe3d51e7c68
Michael Chan [Fri, 23 Apr 2010 17:51:54 +0000 (10:51 -0700)]
am
0bca1653: am
6368b25c: Merge "b/
2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo
Merge commit '
0bca1653cb78693e2c892efb48b944ddad98b66d' into kraken
* commit '
0bca1653cb78693e2c892efb48b944ddad98b66d':
b/
2608693 Fix the problem where BT was automatically reconnecting
Michael Chan [Fri, 23 Apr 2010 17:50:18 +0000 (10:50 -0700)]
am
6368b25c: Merge "b/
2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo
Merge commit '
6368b25c09992172b1900da3fd326c4fd2fdd203' into froyo-plus-aosp
* commit '
6368b25c09992172b1900da3fd326c4fd2fdd203':
b/
2608693 Fix the problem where BT was automatically reconnecting
Michael Chan [Fri, 23 Apr 2010 17:46:43 +0000 (10:46 -0700)]
Merge "b/
2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo
Suchi Amalapurapu [Fri, 23 Apr 2010 04:06:31 +0000 (21:06 -0700)]
am
b12b21a5: am
b99e029d: Fix string for uninstall button for system apps.
Merge commit '
b12b21a5b02468d601190de23f91675973ead44d' into kraken
* commit '
b12b21a5b02468d601190de23f91675973ead44d':
Fix string for uninstall button for system apps.
Suchi Amalapurapu [Fri, 23 Apr 2010 04:04:01 +0000 (21:04 -0700)]
am
b99e029d: Fix string for uninstall button for system apps.
Merge commit '
b99e029db14ae276a47da39da9378b6af9aef403' into froyo-plus-aosp
* commit '
b99e029db14ae276a47da39da9378b6af9aef403':
Fix string for uninstall button for system apps.
Michael Chan [Thu, 22 Apr 2010 23:07:35 +0000 (16:07 -0700)]
b/
2608693 Fix the problem where BT was automatically reconnecting
... after the user unpaired while docked.
Change-Id: I65642f440109968387401fc3c103da0f2b15f49f
Suchi Amalapurapu [Thu, 22 Apr 2010 23:03:16 +0000 (16:03 -0700)]
Fix string for uninstall button for system apps.
Change-Id: Iad26aae3d99447eddb6997e66c84080cdce727da
Suchi Amalapurapu [Thu, 22 Apr 2010 22:57:28 +0000 (15:57 -0700)]
am
a6bde3c9: am
a3683a51: Enable moving packages when install location is set to auto.
Merge commit '
a6bde3c9cd0db85538ff6166cb35f626c303352b' into kraken
* commit '
a6bde3c9cd0db85538ff6166cb35f626c303352b':
Enable moving packages when install location is set to auto.
Suchi Amalapurapu [Thu, 22 Apr 2010 22:54:34 +0000 (15:54 -0700)]
am
a3683a51: Enable moving packages when install location is set to auto.
Merge commit '
a3683a51faab316c1577cd13c708a41938bcc646' into froyo-plus-aosp
* commit '
a3683a51faab316c1577cd13c708a41938bcc646':
Enable moving packages when install location is set to auto.
Suchi Amalapurapu [Thu, 22 Apr 2010 17:56:51 +0000 (10:56 -0700)]
Enable moving packages when install location is set to auto.
Change-Id: If081ad949cb2aed6b3555275c582e951e579ffc9
Daniel Sandler [Thu, 22 Apr 2010 01:19:34 +0000 (18:19 -0700)]
am
dd379184: am
f0746678: Merge "Redesign vibration settings." into froyo
Merge commit '
dd3791844f7172fc9f231e4d7666a8f81f86daa7' into kraken
* commit '
dd3791844f7172fc9f231e4d7666a8f81f86daa7':
Redesign vibration settings.
Daniel Sandler [Thu, 22 Apr 2010 01:19:31 +0000 (18:19 -0700)]
am
9e2810bb: am
19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo
Merge commit '
9e2810bbed6a84b9e6de3464ec855f0b6c241ef1' into kraken
* commit '
9e2810bbed6a84b9e6de3464ec855f0b6c241ef1':
Labeled categories to help clarify Sound prefs.
Daniel Sandler [Thu, 22 Apr 2010 01:15:40 +0000 (18:15 -0700)]
am
f0746678: Merge "Redesign vibration settings." into froyo
Merge commit '
f07466782bb25ce4f2738133d0992f3531af28e5' into froyo-plus-aosp
* commit '
f07466782bb25ce4f2738133d0992f3531af28e5':
Redesign vibration settings.
Daniel Sandler [Thu, 22 Apr 2010 01:15:38 +0000 (18:15 -0700)]
am
19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo
Merge commit '
19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp
* commit '
19340d213c4bd4428f940a12d82a494f9e7cfaa6':
Labeled categories to help clarify Sound prefs.
Daniel Sandler [Thu, 22 Apr 2010 00:37:00 +0000 (17:37 -0700)]
Merge "Redesign vibration settings." into froyo
Daniel Sandler [Thu, 22 Apr 2010 00:36:48 +0000 (17:36 -0700)]
Merge "Labeled categories to help clarify Sound prefs." into froyo
Robert Greenwalt [Wed, 21 Apr 2010 20:06:53 +0000 (13:06 -0700)]
am
70631ab7: am
4c3b2f0c: Fix the tethering help page.
Merge commit '
70631ab7146b149b1f221d59131fe4efe9d91ac0' into kraken
* commit '
70631ab7146b149b1f221d59131fe4efe9d91ac0':
Fix the tethering help page.
Robert Greenwalt [Wed, 21 Apr 2010 20:04:30 +0000 (13:04 -0700)]
am
4c3b2f0c: Fix the tethering help page.
Merge commit '
4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b' into froyo-plus-aosp
* commit '
4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b':
Fix the tethering help page.
Daniel Sandler [Wed, 21 Apr 2010 19:24:24 +0000 (15:24 -0400)]
Redesign vibration settings.
Under the hood there remain three axes:
1. Are we in silent mode now? | RINGER_MODE_{VIBRATE,SILENT}
2. Do we vibrate in silent mode? | VIBRATE_IN_SILENT == 1
3. Do calls vibrate: | getVibrateSetting(VIBRATE_TYPE_RINGER)
- always | == VIBRATE_SETTING_ON
- never | == VIBRATE_SETTING_OFF
- only in silent | == VIBRATE_SETTING_ONLY_SILENT
We now expose this to the user much more simply by
collapsing (2) and (3) above, and discarding states that
don't make sense:
- VIBRATE_SETTING_OFF + VIBRATE_IN_SILENT
- VIBRATE_SETTING_ONLY_SILENT + !VIBRATE_IN_SILENT
Now we offer the user four choices:
Phone vibrate:
* "Never"
--> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_OFF
* "Always"
--> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ON
* "Only in silent mode"
--> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ONLY_SILENT
* "Only when not in silent mode"
--> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_ON
This should make it easier to choose exactly the behavior
the user wants as well as avoid nonsensical combinations of
settings.
Bug:
2598014
Change-Id: I9244d25ec97a3e2b572b71b521049debd22fa4e0
The Android Open Source Project [Wed, 21 Apr 2010 16:51:01 +0000 (09:51 -0700)]
am
2c3265af: merge from open-source master
Merge commit '
2c3265af7419c35c1084fd5c1e4726abcdd90f40' into kraken
* commit '
2c3265af7419c35c1084fd5c1e4726abcdd90f40':
Display current IP address in advanced Wifi settings screen
The Android Open Source Project [Wed, 21 Apr 2010 16:46:57 +0000 (09:46 -0700)]
merge from open-source master
Change-Id: I9d308271306bfcbdc0ef461605f800e5d48334a3
Daniel Sandler [Tue, 20 Apr 2010 13:56:52 +0000 (09:56 -0400)]
Labeled categories to help clarify Sound prefs.
Bug:
2598014
Change-Id: Ia846367fc479345bfd02c10fe1860373719334eb
Mike Lockwood [Tue, 20 Apr 2010 15:53:49 +0000 (11:53 -0400)]
Display current IP address in advanced Wifi settings screen
Change-Id: I47c6eece376e712b73add72057462926f7b2349f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Robert Greenwalt [Mon, 19 Apr 2010 19:22:48 +0000 (12:22 -0700)]
Fix the tethering help page.
It worked with language+country resources but for some resources it's just language.
Added a check to see if we had lanugage+country before deciding which to use.
bug:
2605981
Change-Id: Icb667a51f0c376f5188e3a43f264e236cd265468
Irfan Sheriff [Sat, 17 Apr 2010 16:38:26 +0000 (09:38 -0700)]
am
ea87b6d7: Merge "Stop scanning after errors" into froyo
Merge commit '
ea87b6d75cf04051b327c89338951c7d1377c16f' into kraken
* commit '
ea87b6d75cf04051b327c89338951c7d1377c16f':
Stop scanning after errors
Irfan Sheriff [Sat, 17 Apr 2010 16:28:21 +0000 (09:28 -0700)]
Merge "Stop scanning after errors" into froyo
Irfan Sheriff [Fri, 16 Apr 2010 21:56:54 +0000 (14:56 -0700)]
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
Kenny Root [Fri, 16 Apr 2010 05:09:34 +0000 (22:09 -0700)]
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
Kenny Root [Fri, 16 Apr 2010 04:40:34 +0000 (21:40 -0700)]
Set encoding for HTML assets to UTF-8
Change-Id: Ia6989e94efc93e359b4035a1e0a99ab9262b7424
Kenny Root [Thu, 15 Apr 2010 13:43:16 +0000 (06:43 -0700)]
am
ee381422: Merge "Import revised translations" into froyo
Merge commit '
ee3814226706eb0600928c573254997c4ac148b9' into kraken
* commit '
ee3814226706eb0600928c573254997c4ac148b9':
Import revised translations
Kenny Root [Thu, 15 Apr 2010 12:56:36 +0000 (05:56 -0700)]
Merge "Import revised translations" into froyo
Kenny Root [Thu, 15 Apr 2010 03:34:50 +0000 (20:34 -0700)]
Import revised translations
Change-Id: Ia29e5c15fbd147579185c31d03844ccc5a11032e
Robert Greenwalt [Wed, 14 Apr 2010 23:30:55 +0000 (16:30 -0700)]
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.
Irfan Sheriff [Wed, 14 Apr 2010 23:30:53 +0000 (16:30 -0700)]
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
Jim Miller [Wed, 14 Apr 2010 23:30:49 +0000 (16:30 -0700)]
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
Suchi Amalapurapu [Wed, 14 Apr 2010 23:30:47 +0000 (16:30 -0700)]
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
Robert Greenwalt [Wed, 14 Apr 2010 23:18:43 +0000 (16:18 -0700)]
Merge "Update the tethering help with correct link." into froyo
Irfan Sheriff [Wed, 14 Apr 2010 22:32:32 +0000 (15:32 -0700)]
Merge "Grey out wifi tethering in airplane mode" into froyo
Irfan Sheriff [Wed, 14 Apr 2010 22:15:09 +0000 (15:15 -0700)]
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
Jim Miller [Wed, 14 Apr 2010 21:47:48 +0000 (14:47 -0700)]
Merge "Fix
2594148: confirm PIN/Password before resetting device" into froyo
Suchi Amalapurapu [Wed, 14 Apr 2010 21:05:38 +0000 (14:05 -0700)]
Merge "Fix 258181 Enable moving apps to external storage if install location is set and they had been moved to internal storage." into froyo
Jean-Baptiste Queru [Wed, 14 Apr 2010 17:40:48 +0000 (10:40 -0700)]
fix unintentional drift
Change-Id: Ie13a72e323e9a1d2c9ec3c034c33792be6634fec
Robert Greenwalt [Tue, 13 Apr 2010 22:55:40 +0000 (15:55 -0700)]
Update the tethering help with correct link.
Also adding localized versions.
bug:
2561337
bug:
2591665
Change-Id: Ic2543d0c524738f67c3bbf51e0c707117671b0e4
Jim Miller [Wed, 14 Apr 2010 00:43:36 +0000 (17:43 -0700)]
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
Jim Miller [Tue, 13 Apr 2010 23:29:19 +0000 (16:29 -0700)]
am
838234f4: am
fc5a0222: Fix
2582241: Update selection based on user setting instead.
Jim Miller [Tue, 13 Apr 2010 23:25:58 +0000 (16:25 -0700)]
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.
android-build SharedAccount [Tue, 13 Apr 2010 23:03:47 +0000 (16:03 -0700)]
Jim Miller [Tue, 13 Apr 2010 22:31:41 +0000 (15:31 -0700)]
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
Suchi Amalapurapu [Tue, 13 Apr 2010 18:51:58 +0000 (11:51 -0700)]
Fix 258181
Enable moving apps to external storage if install location is set and they had been
moved to internal storage.
Change-Id: I54b24303872dc525a86294c3d2b8c0c76dd366c5
Jean-Michel Trivi [Tue, 13 Apr 2010 18:53:47 +0000 (11:53 -0700)]
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
Jean-Michel Trivi [Tue, 13 Apr 2010 03:15:28 +0000 (20:15 -0700)]
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
Charles Chen [Tue, 13 Apr 2010 03:42:40 +0000 (20:42 -0700)]
Charles Chen [Tue, 13 Apr 2010 03:38:32 +0000 (20:38 -0700)]
Merge "Fixing bug #
2591288" into froyo
Charles Chen [Tue, 13 Apr 2010 01:32:33 +0000 (18:32 -0700)]
Fixing bug #
2591288
The language pref needs to be set after populating the entries
based on the selected engine.
Change-Id: I16db4428eee83052ff7c5115942eef4bf3d87454
Jim Miller [Tue, 13 Apr 2010 00:55:56 +0000 (17:55 -0700)]
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.
Jim Miller [Tue, 13 Apr 2010 00:37:56 +0000 (17:37 -0700)]
Fix
2579923: Update language to make consistent with related feature.
Change-Id: I2f07b92d717e4661ec3a2c25775fa90ef62caed3
Charles Chen [Mon, 12 Apr 2010 21:29:23 +0000 (14:29 -0700)]
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.
Charles Chen [Mon, 12 Apr 2010 21:21:59 +0000 (14:21 -0700)]
Merge "Fixing bug
2577511 - incorrectly trying to access a setting." into froyo
Jim Miller [Mon, 12 Apr 2010 20:55:43 +0000 (13:55 -0700)]
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.
Jim Miller [Mon, 12 Apr 2010 20:48:36 +0000 (13:48 -0700)]
Merge "Fix
2579923: Make changing lock screen method more discoverable." into froyo
Charles Chen [Mon, 12 Apr 2010 19:06:30 +0000 (12:06 -0700)]
Fixing bug
2577511 - incorrectly trying to access a setting.
Change-Id: I50f3b2f4878bea1392aa36d47015cd312a59e23a
Jim Miller [Fri, 9 Apr 2010 02:40:19 +0000 (19:40 -0700)]
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
Irfan Sheriff [Sat, 10 Apr 2010 18:47:09 +0000 (11:47 -0700)]
am
3957b3c1: Merge "scan only when wifi is enabled" into froyo
Merge commit '
3957b3c147673d631feef2df49f1177289e08d41' into kraken
* commit '
3957b3c147673d631feef2df49f1177289e08d41':
scan only when wifi is enabled
Irfan Sheriff [Sat, 10 Apr 2010 16:42:15 +0000 (09:42 -0700)]
Merge "scan only when wifi is enabled" into froyo
Irfan Sheriff [Fri, 9 Apr 2010 18:34:33 +0000 (11:34 -0700)]
scan only when wifi is enabled
Bug:
2570611
Change-Id: Ibb51dee8ec110179ec28f9469526a1fe61e74d00
Charles Chen [Fri, 9 Apr 2010 05:42:14 +0000 (22:42 -0700)]
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.
Charles Chen [Thu, 8 Apr 2010 23:51:35 +0000 (16:51 -0700)]
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
Jim Miller [Thu, 8 Apr 2010 20:44:55 +0000 (13:44 -0700)]
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
Jim Miller [Thu, 8 Apr 2010 20:39:57 +0000 (13:39 -0700)]
Merge "Fix
2579481: Fix change alphanumeric password security hole" into froyo
Charles Chen [Thu, 8 Apr 2010 16:52:18 +0000 (09:52 -0700)]
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.
Charles Chen [Thu, 8 Apr 2010 16:45:17 +0000 (09:45 -0700)]
Merge "Fix for
2579445 - Using the correct strings for accessing Intent extras now." into froyo
Jim Miller [Thu, 8 Apr 2010 07:48:52 +0000 (00:48 -0700)]
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
Suchi Amalapurapu [Thu, 8 Apr 2010 04:32:26 +0000 (21:32 -0700)]
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
Suchi Amalapurapu [Thu, 8 Apr 2010 04:24:44 +0000 (21:24 -0700)]
Merge "Fix
2579461 Disable move when manifest option for install location is unspecified and install location is auto/internal" into froyo
Suchi Amalapurapu [Thu, 8 Apr 2010 02:34:48 +0000 (19:34 -0700)]
Fix
2579461
Disable move when manifest option for install location is unspecified
and install location is auto/internal
Change-Id: Ic7a493ecbbed6017326e2ec728e25c6ea9de8223
Charles Chen [Thu, 8 Apr 2010 00:41:07 +0000 (17:41 -0700)]
Fix for
2579445 - Using the correct strings for accessing Intent extras now.
Change-Id: I8a0b8f3add637ffffed4119b976c800ab3251b72
Michael Chan [Wed, 7 Apr 2010 23:35:48 +0000 (16:35 -0700)]
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
Charles Chen [Wed, 7 Apr 2010 23:35:46 +0000 (16:35 -0700)]
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
Michael Chan [Wed, 7 Apr 2010 22:48:07 +0000 (15:48 -0700)]
Merge "b/
2174155 Remove debug logging in bluetooth" into froyo
Charles Chen [Wed, 7 Apr 2010 22:40:21 +0000 (15:40 -0700)]
Merge "Fix for bug #
2577984 - Settings app was trying to access the TTS before the TTS was ready." into froyo
Irfan Sheriff [Wed, 7 Apr 2010 22:04:07 +0000 (15:04 -0700)]
am
0b266964: Fix window leak on orientation change
Merge commit '
0b2669647f1328d2df79fd2d259bc9d15433ba0a' into kraken
* commit '
0b2669647f1328d2df79fd2d259bc9d15433ba0a':
Fix window leak on orientation change
Irfan Sheriff [Tue, 6 Apr 2010 22:16:44 +0000 (15:16 -0700)]
Fix window leak on orientation change
Use Activity managed dialogs
Bug:
2571764
Bug:
2571820
Change-Id: Id506988abd4200155774e92b31dd132519e29172
Charles Chen [Wed, 7 Apr 2010 21:26:31 +0000 (14:26 -0700)]
Fix for bug #
2577984 - Settings app was trying to access the TTS
before the TTS was ready.
Change-Id: Ic8127f12a2608982fb35e126c7522cf6747b93ac
Michael Chan [Wed, 7 Apr 2010 20:31:21 +0000 (13:31 -0700)]
b/
2174155 Remove debug logging in bluetooth
Change-Id: Ia40af3bb362fe99fbfda1a23cdcb04fb96af7ca8
Michael Chan [Wed, 7 Apr 2010 20:19:51 +0000 (13:19 -0700)]
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
Michael Chan [Wed, 7 Apr 2010 20:12:33 +0000 (13:12 -0700)]
Merge "b/
2498180 b/
2568119 Retry if BT dock disconnects unexpectedly" into froyo
Adam Powell [Wed, 7 Apr 2010 16:54:29 +0000 (09:54 -0700)]
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
Adam Powell [Wed, 7 Apr 2010 16:48:28 +0000 (09:48 -0700)]
Merge "Fix bug
2564450 - prevent deadlock in BT settings" into froyo
Brad Fitzpatrick [Wed, 7 Apr 2010 16:25:06 +0000 (09:25 -0700)]
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.