OSDN Git Service
Irfan Sheriff [Thu, 3 Jun 2010 18:14:40 +0000 (11:14 -0700)]
am
a4966840: am
de3e5665: Add phase2 authentication settings
Merge commit '
a496684019497395b71c6d460501197a74e21e0e' into kraken
* commit '
a496684019497395b71c6d460501197a74e21e0e':
Add phase2 authentication settings
Irfan Sheriff [Thu, 3 Jun 2010 18:13:21 +0000 (11:13 -0700)]
am
de3e5665: Add phase2 authentication settings
Merge commit '
de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp
* commit '
de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
Add phase2 authentication settings
Irfan Sheriff [Wed, 2 Jun 2010 22:25:13 +0000 (15:25 -0700)]
Add phase2 authentication settings
Bug:
2734813
Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
Jeff Brown [Fri, 28 May 2010 19:14:10 +0000 (12:14 -0700)]
am
7c5717c0: am
b0bcf9f7: Fix NPE in InstalledAppDetails activity when app not found.
Merge commit '
7c5717c0647bf31d0bf5a3b04971dabb4ee0a16c' into kraken
* commit '
7c5717c0647bf31d0bf5a3b04971dabb4ee0a16c':
Fix NPE in InstalledAppDetails activity when app not found.
Jeff Brown [Fri, 28 May 2010 19:12:21 +0000 (12:12 -0700)]
am
b0bcf9f7: Fix NPE in InstalledAppDetails activity when app not found.
Merge commit '
b0bcf9f7f50b56cb15a72be39fe11fe1351992c1' into froyo-plus-aosp
* commit '
b0bcf9f7f50b56cb15a72be39fe11fe1351992c1':
Fix NPE in InstalledAppDetails activity when app not found.
Michael Chan [Fri, 28 May 2010 00:11:24 +0000 (17:11 -0700)]
Merge "b/
2680057 Fixed a bug where bt won't connect when the phone is docked (if Settings wasn't running)." into kraken
Michael Chan [Sat, 15 May 2010 00:41:53 +0000 (17:41 -0700)]
b/
2680057 Fixed a bug where bt won't connect when the phone is docked (if Settings wasn't running).
The fix was to wait for the Bluetooth Headset service to come up before grabbing the settings and connecting.
Change-Id: I57affca2fe7d571c96cfeaf9ffe5439a0b02af45
Jeff Brown [Thu, 27 May 2010 21:29:34 +0000 (14:29 -0700)]
Fix NPE in InstalledAppDetails activity when app not found.
Added some extra checks to ensure that the activity exits from
onCreate, onResume and processMoveMsg promptly when the app
info cannot be refreshed.
Bug: b/
2711730
Change-Id: Ied22fadce09326dd33cf201e5e9281990bf3abbd
Irfan Sheriff [Wed, 26 May 2010 20:05:42 +0000 (13:05 -0700)]
am
c1a587c9: am
f3373c99: No quotes for password
Merge commit '
c1a587c9e980d9e341c0b966f1b4014d5c522078' into kraken
* commit '
c1a587c9e980d9e341c0b966f1b4014d5c522078':
No quotes for password
Irfan Sheriff [Wed, 26 May 2010 20:04:05 +0000 (13:04 -0700)]
am
f3373c99: No quotes for password
Merge commit '
f3373c99493878f4689a9d4865323c18a2065c3b' into froyo-plus-aosp
* commit '
f3373c99493878f4689a9d4865323c18a2065c3b':
No quotes for password
Irfan Sheriff [Mon, 24 May 2010 21:57:45 +0000 (14:57 -0700)]
No quotes for password
Putting quotes for password in soft AP is not useful.
It simplifies processing in framework.
Bug:
2708960
Change-Id: If44aeb336732aa8089d3e401b546ebf9b3cbd25a
Jaikumar Ganesh [Tue, 25 May 2010 01:00:56 +0000 (18:00 -0700)]
Set profiles as preferred and then try to connect.
The APIs implementations are being updated to expose
A2DP and HFP APIs. A connect call is not honoured if its
not a preferred profile. So if an app changes the preference
of the profile than it should first update the state before
making the connect call. The API for updating preference
might not be exposed and will be mostly an API for app with ADMIN
privileges like Settings app.
Change-Id: I58b8e8201357bcfe615dc2322342520319d9e355
The Android Open Source Project [Wed, 19 May 2010 16:16:39 +0000 (09:16 -0700)]
am
48112876: merge from open-source master
Merge commit '
4811287623e6cbd9a3584828087ea414454dbfc5' into kraken
* commit '
4811287623e6cbd9a3584828087ea414454dbfc5':
Removed Calls to deprecated APIs and unused imports
The Android Open Source Project [Wed, 19 May 2010 16:14:10 +0000 (09:14 -0700)]
am
50c7f2d9: merge from open-source master
Merge commit '
50c7f2d92a8100982c49027058fb05069e4a1e2a' into kraken
* commit '
50c7f2d92a8100982c49027058fb05069e4a1e2a':
A button in the master clear information screen was partly hidden.
The Android Open Source Project [Wed, 19 May 2010 16:12:47 +0000 (09:12 -0700)]
merge from open-source master
Change-Id: Id9c258165d9bb326271218a562d782fa52608213
The Android Open Source Project [Wed, 19 May 2010 15:30:08 +0000 (08:30 -0700)]
merge from open-source master
Change-Id: I5698914cf9093696ad851412a510a99419989d17
Romain Guy [Wed, 19 May 2010 07:00:14 +0000 (00:00 -0700)]
Merge "Removed Calls to deprecated APIs and unused imports"
Dianne Hackborn [Tue, 18 May 2010 22:28:29 +0000 (15:28 -0700)]
am
fcc577b2: am
f9762a2c: Fix issue #
2694643: Remove/Resolve STOPSHIP
Merge commit '
fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken
* commit '
fcc577b2a15c37c1bbed995c27a48594dc43dfef':
Fix issue #
2694643: Remove/Resolve STOPSHIP
Dianne Hackborn [Tue, 18 May 2010 22:26:17 +0000 (15:26 -0700)]
am
f9762a2c: Fix issue #
2694643: Remove/Resolve STOPSHIP
Merge commit '
f9762a2c39bc4189329c89272bc83ba11c2c9624' into froyo-plus-aosp
* commit '
f9762a2c39bc4189329c89272bc83ba11c2c9624':
Fix issue #
2694643: Remove/Resolve STOPSHIP
Dianne Hackborn [Tue, 18 May 2010 22:22:32 +0000 (15:22 -0700)]
Fix issue #
2694643: Remove/Resolve STOPSHIP
*poof*
Change-Id: I386473bc6a6cd0d68d1b0a1b4871caef75f1ade8
Henrik Tuszynski [Wed, 12 May 2010 06:44:09 +0000 (08:44 +0200)]
A button in the master clear information screen was partly hidden.
The master reset button was partially hidden in landscape mode.
This change nests the current layout in a ScrollView making the
layout scrollable.
Change-Id: I2f7b8a222e3a25930b134314640b1c765b964254
Irfan Sheriff [Mon, 17 May 2010 21:05:00 +0000 (14:05 -0700)]
am
75a43c60: am
cd8f068e: Merge "Fix crash for tether with quotes in SSID" into froyo
Merge commit '
75a43c605449e72074fc55576c8e712ff12906db' into kraken
* commit '
75a43c605449e72074fc55576c8e712ff12906db':
Fix crash for tether with quotes in SSID
Kenny Root [Mon, 17 May 2010 21:02:32 +0000 (14:02 -0700)]
am
7a4cff13: (-s ours) am
28b245c0: Import revised translations
Merge commit '
7a4cff13c94b759467702374befa3a7cfb878529' into kraken
* commit '
7a4cff13c94b759467702374befa3a7cfb878529':
Import revised translations
Irfan Sheriff [Mon, 17 May 2010 20:29:00 +0000 (13:29 -0700)]
am
cd8f068e: Merge "Fix crash for tether with quotes in SSID" into froyo
Merge commit '
cd8f068ed2b5385ec420c1cabc8b1f62558a1448' into froyo-plus-aosp
* commit '
cd8f068ed2b5385ec420c1cabc8b1f62558a1448':
Fix crash for tether with quotes in SSID
Irfan Sheriff [Mon, 17 May 2010 20:25:58 +0000 (13:25 -0700)]
Merge "Fix crash for tether with quotes in SSID" into froyo
Irfan Sheriff [Mon, 17 May 2010 19:46:03 +0000 (12:46 -0700)]
Fix crash for tether with quotes in SSID
Multiple quotes cause havoc with netd interaction right now.
The solution is to revert the changes for WifiConfiguration on
Access Point side done in Change I0f1e508b and remove all quotes
in the SSID.
Essentially a low risk one line change on top of the revert.
We dont expose API for WifiConfiguration on AP side. This solution
essentially means we treat SSID in WifiConfiguration on AP side
differently. When we do expose things, we should make things consistent.
Change-Id: I0a7e5074b83ace743fc843ee61c1ff86cde8267f
Christian Mehlmauer [Mon, 17 May 2010 19:25:15 +0000 (21:25 +0200)]
Removed Calls to deprecated APIs and unused imports
Change-Id: Ibaaf3418ec2c97a99495eca7ea546af415370c3e
Kenny Root [Mon, 17 May 2010 18:45:04 +0000 (11:45 -0700)]
am
28b245c0: Import revised translations
Merge commit '
28b245c01d49b7710d1a918849fe8f159e8f43b5' into froyo-plus-aosp
* commit '
28b245c01d49b7710d1a918849fe8f159e8f43b5':
Import revised translations
Kenny Root [Mon, 17 May 2010 18:42:19 +0000 (11:42 -0700)]
Import revised translations
Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
Chung-yih Wang [Sat, 15 May 2010 06:18:27 +0000 (23:18 -0700)]
am
8719f0d2: am
8c81257f: Fix the double-quoted SSID issue.
Merge commit '
8719f0d20a301cc7509c9bd3ce3275f551329dd7' into kraken
* commit '
8719f0d20a301cc7509c9bd3ce3275f551329dd7':
Fix the double-quoted SSID issue.
Chung-yih Wang [Sat, 15 May 2010 06:16:25 +0000 (23:16 -0700)]
am
8c81257f: Fix the double-quoted SSID issue.
Merge commit '
8c81257f70fabeaa505e292bd0c2226dd5eefc4c' into froyo-plus-aosp
* commit '
8c81257f70fabeaa505e292bd0c2226dd5eefc4c':
Fix the double-quoted SSID issue.
Chung-yih Wang [Sat, 15 May 2010 02:57:23 +0000 (10:57 +0800)]
Fix the double-quoted SSID issue.
Bug id http://b/issue?id=
2684571
Change-Id: I0f1e508b9a3d0fefcef28235380392368a51e42a
The Android Open Source Project [Wed, 12 May 2010 17:39:17 +0000 (10:39 -0700)]
am
542b8f2b: merge from open-source master
Merge commit '
542b8f2b471cbac5a2f4b550eae65caf24266d36' into kraken
* commit '
542b8f2b471cbac5a2f4b550eae65caf24266d36':
Fixing Swedish translations of a few texts under "Phone info".
The Android Open Source Project [Wed, 12 May 2010 17:37:51 +0000 (10:37 -0700)]
am
0b53ac73: merge from open-source master
Merge commit '
0b53ac733c36e14a5e2e948393360bba00048ccb' into kraken
* commit '
0b53ac733c36e14a5e2e948393360bba00048ccb':
The password in the APN settings is shown instead of stars
The Android Open Source Project [Wed, 12 May 2010 16:34:10 +0000 (09:34 -0700)]
merge from open-source master
Change-Id: I0b8f7bedc11e98f2c790669bbbe5a7807947e196
The Android Open Source Project [Wed, 12 May 2010 16:33:50 +0000 (09:33 -0700)]
merge from open-source master
Change-Id: Iab9eddbfea000b9403c92a211c37b93772f2a9c7
Henrik Hall [Wed, 24 Feb 2010 07:05:05 +0000 (08:05 +0100)]
Fixing Swedish translations of a few texts under "Phone info".
* Build number
* Firmware version
Change-Id: Ifb8e84bcea86c7b95073e455f97f9b13c720c400
Romain Guy [Tue, 11 May 2010 17:51:12 +0000 (10:51 -0700)]
Merge "The password in the APN settings is shown instead of stars"
Robert Greenwalt [Mon, 10 May 2010 17:16:29 +0000 (10:16 -0700)]
am
482eadea: am
e434bfb2: String change - wifi tether = hotspot
Merge commit '
482eadeae85a1764b86133172d11364df6ce7227' into kraken
* commit '
482eadeae85a1764b86133172d11364df6ce7227':
String change - wifi tether = hotspot
Robert Greenwalt [Mon, 10 May 2010 17:14:36 +0000 (10:14 -0700)]
am
e434bfb2: String change - wifi tether = hotspot
Merge commit '
e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp
* commit '
e434bfb216682a6ca331fa54ce58a2bff7adf8d7':
String change - wifi tether = hotspot
Michael Chan [Mon, 10 May 2010 16:50:04 +0000 (09:50 -0700)]
am
15bb4754: am
d2c81986: b/
2652059 Refresh UI after bond state change
Merge commit '
15bb47545686395c0d94b54dd67c4f080fe625e5' into kraken
* commit '
15bb47545686395c0d94b54dd67c4f080fe625e5':
b/
2652059 Refresh UI after bond state change
Michael Chan [Mon, 10 May 2010 16:43:38 +0000 (09:43 -0700)]
am
d2c81986: b/
2652059 Refresh UI after bond state change
Merge commit '
d2c81986c236ed680cfae5e420561028ae4cc0d2' into froyo-plus-aosp
* commit '
d2c81986c236ed680cfae5e420561028ae4cc0d2':
b/
2652059 Refresh UI after bond state change
Robert Greenwalt [Sat, 8 May 2010 22:20:24 +0000 (15:20 -0700)]
String change - wifi tether = hotspot
bug:
2664412
Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
Michael Chan [Fri, 7 May 2010 22:24:22 +0000 (15:24 -0700)]
b/
2652059 Refresh UI after bond state change
Change-Id: I8f8a939ba3f383aae36091986cea4e8a6eae13fb
Michael Chan [Tue, 4 May 2010 19:45:29 +0000 (12:45 -0700)]
am
d17eb48e: am
1308453b: b/
2652059 Fixed the broken BT connects/disconnects after unpair
Merge commit '
d17eb48e9c87e02cbcb42899915dbfc921075231' into kraken
* commit '
d17eb48e9c87e02cbcb42899915dbfc921075231':
b/
2652059 Fixed the broken BT connects/disconnects after unpair
Michael Chan [Tue, 4 May 2010 19:36:27 +0000 (12:36 -0700)]
am
1308453b: b/
2652059 Fixed the broken BT connects/disconnects after unpair
Merge commit '
1308453b16c2ca85a456bd4bb7f3c71c916bd83e' into froyo-plus-aosp
* commit '
1308453b16c2ca85a456bd4bb7f3c71c916bd83e':
b/
2652059 Fixed the broken BT connects/disconnects after unpair
Michael Chan [Tue, 4 May 2010 06:05:06 +0000 (23:05 -0700)]
b/
2652059 Fixed the broken BT connects/disconnects after unpair
The unpair command was stuck in the queue.
Change-Id: I803cb10adcfaedbe6fd202e0db463593880e4280
Kenny Root [Thu, 29 Apr 2010 23:45:47 +0000 (16:45 -0700)]
am
a359fb77: (-s ours) am
6d409870: Import revised translations
Merge commit '
a359fb77d41ab3ac00a1020b42fa2e898904c1af' into kraken
* commit '
a359fb77d41ab3ac00a1020b42fa2e898904c1af':
Import revised translations
Kenny Root [Thu, 29 Apr 2010 23:03:30 +0000 (16:03 -0700)]
am
6d409870: Import revised translations
Merge commit '
6d409870981361af2f547fba05877e7f405af75a' into froyo-plus-aosp
* commit '
6d409870981361af2f547fba05877e7f405af75a':
Import revised translations
Kenny Root [Thu, 29 Apr 2010 22:56:53 +0000 (15:56 -0700)]
Import revised translations
Change-Id: If5691d275bf86c94038a53beed65a93dad65b450
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