Commit Graph

2036 Commits

Author SHA1 Message Date
Kenny Root
273464d5a1 am aa1f8aee: Clarify backup setting
Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp

* commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385':
  Clarify backup setting
2010-06-03 15:02:13 -07:00
Kenny Root
aa1f8aeeea Clarify backup setting
Change-Id: Ifb4497e4ea1453b1afbdd08ed08fddb9055b7251
2010-06-03 13:42:12 -07:00
Irfan Sheriff
ca61c25578 am a4966840: am de3e5665: Add phase2 authentication settings
Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken

* commit 'a496684019497395b71c6d460501197a74e21e0e':
  Add phase2 authentication settings
2010-06-03 11:14:40 -07:00
Irfan Sheriff
a496684019 am de3e5665: Add phase2 authentication settings
Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp

* commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
  Add phase2 authentication settings
2010-06-03 11:13:21 -07:00
Irfan Sheriff
de3e56650d Add phase2 authentication settings
Bug: 2734813
Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
2010-06-02 16:31:20 -07:00
Jeff Brown
4223830c65 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.
2010-05-28 12:14:10 -07:00
Jeff Brown
7c5717c064 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.
2010-05-28 12:12:21 -07:00
Michael Chan
fa5d73fdc8 Merge "b/2680057 Fixed a bug where bt won't connect when the phone is docked (if Settings wasn't running)." into kraken 2010-05-27 17:11:24 -07:00
Michael Chan
57d5585595 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
2010-05-27 17:06:50 -07:00
Jeff Brown
b0bcf9f7f5 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
2010-05-27 14:32:31 -07:00
Irfan Sheriff
9be3624f77 am c1a587c9: am f3373c99: No quotes for password
Merge commit 'c1a587c9e980d9e341c0b966f1b4014d5c522078' into kraken

* commit 'c1a587c9e980d9e341c0b966f1b4014d5c522078':
  No quotes for password
2010-05-26 13:05:42 -07:00
Irfan Sheriff
c1a587c9e9 am f3373c99: No quotes for password
Merge commit 'f3373c99493878f4689a9d4865323c18a2065c3b' into froyo-plus-aosp

* commit 'f3373c99493878f4689a9d4865323c18a2065c3b':
  No quotes for password
2010-05-26 13:04:05 -07:00
Irfan Sheriff
f3373c9949 No quotes for password
Putting quotes for password in soft AP is not useful.
It simplifies processing in framework.

Bug: 2708960
Change-Id: If44aeb336732aa8089d3e401b546ebf9b3cbd25a
2010-05-26 12:53:24 -07:00
Christian Mehlmauer
58702fea9b replaced deprecated setButton methods
Change-Id: Ic112dc6acdb62586db741e996b0344d38c71d12f
2010-05-25 19:31:39 +02:00
Christian Mehlmauer
a06b4e69aa Replaced deprecated String Constructor
Change-Id: I452400c9cb00b60316b0270b2f4a68c15d80b698
2010-05-25 19:25:05 +02:00
Christian Mehlmauer
82163dec18 replaced deprecated getIntent with parseURI
Change-Id: Iabf82ff0f9be2a76dece9aafe8603bf83ac7d049
2010-05-25 18:39:46 +02:00
Jaikumar Ganesh
d432bf76de 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
2010-05-24 18:00:56 -07:00
The Android Open Source Project
687094b42f am 48112876: merge from open-source master
Merge commit '4811287623e6cbd9a3584828087ea414454dbfc5' into kraken

* commit '4811287623e6cbd9a3584828087ea414454dbfc5':
  Removed Calls to deprecated APIs and unused imports
2010-05-19 09:16:39 -07:00
The Android Open Source Project
b6c756d521 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.
2010-05-19 09:14:10 -07:00
The Android Open Source Project
4811287623 merge from open-source master
Change-Id: Id9c258165d9bb326271218a562d782fa52608213
2010-05-19 09:12:47 -07:00
The Android Open Source Project
50c7f2d92a merge from open-source master
Change-Id: I5698914cf9093696ad851412a510a99419989d17
2010-05-19 08:30:08 -07:00
Romain Guy
3514cdc3b0 Merge "Removed Calls to deprecated APIs and unused imports" 2010-05-19 00:00:14 -07:00
Dianne Hackborn
3f253cf2d7 am fcc577b2: am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIP
Merge commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken

* commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef':
  Fix issue #2694643: Remove/Resolve STOPSHIP
2010-05-18 15:28:29 -07:00
Dianne Hackborn
fcc577b2a1 am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIP
Merge commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624' into froyo-plus-aosp

* commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624':
  Fix issue #2694643: Remove/Resolve STOPSHIP
2010-05-18 15:26:17 -07:00
Dianne Hackborn
f9762a2c39 Fix issue #2694643: Remove/Resolve STOPSHIP
*poof*

