Kenny Root
13cccc1b82
am 2486572b
: am e4c0cd6d
: am 365ef4a0
: Update strings for backup
2010-06-03 17:17:37 -07:00
Kenny Root
2486572bd6
am e4c0cd6d
: am 365ef4a0
: Update strings for backup
...
Merge commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86' into kraken
* commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86':
Update strings for backup
2010-06-03 17:09:28 -07:00
Kenny Root
e4c0cd6d8c
am 365ef4a0
: Update strings for backup
...
Merge commit '365ef4a095189573b67573f6750f5891c11b7895' into froyo-plus-aosp
* commit '365ef4a095189573b67573f6750f5891c11b7895':
Update strings for backup
2010-06-03 17:05:06 -07:00
Kenny Root
365ef4a095
Update strings for backup
...
Change-Id: Icfc39bd1dd0bc38ac5fde300aeb1e8822825d57a
2010-06-03 16:42:00 -07:00
Kenny Root
9517554534
am a262b5d1
: am 273464d5
: am aa1f8aee
: Clarify backup setting
2010-06-03 15:10:59 -07:00
Kenny Root
a262b5d1a0
am 273464d5
: am aa1f8aee
: Clarify backup setting
...
Merge commit '273464d5a1369a784eebeebaa4a4f8b4371b7699' into kraken
* commit '273464d5a1369a784eebeebaa4a4f8b4371b7699':
Clarify backup setting
2010-06-03 15:07:14 -07:00
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
3bf2d42490
am ca61c255
: am a4966840
: am de3e5665
: Add phase2 authentication settings
2010-06-03 11:17:36 -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
Konstantin Lopyrev
9e1580de8e
Fix 2599706: Made sure that the user is not asked to confirm his password again after watching the lock pattern tutorial.
...
Change-Id: I4c1c4e9cd4820d9b8ebd10a2999d21bee6a08ba5
2010-06-01 17:04:04 -07:00
Amith Yamasani
e7739d1ab5
Added an Input Method selector in Language settings
...
Bug: 2132207 - Settings UI has no way to change IME
2010-06-01 10:22:30 -07:00
Jeff Brown
e82843fc10
am 4223830c
: am 7c5717c0
: am b0bcf9f7
: Fix NPE in InstalledAppDetails activity when app not found.
2010-05-28 12:17:15 -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
fca9d42982
am fa5d73fd
: 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 23:05:52 -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
Konstantin Lopyrev
57fbf694a5
Change I546ee2fb: Fix 2677197: Adding minimum complex character support.
...
Change-Id: I5590ec2743b84e34098871507dbcc2f49e5a4e9f
2010-05-27 16:04:49 -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
dfa18503b6
am 9be3624f
: am c1a587c9
: am f3373c99
: No quotes for password
2010-05-26 13:08:53 -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
Jaikumar Ganesh
80cfcd57e0
am d432bf76
: Set profiles as preferred and then try to connect.
2010-05-25 13:22:39 -07: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
6ebe5b5d5e
am 687094b4
: am 48112876
: merge from open-source master
2010-05-19 09:18:32 -07:00
The Android Open Source Project
ba10561bab
am b6c756d5
: am 50c7f2d9
: merge from open-source master
2010-05-19 09:17:07 -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
777e06c164
am 3f253cf2
: am fcc577b2
: am f9762a2c
: Fix issue #2694643 : Remove/Resolve STOPSHIP
2010-05-18 18:28:02 -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
d723815fbc
am d3c30527
: am 75a43c60
: am cd8f068e
: Merge "Fix crash for tether with quotes in SSID" into froyo
2010-05-17 15:03:52 -07:00
Kenny Root
c0be03610b
am 2f3f3bda
: am 7a4cff13
: (-s ours) am 28b245c0
: Import revised translations
2010-05-17 15:03:50 -07: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