summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEYing Wang2012-07-2533-514/+259
| | | | | Change-Id: I71914c5d78b072ce9ed4aeeaf4c07c0eb05f7967 Auto-generated-cl: translation import
* am 5bc4bb20: (-s ours) am 54199540: Import translations. DO NOT MERGEYing Wang2012-07-240-0/+0
|\ | | | | | | | | * commit '5bc4bb204a3b7c10c62f06c91b65bd8091b153f7': Import translations. DO NOT MERGE
| * am 54199540: Import translations. DO NOT MERGEYing Wang2012-07-2449-202/+666
| |\ | | | | | | | | | | | | * commit '54199540b1d07af1a71e10ab096493245ed5fdbd': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEYing Wang2012-07-2449-202/+666
| | | | | | | | | | | | | | | Change-Id: Iaab1ba57ddc978edab0389c9172be39899d9bd24 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-2449-202/+666
| | | | | | | | | | | | | | | Change-Id: I06f071866f2a8ae36122d99784f682c1f6a2748c Auto-generated-cl: translation import
* | | am bebcc976: am 4635ec6b: Strings for upcoming location settings changes.Amith Yamasani2012-07-231-5/+13
|\ \ \ | |/ / | | | | | | | | | * commit 'bebcc976853285a668fd2ff5d36561183d0c34f9': Strings for upcoming location settings changes.
| * | am 4635ec6b: Strings for upcoming location settings changes.Amith Yamasani2012-07-231-5/+13
| |\ \ | | |/ | | | | | | | | | * commit '4635ec6b8dcf9a9f686a4d25eaffe916f5dcd20e': Strings for upcoming location settings changes.
| | * Strings for upcoming location settings changes.Amith Yamasani2012-07-231-5/+13
| | | | | | | | | | | | | | | | | | Adding these first to parallelize translations. Change-Id: Ia0fcecd6d714ad58c45e5ddc9ae5f00afce3e810
* | | am e3627120: (-s ours) am 13be5469: Import translations. DO NOT MERGEYing Wang2012-07-230-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'e3627120c37ae409d474e59d878ea46b10c4876e': Import translations. DO NOT MERGE
| * | am 13be5469: Import translations. DO NOT MERGEYing Wang2012-07-235-5/+5
| |\ \ | | |/ | | | | | | | | | * commit '13be54694f93172791bc342828594ede27919fc6': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEYing Wang2012-07-235-5/+5
| | | | | | | | | | | | | | | Change-Id: Idf81094651355da7433c69cefd2fddf0ccc0bc0a Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-235-5/+5
| | | | | | | | | | | | | | | Change-Id: I303b2963d0096be4ba94f7217481bc3e8076c646 Auto-generated-cl: translation import
* | | am b6021933: (-s ours) am 509cfa1d: Import translations. DO NOT MERGEYing Wang2012-07-200-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'b602193318013c1ba6c4e5f92404c7a0ae39394a': Import translations. DO NOT MERGE
| * | am 509cfa1d: Import translations. DO NOT MERGEYing Wang2012-07-205-90/+90
| |\ \ | | |/ | | | | | | | | | * commit '509cfa1d5422e4b4f892bf4a8612f9548a7665bd': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEYing Wang2012-07-205-90/+90
| | | | | | | | | | | | | | | Change-Id: Ic57f9912261e3b685eac931269bdac10353305d4 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-205-90/+90
| | | | | | | | | | | | | | | Change-Id: I964869154c2b70562aee7a90b6e2404dc405f1be Auto-generated-cl: translation import
* | | am fc8267ab: (-s ours) am 35e404c8: Import translations. DO NOT MERGEYing Wang2012-07-200-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'fc8267abd541d19460b89d7eb875fdec35a32200': Import translations. DO NOT MERGE
| * | am 35e404c8: Import translations. DO NOT MERGEYing Wang2012-07-193-10/+7
| |\ \ | | |/ | | | | | | | | | * commit '35e404c8f0236234cb75896f4d2b828bb60061aa': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEYing Wang2012-07-193-10/+7
| | | | | | | | | | | | | | | Change-Id: I029b2b28210dbac2b523152441195db55c352120 Auto-generated-cl: translation import
* | | Fix some long forgottten TTS settings bugsNarayan Kamath2012-07-202-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Handle radio button clicks correctly - Handle injecting voice data correctly bug:5998256 bug:5938852 bug:5998418 Change-Id: Ib30afa6558e51ac9a88e28c51500ebaad93ad7fe
* | | Migrate VpnProfile definition to framework.Jeff Sharkey2012-07-193-121/+2
| | | | | | | | | | | | | | | Bug: 5756357 Change-Id: Icf4b2cb10e911216a2165f2afd1eb89152c5f1c0
* | | Merge "Import translations. DO NOT MERGE"Ying Wang2012-07-193-10/+7
|\ \ \
| * | | Import translations. DO NOT MERGEYing Wang2012-07-193-10/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I5e18288959114e14da70f4a5a9f212c61e5180e2 Auto-generated-cl: translation import
* | | | Configure task affinity for main Settings activitiesAdam Powell2012-07-191-46/+46
|/ / / | | | | | | | | | Change-Id: Iae98093a186a125f21bf807dfb1acc1a1bf4184a
* | | am 5924943c: Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-190-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '5924943c91bd98781c358d904b10eb2638b442ea': Display FCC id for LTE in Settings.
| | |
| | \
| *-. \ Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-190-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: If4a370c83e39eea43d31edcc1554ec1aeb539505
| | | * | Display FCC id for LTE in Settings.John Wang2012-07-133-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID. bug:4965501 Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
| | * | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-180-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-170-0/+0
| | | |\ \
| | | | * \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-110-0/+0
| | | | |\ \ | | | | | |/
* | | | | | am 4b7c4f1c: (-s ours) am 2bc05a27: Import translations. DO NOT MERGEYing Wang2012-07-180-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '4b7c4f1c12eb77d57670acc7f573747acd4f80d5': Import translations. DO NOT MERGE
| * | | | | am 2bc05a27: Import translations. DO NOT MERGEYing Wang2012-07-1823-139/+76
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '2bc05a2726935df5a085c78f8c7b0cfcc78aea43': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEYing Wang2012-07-1823-139/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If2837c8bd3b5aaf6aa089a0a7a711e1a5662fd7e Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEYing Wang2012-07-1823-139/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b0f3d1b63c405fe1bcc3152bb49763ae0dbb7fe Auto-generated-cl: translation import
* | | | | | am 12a652b2: (-s ours) am fa0f3fe1: Import translations. DO NOT MERGEYing Wang2012-07-170-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '12a652b2ec5213bbfb2b24d00828727113ac688d': Import translations. DO NOT MERGE
| * | | | | am fa0f3fe1: Import translations. DO NOT MERGEYing Wang2012-07-1739-193/+98
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'fa0f3fe16225c57c91c9fe51981dc03f29938746': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEYing Wang2012-07-1739-193/+98
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ia121cd0efbc34dbfbfcd96ad3befbeefd37de9ff Auto-generated-cl: translation import
* | | | | am 322cd6e1: (-s ours) am 9ad4a898: (-s ours) Use telephony-common - DO NOT ↵Wink Saville2012-07-170-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | MERGE * commit '322cd6e1eea928fb890bc4b87e7349e887f49595': Use telephony-common - DO NOT MERGE
| * | | | am 9ad4a898: (-s ours) Use telephony-common - DO NOT MERGEWink Saville2012-07-170-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '9ad4a89877363a6f1128b258f6535b29d2f778e2': Use telephony-common - DO NOT MERGE
| | * | | | Use telephony-common - DO NOT MERGEWink Saville2012-07-179-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
* | | | | | Import translations. DO NOT MERGEYing Wang2012-07-1739-193/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31055b1f7d52718773adef01fa16365be3931d15 Auto-generated-cl: translation import
* | | | | | Clean up codes, fix long lines, improve readability, etcMatthew Xie2012-07-166-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update copyright date, remove unused variable, import Change-Id: I731c48c8e5b16cbee5230f1d02109f249b8bab5d
* | | | | | On an incoming pairing of a newly paired device, setPreferred of theKausik Sinnaswamy2012-07-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | profiles needs to be called to enable incoming/outgoing connections Change-Id: Ic90e4857fb119e31639e4a50db48b084201aadb2
* | | | | | Fixed a race condition during pairing with carkits wherein connect wasKausik Sinnaswamy2012-07-161-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issued even before ACTION.uuid changed was received. Change-Id: Iafc2c61b92537a219e46e08366fab1ad5f4e97bd
* | | | | | On bluetooth disable, delete all devices that are not bondedRavi Nagarajan2012-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If66d54eb4d953c4cc78a22a8b3e89e42bc16f5f4
* | | | | | Fix to update the checkbox attribute values after connect() is called; This ↵Syed Ibrahim M2012-07-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is to make sure for profiles like HID where re-connection can happen only from the device side, the UI is updated to be in sync with the right priority of the corresponding profiles Change-Id: I4a17d8bbf584e6e64519fe3508bccd5d167a020d
* | | | | | Revert "Changes done to update UI with appropriate checkbox state, when AVRC ↵Kausik Sinnaswamy2012-07-162-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Connect is initiated from the headset. Earlier, the checkbox state was not being updated when the connection state changed for media audio, when connected from headset" This reverts commit 2f9d962940cb92c7f70576a29f263258f6abc478
* | | | | | Headset connection status is displayed incorrectly, as the boolean ↵Ravi Nagarajan2012-07-161-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mIsProfileReady is not initalized properly. Make sure mIsProfileReady is initialized always when onServiceConnected is received Change-Id: I968ce6900121a6140256b3181c792d421bdb7cf6
* | | | | | Fixed null pointer exception when BT is enabled from settings screen with ↵fredc2012-07-164-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously bonded devices Change-Id: Ia0cf763920fd99897994ea15445aec1dcd48853e
* | | | | | Changes done to update UI with appropriate checkbox state, when AVRC Connect ↵Sreenidhi T2012-07-162-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is initiated from the headset. Earlier, the checkbox state was not being updated when the connection state changed for media audio, when connected from headset Change-Id: Ic46a8a87b74cbe76f0e8b62428516af5594526ec