Change-Id: I386473bc6a6cd0d68d1b0a1b4871caef75f1ade8
2010-05-18 15:22:32 -07:00
Henrik Tuszynski
de6007cbf8 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
2010-05-18 09:25:05 +02:00
Irfan Sheriff
d3c3052751 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
2010-05-17 14:05:00 -07:00
Kenny Root
2f3f3bda46 am 7a4cff13: (-s ours) am 28b245c0: Import revised translations
Merge commit '7a4cff13c94b759467702374befa3a7cfb878529' into kraken

* commit '7a4cff13c94b759467702374befa3a7cfb878529':
  Import revised translations
2010-05-17 14:02:32 -07:00
Irfan Sheriff
75a43c6054 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
2010-05-17 13:29:00 -07:00
Irfan Sheriff
cd8f068ed2 Merge "Fix crash for tether with quotes in SSID" into froyo 2010-05-17 13:25:58 -07:00
Irfan Sheriff
18dc7ea709 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
2010-05-17 13:20:39 -07:00
Christian Mehlmauer
0193bf8b3d Removed Calls to deprecated APIs and unused imports
Change-Id: Ibaaf3418ec2c97a99495eca7ea546af415370c3e
2010-05-17 21:25:15 +02:00
Kenny Root
7a4cff13c9 am 28b245c0: Import revised translations
Merge commit '28b245c01d49b7710d1a918849fe8f159e8f43b5' into froyo-plus-aosp

* commit '28b245c01d49b7710d1a918849fe8f159e8f43b5':
  Import revised translations
2010-05-17 11:45:04 -07:00
Kenny Root
28b245c01d Import revised translations
Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
2010-05-17 11:42:19 -07:00
Chung-yih Wang
5dcdbb5c08 am 8719f0d2: am 8c81257f: Fix the double-quoted SSID issue.
Merge commit '8719f0d20a301cc7509c9bd3ce3275f551329dd7' into kraken

* commit '8719f0d20a301cc7509c9bd3ce3275f551329dd7':
  Fix the double-quoted SSID issue.
2010-05-14 23:18:27 -07:00
Chung-yih Wang
8719f0d20a am 8c81257f: Fix the double-quoted SSID issue.
Merge commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c' into froyo-plus-aosp

* commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c':
  Fix the double-quoted SSID issue.
2010-05-14 23:16:25 -07:00
Chung-yih Wang
8c81257f70 Fix the double-quoted SSID issue.
Bug id http://b/issue?id=2684571

Change-Id: I0f1e508b9a3d0fefcef28235380392368a51e42a
2010-05-15 10:57:23 +08:00
The Android Open Source Project
81367cb496 am 542b8f2b: merge from open-source master
Merge commit '542b8f2b471cbac5a2f4b550eae65caf24266d36' into kraken

* commit '542b8f2b471cbac5a2f4b550eae65caf24266d36':
  Fixing Swedish translations of a few texts under "Phone info".
2010-05-12 10:39:17 -07:00
The Android Open Source Project
728e95b2f8 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
2010-05-12 10:37:51 -07:00
The Android Open Source Project
542b8f2b47 merge from open-source master
Change-Id: I0b8f7bedc11e98f2c790669bbbe5a7807947e196
2010-05-12 09:34:10 -07:00
The Android Open Source Project
0b53ac733c merge from open-source master
Change-Id: Iab9eddbfea000b9403c92a211c37b93772f2a9c7
2010-05-12 09:33:50 -07:00
Henrik Hall
a7ece710fe Fixing Swedish translations of a few texts under "Phone info".
* Build number
* Firmware version

Change-Id: Ifb8e84bcea86c7b95073e455f97f9b13c720c400
2010-05-11 13:38:44 -07:00
Romain Guy
d2bfade8f6 Merge "The password in the APN settings is shown instead of stars" 2010-05-11 10:51:12 -07:00
Robert Greenwalt
ddde146f8d am 482eadea: am e434bfb2: String change - wifi tether = hotspot
Merge commit '482eadeae85a1764b86133172d11364df6ce7227' into kraken

* commit '482eadeae85a1764b86133172d11364df6ce7227':
  String change - wifi tether = hotspot
2010-05-10 10:16:29 -07:00
Robert Greenwalt
482eadeae8 am e434bfb2: String change - wifi tether = hotspot
Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp

* commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7':
  String change - wifi tether = hotspot
2010-05-10 10:14:36 -07:00
Michael Chan
c56a35e3c6 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
2010-05-10 09:50:04 -07:00
Michael Chan
15bb475456 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
2010-05-10 09:43:38 -07:00
Robert Greenwalt
e434bfb216 String change - wifi tether = hotspot
bug:2664412
Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
2010-05-08 17:20:26 -07:00
Michael Chan
d2c81986c2 b/2652059 Refresh UI after bond state change
Change-Id: I8f8a939ba3f383aae36091986cea4e8a6eae13fb
2010-05-07 15:24:22 -07:00
Michael Chan
d4869a99df 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
2010-05-04 12:45:29 -07:00