summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Improve battery chart, fuel gauge now shows time since charged.Dianne Hackborn2010-06-162-35/+136
| | | | | | | | | | | | | | | | | | | | | Switch default stats to new time since charged. Update to follow API changes. Improve the battery history chart. Change-Id: I7de4f09ae5638ec3a034745244082e51b1369929
* | | Improve battery chart, fuel gauge now shows time since charged.Dianne Hackborn2010-06-162-35/+136
|/ / | | | | | | | | Switch default stats to new time since charged. Update to follow API changes. Improve the battery history chart.
* | Show history of battery level.Dianne Hackborn2010-06-1118-2675/+597
| | | | | | | | | | | | | | | | | | Also clean up to remove dead code for running services and old battery usage UI. Finally some string improvements from Roy. Change-Id: I8765a4c744b92edd1505f14c47fea57b918e5d7b
* | am dc2fdd09: (-s ours) Import revised translationsKenny Root2010-06-100-0/+0
|\ \ | |/ | | | | | | | | | | Merge commit 'dc2fdd091fc23fe4d4001cc5caacdddbd6becddd' into kraken * commit 'dc2fdd091fc23fe4d4001cc5caacdddbd6becddd': Import revised translations
| * Import revised translationsKenny Root2010-06-1040-320/+620
| | | | | | | | Change-Id: I927a602963d383fbfe12d4b897a2e86bf1783f34
* | am a791e2d6: (-s ours) Import revised translationsKenny Root2010-06-090-0/+0
|\ \ | |/ | | | | | | | | | | Merge commit 'a791e2d63bfb5218db4890184e68381d4261818f' into kraken * commit 'a791e2d63bfb5218db4890184e68381d4261818f': Import revised translations
| * Import revised translationsKenny Root2010-06-0926-145/+85
| | | | | | | | Change-Id: Ib63294fbc8fedc0517f38bbffd4c0fe536866bdc
* | Merge "Fix bug 2713245 - Remove job queue from BT settings" into krakenJaikumar Ganesh2010-06-071-237/+52
|\ \
| * | Fix bug 2713245 - Remove job queue from BT settingsAdam Powell2010-06-071-237/+52
| | | | | | | | | | | | Change-Id: I4e7269474cd270f22b16e9317e933ab87bff4929
* | | Merge "Changing disconnectHeadset calls." into krakenJaikumar Ganesh2010-06-071-3/+6
|\ \ \ | |/ /
| * | Changing disconnectHeadset calls.Jaikumar Ganesh2010-06-071-3/+6
| | | | | | | | | | | | Change-Id: I2f058f28a09e983cd42e5a74bb4ffea19f07b880
* | | New Running Services UI.Dianne Hackborn2010-06-0721-1356/+3356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am e4c0cd6d: am 365ef4a0: Update strings for backupKenny Root2010-06-031-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86' into kraken * commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86': Update strings for backup
| * \ \ am 365ef4a0: Update strings for backupKenny Root2010-06-031-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit '365ef4a095189573b67573f6750f5891c11b7895' into froyo-plus-aosp * commit '365ef4a095189573b67573f6750f5891c11b7895': Update strings for backup
| | * | Update strings for backupKenny Root2010-06-031-2/+2
| | | | | | | | | | | | | | | | Change-Id: Icfc39bd1dd0bc38ac5fde300aeb1e8822825d57a
* | | | am 273464d5: am aa1f8aee: Clarify backup settingKenny Root2010-06-033-8/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '273464d5a1369a784eebeebaa4a4f8b4371b7699' into kraken * commit '273464d5a1369a784eebeebaa4a4f8b4371b7699': Clarify backup setting
| * | | am aa1f8aee: Clarify backup settingKenny Root2010-06-033-8/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp * commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385': Clarify backup setting
| | * | Clarify backup settingKenny Root2010-06-033-8/+11
| | | | | | | | | | | | | | | | Change-Id: Ifb4497e4ea1453b1afbdd08ed08fddb9055b7251
* | | | am a4966840: am de3e5665: Add phase2 authentication settingsIrfan Sheriff2010-06-0323-0/+41
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken * commit 'a496684019497395b71c6d460501197a74e21e0e': Add phase2 authentication settings
| * | am de3e5665: Add phase2 authentication settingsIrfan Sheriff2010-06-0323-0/+41
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp * commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1': Add phase2 authentication settings
| | * Add phase2 authentication settingsIrfan Sheriff2010-06-0223-0/+41
| | | | | | | | | | | | | | | Bug: 2734813 Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
* | | am 7c5717c0: am b0bcf9f7: Fix NPE in InstalledAppDetails activity when app ↵Jeff Brown2010-05-281-10/+34
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | not found. Merge commit '7c5717c0647bf31d0bf5a3b04971dabb4ee0a16c' into kraken * commit '7c5717c0647bf31d0bf5a3b04971dabb4ee0a16c': Fix NPE in InstalledAppDetails activity when app not found.
| * | am b0bcf9f7: Fix NPE in InstalledAppDetails activity when app not found.Jeff Brown2010-05-281-10/+34
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'b0bcf9f7f50b56cb15a72be39fe11fe1351992c1' into froyo-plus-aosp * commit 'b0bcf9f7f50b56cb15a72be39fe11fe1351992c1': Fix NPE in InstalledAppDetails activity when app not found.
| | * Fix NPE in InstalledAppDetails activity when app not found.Jeff Brown2010-05-271-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "b/2680057 Fixed a bug where bt won't connect when the phone is docked ↵Michael Chan2010-05-272-8/+125
|\ \ \ | | | | | | | | | | | | (if Settings wasn't running)." into kraken
| * | | b/2680057 Fixed a bug where bt won't connect when the phone is docked (if ↵Michael Chan2010-05-272-8/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am c1a587c9: am f3373c99: No quotes for passwordIrfan Sheriff2010-05-261-9/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | Merge commit 'c1a587c9e980d9e341c0b966f1b4014d5c522078' into kraken * commit 'c1a587c9e980d9e341c0b966f1b4014d5c522078': No quotes for password
| * | am f3373c99: No quotes for passwordIrfan Sheriff2010-05-261-9/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'f3373c99493878f4689a9d4865323c18a2065c3b' into froyo-plus-aosp * commit 'f3373c99493878f4689a9d4865323c18a2065c3b': No quotes for password
| | * No quotes for passwordIrfan Sheriff2010-05-261-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | Putting quotes for password in soft AP is not useful. It simplifies processing in framework. Bug: 2708960 Change-Id: If44aeb336732aa8089d3e401b546ebf9b3cbd25a
* | | Set profiles as preferred and then try to connect.Jaikumar Ganesh2010-05-241-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 48112876: merge from open-source masterThe Android Open Source Project2010-05-193-12/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '4811287623e6cbd9a3584828087ea414454dbfc5' into kraken * commit '4811287623e6cbd9a3584828087ea414454dbfc5': Removed Calls to deprecated APIs and unused imports
| * | merge from open-source masterThe Android Open Source Project2010-05-193-12/+4
| |\ \ | | | | | | | | | | | | Change-Id: Id9c258165d9bb326271218a562d782fa52608213
| | * \ Merge "Removed Calls to deprecated APIs and unused imports"Romain Guy2010-05-193-12/+4
| | |\ \
| | | * | Removed Calls to deprecated APIs and unused importsChristian Mehlmauer2010-05-173-12/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibaaf3418ec2c97a99495eca7ea546af415370c3e
* | | | | am 50c7f2d9: merge from open-source masterThe Android Open Source Project2010-05-191-16/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '50c7f2d92a8100982c49027058fb05069e4a1e2a' into kraken * commit '50c7f2d92a8100982c49027058fb05069e4a1e2a': A button in the master clear information screen was partly hidden.
| * | | | merge from open-source masterThe Android Open Source Project2010-05-191-16/+20
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: I5698914cf9093696ad851412a510a99419989d17
| | * | | A button in the master clear information screen was partly hidden.Henrik Tuszynski2010-05-181-16/+20
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am fcc577b2: am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIPDianne Hackborn2010-05-181-3/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken * commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef': Fix issue #2694643: Remove/Resolve STOPSHIP
| * | | am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIPDianne Hackborn2010-05-181-3/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624' into froyo-plus-aosp * commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624': Fix issue #2694643: Remove/Resolve STOPSHIP
| | * | Fix issue #2694643: Remove/Resolve STOPSHIPDianne Hackborn2010-05-181-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | *poof* Change-Id: I386473bc6a6cd0d68d1b0a1b4871caef75f1ade8
* | | | am 75a43c60: am cd8f068e: Merge "Fix crash for tether with quotes in SSID" ↵Irfan Sheriff2010-05-173-6/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '75a43c605449e72074fc55576c8e712ff12906db' into kraken * commit '75a43c605449e72074fc55576c8e712ff12906db': Fix crash for tether with quotes in SSID
| * | | am cd8f068e: Merge "Fix crash for tether with quotes in SSID" into froyoIrfan Sheriff2010-05-173-6/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'cd8f068ed2b5385ec420c1cabc8b1f62558a1448' into froyo-plus-aosp * commit 'cd8f068ed2b5385ec420c1cabc8b1f62558a1448': Fix crash for tether with quotes in SSID
| | * | Merge "Fix crash for tether with quotes in SSID" into froyoIrfan Sheriff2010-05-173-6/+11
| | |\ \
| | | * | Fix crash for tether with quotes in SSIDIrfan Sheriff2010-05-173-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 7a4cff13: (-s ours) am 28b245c0: Import revised translationsKenny Root2010-05-170-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7a4cff13c94b759467702374befa3a7cfb878529' into kraken * commit '7a4cff13c94b759467702374befa3a7cfb878529': Import revised translations
| * | | | am 28b245c0: Import revised translationsKenny Root2010-05-1727-374/+435
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '28b245c01d49b7710d1a918849fe8f159e8f43b5' into froyo-plus-aosp * commit '28b245c01d49b7710d1a918849fe8f159e8f43b5': Import revised translations
| | * | | Import revised translationsKenny Root2010-05-1727-374/+435
| | |/ / | | | | | | | | | | | | Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
* | | | am 8719f0d2: am 8c81257f: Fix the double-quoted SSID issue.Chung-yih Wang2010-05-146-9/+25
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '8719f0d20a301cc7509c9bd3ce3275f551329dd7' into kraken * commit '8719f0d20a301cc7509c9bd3ce3275f551329dd7': Fix the double-quoted SSID issue.
| * | | am 8c81257f: Fix the double-quoted SSID issue.Chung-yih Wang2010-05-146-9/+25
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c' into froyo-plus-aosp * commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c': Fix the double-quoted SSID issue.
| | * | Fix the double-quoted SSID issue.Chung-yih Wang2010-05-156-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | Bug id http://b/issue?id=2684571 Change-Id: I0f1e508b9a3d0fefcef28235380392368a51e42a