OSDN Git Service
Chung-yih Wang [Sat, 11 Sep 2010 02:24:46 +0000 (10:24 +0800)]
Enable the call setting when the VoIP feature is supported.
If the VoIP feature is included, the user need to be able to
configure the internet call settings even if it is in airplan mode.
Change-Id: I00d73fb0d9213162b8a9887cad0f800418446787
Eric Fischer [Fri, 10 Sep 2010 20:07:48 +0000 (13:07 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I3a1f1eeb653d982ddc30c765a4a530aa48a364bf
Eric Fischer [Tue, 7 Sep 2010 18:04:17 +0000 (11:04 -0700)]
Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 3 Sep 2010 21:57:32 +0000 (14:57 -0700)]
Preserve old translations for changed strings. DO NOT MERGE
Change-Id: I7ce80a0d57a6ff09dd12abab5ba6df9019d740ca
Dianne Hackborn [Fri, 3 Sep 2010 19:53:20 +0000 (12:53 -0700)]
Follow rename.
Change-Id: I255df1429b999943d7b3d2ca2b453045f195fdb9
Dianne Hackborn [Fri, 3 Sep 2010 01:19:02 +0000 (18:19 -0700)]
Fix issue #
2905454: Crash observed while accessing Battery history page on passion/GRG40
Change-Id: Ifd08744d909c2d87e5cdf4eedcc5af1a86548e60
Erik Ljungberg [Thu, 19 Aug 2010 15:47:44 +0000 (17:47 +0200)]
BT: The Phone doesn't "wake up" when trying to pair with it.
To improve the pairing request usability:
- In the case where a notification shall be used the standard
notification sound is added
- When the screen is off notification is always used.
Change-Id: I751a7913517c64de5d7ba06d7c17358197d002c5
Dianne Hackborn [Tue, 31 Aug 2010 00:43:05 +0000 (17:43 -0700)]
Show correct process dependency for providers.
Use the new API that allows us to always retrieve the desired
provider info.
Change-Id: I9265d8f169ee34c87f0ca89315ee78bb2ae49674
Brad Fitzpatrick [Mon, 30 Aug 2010 18:35:23 +0000 (11:35 -0700)]
Merge "Make power control widget be more responsive. Fix StrictMode violations." into gingerbread
Eric Fischer [Sat, 28 Aug 2010 00:17:47 +0000 (17:17 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I258c6a8b900eae6e101ad910b9414e5ba857246d
Brad Fitzpatrick [Fri, 27 Aug 2010 23:59:41 +0000 (16:59 -0700)]
Make power control widget be more responsive. Fix StrictMode violations.
Also use new location providers changed broadcast intent, and fix a bug
introduced in Froyo where we stopped observing the SYSTEM_CLOSE_DIALOGS
intent so we fell out of sync (more often) with the sync settings.
Now even responsive during the boot I/O storm! (except for toggling
brightness, which still does disk writes from the UI thread...)
BUG=
2956025
Change-Id: I77876ff6e0be2325c15d5f08bb2970edf233f839
Jean-Michel Trivi [Wed, 25 Aug 2010 22:43:17 +0000 (15:43 -0700)]
Add new string for the notification to be displayed when the user
installs a new TTS engine.
Change-Id: If370cc40b0da858ec838711190d6b660b1c34ebf
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:09:14 +0000 (19:09 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I1d1d611f22f6d0bc9dbdd29a4b1eff497e1afd74
Dianne Hackborn [Fri, 20 Aug 2010 22:10:26 +0000 (15:10 -0700)]
Fix issue #
2895310: Please fix problems with your strings
Make up some numbers.
Change-Id: Ib3d1018282efd4979be8ef22384c9d64e67456e4
Dianne Hackborn [Fri, 20 Aug 2010 01:11:51 +0000 (18:11 -0700)]
More tricksy.
Change-Id: I4752344e0eea302ba28e907ff5bd5c20f74a82b7
Dianne Hackborn [Thu, 19 Aug 2010 00:47:39 +0000 (17:47 -0700)]
A couple small settings fixes:
- Correctly position WIFI/GPS charts.
- Start out with running services hidden in case we need to show
the progress bar.
Change-Id: I8852f334f68f4e9122b5d688d9fd57d0f94d94d8
Eric Fischer [Tue, 17 Aug 2010 23:45:27 +0000 (16:45 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: If954fbc7c9ff4898e76e6e4dcde4f9dffdd7cbf2
Dianne Hackborn [Mon, 16 Aug 2010 00:28:36 +0000 (17:28 -0700)]
Make running services initial update async.
Also fix the value show for an app's awake time.
Change-Id: I801681d3a1d47a6bb1f3fb8cc5b0ef009201146f
Dianne Hackborn [Fri, 13 Aug 2010 21:15:44 +0000 (14:15 -0700)]
Some improvements to the battery usage UI:
- Show wake lock usage in the battery history.
- Show WIFI usage in the battery history.
- Show the amount an app has held a wake lock in the app details.
- Also fix service run time computation in running services.
Change-Id: I5aa959857f83808fbc709f65204f59bbfb73935b
Dianne Hackborn [Thu, 12 Aug 2010 05:28:29 +0000 (22:28 -0700)]
More version info.
Change-Id: I006951028135e95ce7bb2463f00649a691b5f615
Eric Fischer [Tue, 10 Aug 2010 18:52:27 +0000 (11:52 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iecf4053f74ab4c38b165291feef5211ce4cfc83e
Eric Fischer [Wed, 4 Aug 2010 17:45:20 +0000 (10:45 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic83849d97650cec0560d847a962756c53d65ea78
Dianne Hackborn [Fri, 30 Jul 2010 21:26:37 +0000 (14:26 -0700)]
Manage apps "third party" and "on sd card" filters were swapped.
Also change the app details screen to make use of the common
ApplicationsState object for its UI, improving launch performance.
Change-Id: I387ed72a06d44aab47a85692c10247ce488c605c
Dianne Hackborn [Thu, 29 Jul 2010 00:10:42 +0000 (17:10 -0700)]
Improvements to manage apps / running services:
- Running services now keeps a single data structure to make
switching through the UI a lot faster.
- Display text when there are no apps.
- Fix deadlock.
- Add new preference entry to view manage apps for storage use.
- Etc.
Change-Id: I0f5babf407ed7e84169f59584ddcb6cd0e9d67d9
Dianne Hackborn [Tue, 27 Jul 2010 21:41:34 +0000 (14:41 -0700)]
Rewrite Manage Applications to be faster and simpler.
Change-Id: I4cf405e83a369cb935bccf375798557ffd93e14e
Dianne Hackborn [Sun, 25 Jul 2010 19:41:05 +0000 (12:41 -0700)]
Fix drawing of phone signal chart.
Change-Id: I15253624ab37d3a494a541d813ee1bf2187e145d
Dianne Hackborn [Sun, 25 Jul 2010 03:04:51 +0000 (20:04 -0700)]
Add UI to report a running service to the developer.
Change-Id: Ia3f666344ee02bc96784b198533392252230bd80
Dianne Hackborn [Sun, 25 Jul 2010 00:51:23 +0000 (17:51 -0700)]
Various small UI cleanup in settings.
- Remove title bar in various places where it is not useful.
- Tighten up some text to avoid spilling across lines.
- Remove strong wording about turning off GPS to save battery.
Change-Id: Ieed9f8f3a3cf6a892a49362677594b447a266925
Dianne Hackborn [Sat, 24 Jul 2010 23:50:04 +0000 (16:50 -0700)]
Add facility to disable system packages.
Change-Id: I762c76993e0f88d255dfc04acbea6c6adea7103d
Dianne Hackborn [Fri, 23 Jul 2010 07:23:21 +0000 (00:23 -0700)]
Add battery history details activity.
Adds a full-screen version of the battery history visualization,
which you can get to by tapping on the battery history chart in
the summary screen.
Change-Id: Ibca5ef3d0883ff6ffa80b6ddca3c8ac838c85842
Kenny Root [Mon, 21 Jun 2010 02:00:54 +0000 (19:00 -0700)]
Import revised translations
Change-Id: Iff09dd159fc2aecef68ce8b3cf26e6832865f7e5
Irfan Sheriff [Sat, 26 Jun 2010 02:50:14 +0000 (19:50 -0700)]
Merge "Allow soft AP settings config before bring up" into gingerbread
Dianne Hackborn [Thu, 24 Jun 2010 18:29:50 +0000 (11:29 -0700)]
Allow user to see and stop heavy-weight processes.
Change-Id: If5caed3972ab03a54fbf8c459cdfc136e4bdc020
Irfan Sheriff [Thu, 24 Jun 2010 18:31:41 +0000 (11:31 -0700)]
Allow soft AP settings config before bring up
Bug:
2538623
Change-Id: I4b927deb0e4981c164744b85e5c85c3fc95a31eb
Dianne Hackborn [Tue, 22 Jun 2010 23:08:50 +0000 (16:08 -0700)]
More battery level improvements.
Take into account durations when there is no data due to
a reboot. Also show times when charging and screen is on.
Change-Id: I84e75efb3339b0596bea3bbca9dbea6d9f864537
Dianne Hackborn [Mon, 21 Jun 2010 22:04:04 +0000 (15:04 -0700)]
Merge "Small improvements to bettery level graphing." into gingerbread
Dianne Hackborn [Mon, 21 Jun 2010 21:42:49 +0000 (14:42 -0700)]
Small improvements to bettery level graphing.
Deal with data that doesn't start with updates; don't try to
make lines horizontal (a battery doesn't change is a battery
that is dead!).
Change-Id: I10a7938a04cc5ed5e92a55857851d8d70b64c3b6
Kenny Root [Mon, 21 Jun 2010 20:09:32 +0000 (13:09 -0700)]
am
4e012037: (-s ours) Import revised translations
Merge commit '
4e01203746710646227470390d4a9f7fb52c6238' into gingerbread
* commit '
4e01203746710646227470390d4a9f7fb52c6238':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 18:04:50 +0000 (11:04 -0700)]
Import revised translations
Change-Id: I170f4347b73055ce204d75cfa1bef5cc22b928b1
Kenny Root [Mon, 21 Jun 2010 16:02:02 +0000 (09:02 -0700)]
am
db751db4: (-s ours) Import revised translations
Merge commit '
db751db4c919ea4ab981d52017b9741d386dad19' into gingerbread
* commit '
db751db4c919ea4ab981d52017b9741d386dad19':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 02:00:54 +0000 (19:00 -0700)]
Import revised translations
Change-Id: Iff09dd159fc2aecef68ce8b3cf26e6832865f7e5
Dianne Hackborn [Thu, 17 Jun 2010 02:32:09 +0000 (19:32 -0700)]
Merge "Improve battery chart, fuel gauge now shows time since charged." into gingerbread
Dianne Hackborn [Tue, 15 Jun 2010 00:18:42 +0000 (17:18 -0700)]
Improve battery chart, fuel gauge now shows time since charged.
Switch default stats to new time since charged. Update to follow
API changes. Improve the battery history chart.
Change-Id: I7de4f09ae5638ec3a034745244082e51b1369929
Dianne Hackborn [Tue, 15 Jun 2010 00:18:42 +0000 (17:18 -0700)]
Improve battery chart, fuel gauge now shows time since charged.
Switch default stats to new time since charged. Update to follow
API changes. Improve the battery history chart.
Dianne Hackborn [Fri, 11 Jun 2010 17:25:54 +0000 (10:25 -0700)]
Show history of battery level.
Also clean up to remove dead code for running services and old
battery usage UI.
Finally some string improvements from Roy.
Change-Id: I8765a4c744b92edd1505f14c47fea57b918e5d7b
Kenny Root [Thu, 10 Jun 2010 18:54:49 +0000 (11:54 -0700)]
am
dc2fdd09: (-s ours) Import revised translations
Merge commit '
dc2fdd091fc23fe4d4001cc5caacdddbd6becddd' into kraken
* commit '
dc2fdd091fc23fe4d4001cc5caacdddbd6becddd':
Import revised translations
Kenny Root [Thu, 10 Jun 2010 18:36:34 +0000 (11:36 -0700)]
Import revised translations
Change-Id: I927a602963d383fbfe12d4b897a2e86bf1783f34
Kenny Root [Thu, 10 Jun 2010 06:19:47 +0000 (23:19 -0700)]
am
a791e2d6: (-s ours) Import revised translations
Merge commit '
a791e2d63bfb5218db4890184e68381d4261818f' into kraken
* commit '
a791e2d63bfb5218db4890184e68381d4261818f':
Import revised translations
Kenny Root [Thu, 10 Jun 2010 05:51:38 +0000 (22:51 -0700)]
Import revised translations
Change-Id: Ib63294fbc8fedc0517f38bbffd4c0fe536866bdc
Jaikumar Ganesh [Mon, 7 Jun 2010 21:12:25 +0000 (14:12 -0700)]
Merge "Fix bug
2713245 - Remove job queue from BT settings" into kraken
Jaikumar Ganesh [Mon, 7 Jun 2010 21:12:01 +0000 (14:12 -0700)]
Merge "Changing disconnectHeadset calls." into kraken
Dianne Hackborn [Mon, 7 Jun 2010 05:51:42 +0000 (22:51 -0700)]
New Running Services UI.
This introduces a simplified (thanks, dsandler!) UI for Running Services,
collapsing the groups of apps and processes into single lines. Tapping
on a line moves to a new activity showing details on that group, where the
stop functionality is now available.
This UI is now also integrated into Manage Applications, as the Running
tab. You no longer get a really confusing, misleading, scary list of
every package that appears to be laying around for some reason.
The code was also re-organized, to put everything related to Manage
Applications and Running Services under its own package.
There is still some clean-up -- some performance improvements (such as
not re-computing the world when we switch to the details view), and if
this looks good then eradicating the old running services UI.
Change-Id: I3fc059c18060600742cab5b455d11ff74bf45ae3
Adam Powell [Tue, 25 May 2010 23:32:02 +0000 (16:32 -0700)]
Fix bug
2713245 - Remove job queue from BT settings
Change-Id: I4e7269474cd270f22b16e9317e933ab87bff4929
Jaikumar Ganesh [Wed, 2 Jun 2010 00:52:44 +0000 (17:52 -0700)]
Changing disconnectHeadset calls.
Change-Id: I2f058f28a09e983cd42e5a74bb4ffea19f07b880
Kenny Root [Fri, 4 Jun 2010 00:09:28 +0000 (17:09 -0700)]
am
e4c0cd6d: am
365ef4a0: Update strings for backup
Merge commit '
e4c0cd6d8cfae4b96596b280fcd125564d290a86' into kraken
* commit '
e4c0cd6d8cfae4b96596b280fcd125564d290a86':
Update strings for backup
Kenny Root [Fri, 4 Jun 2010 00:05:06 +0000 (17:05 -0700)]
am
365ef4a0: Update strings for backup
Merge commit '
365ef4a095189573b67573f6750f5891c11b7895' into froyo-plus-aosp
* commit '
365ef4a095189573b67573f6750f5891c11b7895':
Update strings for backup
Kenny Root [Thu, 3 Jun 2010 23:42:00 +0000 (16:42 -0700)]
Update strings for backup
Change-Id: Icfc39bd1dd0bc38ac5fde300aeb1e8822825d57a
Kenny Root [Thu, 3 Jun 2010 22:07:14 +0000 (15:07 -0700)]
am
273464d5: am
aa1f8aee: Clarify backup setting
Merge commit '
273464d5a1369a784eebeebaa4a4f8b4371b7699' into kraken
* commit '
273464d5a1369a784eebeebaa4a4f8b4371b7699':
Clarify backup setting
Kenny Root [Thu, 3 Jun 2010 22:02:13 +0000 (15:02 -0700)]
am
aa1f8aee: Clarify backup setting
Merge commit '
aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp
* commit '
aa1f8aeeea1c27fe88270cc8b5df970d9f292385':
Clarify backup setting
Kenny Root [Thu, 3 Jun 2010 20:42:12 +0000 (13:42 -0700)]
Clarify backup setting
Change-Id: Ifb4497e4ea1453b1afbdd08ed08fddb9055b7251
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