The Android Automerger
a29723c7af
merge in jb-mr0-release history after reset to jb-dev
2012-07-24 12:39:36 -07:00
Ying Wang
54199540b1
Import translations. DO NOT MERGE
...
Change-Id: Iaab1ba57ddc978edab0389c9172be39899d9bd24
Auto-generated-cl: translation import
2012-07-24 12:38:57 -07:00
Amith Yamasani
24d1058d00
am bebcc976
: am 4635ec6b
: Strings for upcoming location settings changes.
...
* commit 'bebcc976853285a668fd2ff5d36561183d0c34f9':
Strings for upcoming location settings changes.
2012-07-23 19:53:33 -07:00
Ying Wang
248d5cd151
am e3627120
: (-s ours) am 13be5469
: Import translations. DO NOT MERGE
...
* commit 'e3627120c37ae409d474e59d878ea46b10c4876e':
Import translations. DO NOT MERGE
2012-07-23 19:52:31 -07:00
Amith Yamasani
bebcc97685
am 4635ec6b
: Strings for upcoming location settings changes.
...
* commit '4635ec6b8dcf9a9f686a4d25eaffe916f5dcd20e':
Strings for upcoming location settings changes.
2012-07-23 18:49:45 -07:00
Amith Yamasani
4635ec6b8d
Strings for upcoming location settings changes.
...
Adding these first to parallelize translations.
Change-Id: Ia0fcecd6d714ad58c45e5ddc9ae5f00afce3e810
2012-07-23 16:40:02 -07:00
Ying Wang
e3627120c3
am 13be5469
: Import translations. DO NOT MERGE
...
* commit '13be54694f93172791bc342828594ede27919fc6':
Import translations. DO NOT MERGE
2012-07-23 14:03:33 -07:00
Ying Wang
024ddd4976
Import translations. DO NOT MERGE
...
Change-Id: I303b2963d0096be4ba94f7217481bc3e8076c646
Auto-generated-cl: translation import
2012-07-23 13:11:29 -07:00
Ying Wang
13be54694f
Import translations. DO NOT MERGE
...
Change-Id: Idf81094651355da7433c69cefd2fddf0ccc0bc0a
Auto-generated-cl: translation import
2012-07-23 13:05:38 -07:00
Ying Wang
277a27bb22
am b6021933
: (-s ours) am 509cfa1d
: Import translations. DO NOT MERGE
...
* commit 'b602193318013c1ba6c4e5f92404c7a0ae39394a':
Import translations. DO NOT MERGE
2012-07-20 22:35:12 -07:00
Stephen Smalley
b4e84f34e0
Add support for SE Android to the Settings app.
...
Display SELinux status (disabled, permissive, enforcing) under About phone.
Change-Id: I69529fb7a3adfe31eccb16d79740fc4952ff5e68
2012-07-20 15:41:29 -07:00
Ying Wang
b602193318
am 509cfa1d
: Import translations. DO NOT MERGE
...
* commit '509cfa1d5422e4b4f892bf4a8612f9548a7665bd':
Import translations. DO NOT MERGE
2012-07-20 14:04:56 -07:00
Ying Wang
4553af1bac
Import translations. DO NOT MERGE
...
Change-Id: I964869154c2b70562aee7a90b6e2404dc405f1be
Auto-generated-cl: translation import
2012-07-20 12:57:12 -07:00
Ying Wang
509cfa1d54
Import translations. DO NOT MERGE
...
Change-Id: Ic57f9912261e3b685eac931269bdac10353305d4
Auto-generated-cl: translation import
2012-07-20 12:53:45 -07:00
Ying Wang
354965731c
am fc8267ab
: (-s ours) am 35e404c8
: Import translations. DO NOT MERGE
...
* commit 'fc8267abd541d19460b89d7eb875fdec35a32200':
Import translations. DO NOT MERGE
2012-07-20 10:00:24 -07:00
Narayan Kamath
1926bd4f2e
Fix some long forgottten TTS settings bugs
...
- Handle radio button clicks correctly
- Handle injecting voice data correctly
bug:5998256
bug:5938852
bug:5998418
Change-Id: Ib30afa6558e51ac9a88e28c51500ebaad93ad7fe
2012-07-20 14:32:50 +01:00
Jeff Sharkey
c6e84c0959
Migrate VpnProfile definition to framework.
...
Bug: 5756357
Change-Id: Icf4b2cb10e911216a2165f2afd1eb89152c5f1c0
2012-07-19 17:09:52 -07:00
Ying Wang
fc8267abd5
am 35e404c8
: Import translations. DO NOT MERGE
...
* commit '35e404c8f0236234cb75896f4d2b828bb60061aa':
Import translations. DO NOT MERGE
2012-07-19 14:51:30 -07:00
Ying Wang
5b790af2b0
Merge "Import translations. DO NOT MERGE"
2012-07-19 14:49:26 -07:00
Ying Wang
c757774651
Import translations. DO NOT MERGE
...
Change-Id: I5e18288959114e14da70f4a5a9f212c61e5180e2
Auto-generated-cl: translation import
2012-07-19 14:25:23 -07:00
Ying Wang
35e404c8f0
Import translations. DO NOT MERGE
...
Change-Id: I029b2b28210dbac2b523152441195db55c352120
Auto-generated-cl: translation import
2012-07-19 14:21:34 -07:00
Adam Powell
d8537a0e14
Configure task affinity for main Settings activities
...
Change-Id: Iae98093a186a125f21bf807dfb1acc1a1bf4184a
2012-07-19 11:25:07 -07:00
The Android Open Source Project
2e09bbd392
am 5924943c
: Reconcile with jb-mr0-release jb-release
...
* commit '5924943c91bd98781c358d904b10eb2638b442ea':
Display FCC id for LTE in Settings.
2012-07-19 08:52:27 -07:00
The Android Open Source Project
5924943c91
Reconcile with jb-mr0-release jb-release
...
Change-Id: If4a370c83e39eea43d31edcc1554ec1aeb539505
2012-07-19 08:41:38 -07:00
The Android Automerger
0576f79dd8
merge in jb-release history after reset to jb-dev
2012-07-18 23:04:50 -07:00
The Android Automerger
e9c00b6a66
merge in jb-mr0-release history after reset to jb-dev
2012-07-18 21:44:53 -07:00
Ying Wang
4761dc03d1
am 4b7c4f1c
: (-s ours) am 2bc05a27
: Import translations. DO NOT MERGE
...
* commit '4b7c4f1c12eb77d57670acc7f573747acd4f80d5':
Import translations. DO NOT MERGE
2012-07-18 20:21:24 -07:00
Ying Wang
4b7c4f1c12
am 2bc05a27
: Import translations. DO NOT MERGE
...
* commit '2bc05a2726935df5a085c78f8c7b0cfcc78aea43':
Import translations. DO NOT MERGE
2012-07-18 20:14:18 -07:00
Wink Saville
79bff2a254
Test getAllCellInfo and onCellInfoChanged.
...
Change-Id: I20164d6bb9edb2ecf178b4533a39e885773d7b22
2012-07-18 17:05:09 -07:00
Ying Wang
f6941bdc63
Import translations. DO NOT MERGE
...
Change-Id: I3b0f3d1b63c405fe1bcc3152bb49763ae0dbb7fe
Auto-generated-cl: translation import
2012-07-18 16:21:50 -07:00
Ying Wang
2bc05a2726
Import translations. DO NOT MERGE
...
Change-Id: If2837c8bd3b5aaf6aa089a0a7a711e1a5662fd7e
Auto-generated-cl: translation import
2012-07-18 16:18:09 -07:00
Ying Wang
076a6d45f3
am 12a652b2
: (-s ours) am fa0f3fe1
: Import translations. DO NOT MERGE
...
* commit '12a652b2ec5213bbfb2b24d00828727113ac688d':
Import translations. DO NOT MERGE
2012-07-17 14:11:54 -07:00
Wink Saville
8302df1804
am 322cd6e1
: (-s ours) am 9ad4a898
: (-s ours) Use telephony-common - DO NOT MERGE
...
* commit '322cd6e1eea928fb890bc4b87e7349e887f49595':
Use telephony-common - DO NOT MERGE
2012-07-17 14:08:50 -07:00
Ying Wang
12a652b2ec
am fa0f3fe1
: Import translations. DO NOT MERGE
...
* commit 'fa0f3fe16225c57c91c9fe51981dc03f29938746':
Import translations. DO NOT MERGE
2012-07-17 13:41:39 -07:00
Ying Wang
9587449f78
Import translations. DO NOT MERGE
...
Change-Id: I31055b1f7d52718773adef01fa16365be3931d15
Auto-generated-cl: translation import
2012-07-17 12:59:04 -07:00
Ying Wang
fa0f3fe162
Import translations. DO NOT MERGE
...
Change-Id: Ia121cd0efbc34dbfbfcd96ad3befbeefd37de9ff
Auto-generated-cl: translation import
2012-07-17 12:54:32 -07:00
Wink Saville
322cd6e1ee
am 9ad4a898
: (-s ours) Use telephony-common - DO NOT MERGE
...
* commit '9ad4a89877363a6f1128b258f6535b29d2f778e2':
Use telephony-common - DO NOT MERGE
2012-07-17 12:36:41 -07:00
The Android Automerger
25b00fe0a5
merge in jb-mr0-release history after reset to jb-dev
2012-07-17 12:31:40 -07:00
Wink Saville
9ad4a89877
Use telephony-common - DO NOT MERGE
...
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
2012-07-17 12:23:26 -07:00
Matthew Xie
b5f144af8e
Clean up codes, fix long lines, improve readability, etc
...
Update copyright date, remove unused variable, import
Change-Id: I731c48c8e5b16cbee5230f1d02109f249b8bab5d
2012-07-16 15:38:38 -07:00
Kausik Sinnaswamy
744ef74d37
On an incoming pairing of a newly paired device, setPreferred of the
...
profiles needs to be called to enable incoming/outgoing connections
Change-Id: Ic90e4857fb119e31639e4a50db48b084201aadb2
2012-07-16 15:38:38 -07:00
Kausik Sinnaswamy
6e4060212e
Fixed a race condition during pairing with carkits wherein connect was
...
issued even before ACTION.uuid changed was received.
Change-Id: Iafc2c61b92537a219e46e08366fab1ad5f4e97bd
2012-07-16 15:38:38 -07:00
Ravi Nagarajan
2582e6ca94
On bluetooth disable, delete all devices that are not bonded
...
Change-Id: If66d54eb4d953c4cc78a22a8b3e89e42bc16f5f4
2012-07-16 15:38:38 -07:00
Syed Ibrahim M
f457e613d5
Fix to update the checkbox attribute values after connect() is called; This 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
2012-07-16 15:38:38 -07:00
Kausik Sinnaswamy
c78d71e16c
Revert "Changes done to update UI with appropriate checkbox state, when AVRC 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
2012-07-16 15:38:38 -07:00
Ravi Nagarajan
d1889ed4bd
Headset connection status is displayed incorrectly, as the boolean mIsProfileReady is not initalized properly. Make sure mIsProfileReady is initialized always when onServiceConnected is received
...
Change-Id: I968ce6900121a6140256b3181c792d421bdb7cf6
2012-07-16 15:38:38 -07:00
fredc
afedeacd57
Fixed null pointer exception when BT is enabled from settings screen with previously bonded devices
...
Change-Id: Ia0cf763920fd99897994ea15445aec1dcd48853e
2012-07-16 15:38:38 -07:00
Sreenidhi T
c7b490c7a0
Changes done to update UI with appropriate checkbox state, when AVRC 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
Change-Id: Ic46a8a87b74cbe76f0e8b62428516af5594526ec
2012-07-16 15:38:38 -07:00
Kausik Sinnaswamy
737a30f593
Clear the Available (unbonded devices) from the CachedDevices List
...
during BT disable.
Change-Id: I576237a4165759fe952690f19fde59ce78cd1d29
2012-07-16 15:38:37 -07:00
Swaminatha Balaji
00ec05985d
Auto connect hf/a2dp when any one of them gets connected and timeout happens
...
Change-Id: I6249c2fceab87f91c6629d19f72268d000ecf61c
2012-07-16 15:38:37 -07:00