Baligh Uddin
2e80628f74
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-06 19:51:22 -07:00
Romain Guy
cdc2c5534f
Add new dev settings to debug hardware layers
...
Change-Id: I2668552d70911a90e173efdf75bc44139ed394c8
2012-08-06 14:52:52 -07:00
Baligh Uddin
59b52533ba
Import translations. DO NOT MERGE
...
Change-Id: If7727c84c1b71ef20c3f1fe4963ba0b27b3cb77c
Auto-generated-cl: translation import
2012-08-06 13:09:25 -07:00
Ying Wang
0a83748580
am bdae7b01
: (-s ours) am 3eee86b8
: Import translations. DO NOT MERGE
...
* commit 'bdae7b013938030628577ef3ceb2b9954253c155':
Import translations. DO NOT MERGE
2012-08-03 14:41:47 -07:00
Ying Wang
bdae7b0139
am 3eee86b8
: Import translations. DO NOT MERGE
...
* commit '3eee86b8d7bc175e1e83269afc5c2c5441681a50':
Import translations. DO NOT MERGE
2012-08-03 14:38:01 -07:00
Ying Wang
c868a4cae7
Import translations. DO NOT MERGE
...
Change-Id: I1de6f9c42101f6c984c79a75882d691692f17af5
Auto-generated-cl: translation import
2012-08-03 13:44:19 -07:00
Ying Wang
3eee86b8d7
Import translations. DO NOT MERGE
...
Change-Id: Ia673ddc20188c59c8591015e51033a526a7151ab
Auto-generated-cl: translation import
2012-08-03 13:41:54 -07:00
Przemyslaw Szczepaniak
104ab231e5
Merge "Fixes list of TTS voices after changing voice data" into jb-mr1-dev
2012-08-03 09:17:36 -07:00
Przemyslaw Szczepaniak
e1d2b7fb78
Fixes list of TTS voices after changing voice data
...
Added one BroadcastListener that listens for TextToSpeech.Engine.ACTION_TTS_DATA_INSTALLED intents.
If it gets one, it will call TextToSpeech.Engine.ACTION_CHECK_TTS_DATA to update list of TTS voices.
It expects TTS engine to broadcast TTS_DATA_INSTALLED also when removing voice data.
In order to catch changes done when user sits in Text-to-speech output main activity,
TextToSpeech.Engine.ACTION_CHECK_TTS_DATA is called on start of tts engine config fragment.
Change-Id: Ic1e299ea3ffc45d938083f1ab5b2bf101fe25f26
2012-08-03 17:07:33 +01:00
John Spurlock
b54b45d93b
Merge "Re-enable dreams: Settings" into jb-mr1-dev
2012-08-03 08:53:22 -07:00
Michael Jurka
6e380d0865
am 3d43f9c8
: am ca511a81
: Fix appwidget bind dialog
...
* commit '3d43f9c8aa2b00d894577e5b6dfe3ffcdfc9d871':
Fix appwidget bind dialog
2012-08-02 22:31:34 -07:00
Michael Jurka
3d43f9c8aa
am ca511a81
: Fix appwidget bind dialog
...
* commit 'ca511a8115962be7f598deb20aa47793db6d06f7':
Fix appwidget bind dialog
2012-08-02 22:29:23 -07:00
Michael Jurka
ca511a8115
Fix appwidget bind dialog
...
Bug: 6926529
Change-Id: I19327a6346b6e7da61a49a983b3373058db21f12
2012-08-02 18:36:42 -07:00
John Spurlock
d541b6fd1c
Re-enable dreams: Settings
...
Re-arrange settings and captions for dreams. Activation on sleep
and activation on dock now independent. Sleep activation defaults to off,
dock activation defaults to on (replacing dock mode).
Also use dream manager service for testing dream preference, and properly
disable preferences if both dream activations are disabled.
Change-Id: I76f5ba115c7678826a09077dd393acc55c2bca26
Bug: 6921930
2012-08-02 16:49:23 -04:00
Syed Ibrahim M
6bce91bb9b
Fix for correctly enabling PAN profile in Settings
...
Update the connected profile list in CachedBluetoothDevice correctly
if a PANU-NAP connection is already existing but the onUuidChanged()
callback doesnt contain the PANU UUID in SDP inquiry. Now, the
DeviceProfileSettings screens displays valid 'Internet connection
sharing' option when connected as a NAP to remote PANU.
Change-Id: I35821233e7776fb13f7fb1eb22af992b497202a9
2012-08-01 23:52:47 -07:00
Ying Wang
6a20ce5e51
am 91840c02
: (-s ours) am d7ae05db
: Import translations. DO NOT MERGE
...
* commit '91840c02361af8157b0c0395fafe704edab2e498':
Import translations. DO NOT MERGE
2012-08-01 15:30:23 -07:00
Ying Wang
91840c0236
am d7ae05db
: Import translations. DO NOT MERGE
...
* commit 'd7ae05dbdc1af637e7e6655abb1a6b63e9d49968':
Import translations. DO NOT MERGE
2012-08-01 15:28:32 -07:00
Ying Wang
4c9e26b0d2
Import translations. DO NOT MERGE
...
Change-Id: I944d4e01e1453965b386dd8f49450fb2f7dd2d4e
Auto-generated-cl: translation import
2012-08-01 14:15:14 -07:00
Ying Wang
d7ae05dbdc
Import translations. DO NOT MERGE
...
Change-Id: I581b48ef0f69e5bd2c469fd2ac61a8c5564bc553
Auto-generated-cl: translation import
2012-08-01 14:13:16 -07:00
Ravi Nagarajan
c70f548355
Reset the priority on unbond
...
Change-Id: I67b68bd70b947177218e0b908b79ebb9de9f45a8
2012-08-01 00:25:24 -07:00
Swaminatha Balaji
b45e3c8fe9
Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
...
Change-Id: I0716782a5308cc45297a30d0a7371286c75bfa52
2012-08-01 00:23:58 -07:00
Ganesh Ganapathi Batta
802956ec9b
Add dev to cached dev list if entry is missing before auto connect
...
Fix for BLTH01482218
Change-Id: I7d5cfad3eff872b5eb0b0c71804f25f3c3334557
2012-08-01 00:23:37 -07:00
The Android Open Source Project
dbe1a24d35
am f6162c80
: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'f6162c80cf048fe710f5cc0502fcfc052ff98385':
2012-07-31 14:51:08 -07:00
The Android Open Source Project
f6162c80cf
Reconcile with jb-mr0-release - do not merge
...
Change-Id: If5252c45f4163409ab8375e27cb13f3f06a237b6
2012-07-31 14:48:53 -07:00
The Android Automerger
2e1cf2aa70
merge in jb-mr0-release history after reset to jb-dev
2012-07-31 14:07:44 -07:00
Ying Wang
e2d5699d25
am 9691c1e6
: (-s ours) am 723bdf1e
: Import translations. DO NOT MERGE
...
* commit '9691c1e646b143690476724b1d7f8dc788cfe00f':
Import translations. DO NOT MERGE
2012-07-30 15:09:41 -07:00
Ying Wang
9691c1e646
am 723bdf1e
: Import translations. DO NOT MERGE
...
* commit '723bdf1ec561d211b45f20546e6938e68feebf39':
Import translations. DO NOT MERGE
2012-07-30 15:06:58 -07:00
Ying Wang
df61ddc964
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-07-30 15:04:59 -07:00
The Android Open Source Project
c99765925d
am a62d7893
: Reconcile with jb-mr0-release jb-release
...
* commit 'a62d7893891d044248553762cd34fe89dd2c7cd6':
2012-07-30 14:46:08 -07:00
The Android Open Source Project
a62d789389
Reconcile with jb-mr0-release jb-release
...
Change-Id: I1e66be92b8c13756b702c251c8b8f93bc8b07a83
2012-07-30 14:44:42 -07:00
Ying Wang
894e3f4208
Import translations. DO NOT MERGE
...
Change-Id: Ia75c76064c1726e4453a5ce54bcfa137fe52f7de
Auto-generated-cl: translation import
2012-07-30 14:26:06 -07:00
Ying Wang
723bdf1ec5
Import translations. DO NOT MERGE
...
Change-Id: I6789871cb46bac62934f63182d2dacce3dda85e3
Auto-generated-cl: translation import
2012-07-30 13:25:03 -07:00
Irfan Sheriff
dd4dd50fe1
Merge "Fix DNS hint in settings" into jb-mr1-dev
2012-07-29 22:30:47 -07:00
Irfan Sheriff
ae0f6d9740
Fix DNS hint in settings
...
Change-Id: I382dbd60c2956a53a77547744790c33e93ce8404
2012-07-29 19:18:03 -07:00
Ying Wang
fdc600a45b
am 270a5503
: (-s ours) am eaeb8b61
: Import translations. DO NOT MERGE
...
* commit '270a55034107d16dc993b61871314a306cb03439':
Import translations. DO NOT MERGE
2012-07-27 15:51:10 -07:00
Ying Wang
270a550341
am eaeb8b61
: Import translations. DO NOT MERGE
...
* commit 'eaeb8b61d630e40dfe3851eb2a5f3300f3b30abe':
Import translations. DO NOT MERGE
2012-07-27 15:46:02 -07:00
Ying Wang
eaeb8b61d6
Import translations. DO NOT MERGE
...
Change-Id: Id5983c861a0f8d50f39517bae9271dba88c9e530
Auto-generated-cl: translation import
2012-07-27 12:25:46 -07:00
The Android Automerger
85f947a77e
merge in jb-mr0-release history after reset to jb-dev
2012-07-26 17:49:58 -07:00
Amith Yamasani
09f2f5afc1
am 2d018a8b
: am 07841668
: Merge "Move Google-apps specific location settings to a Google package" into jb-dev
...
* commit '2d018a8b0d2f0a7e7c3ee9ea2d9ba7df3a161604':
Move Google-apps specific location settings to a Google package
2012-07-26 16:12:51 -07:00
Ying Wang
a7bb69228d
am afc96c1b
: (-s ours) am 4e53a0cb
: Import translations. DO NOT MERGE
...
* commit 'afc96c1b8798d90477b1725b28f565a484a1d592':
Import translations. DO NOT MERGE
2012-07-26 16:12:50 -07:00
Amith Yamasani
2d018a8b0d
am 07841668
: Merge "Move Google-apps specific location settings to a Google package" into jb-dev
...
* commit '078416689807e49c8b6750b9e3cc8a0e9ca3a2a1':
Move Google-apps specific location settings to a Google package
2012-07-26 16:07:19 -07:00
Ying Wang
afc96c1b87
am 4e53a0cb
: Import translations. DO NOT MERGE
...
* commit '4e53a0cbdc56fce1a7fcf94c83d4a0f70ffd6920':
Import translations. DO NOT MERGE
2012-07-26 16:07:17 -07:00
Amith Yamasani
0784166898
Merge "Move Google-apps specific location settings to a Google package" into jb-dev
2012-07-26 16:05:19 -07:00
Ying Wang
4e53a0cbdc
Import translations. DO NOT MERGE
...
Change-Id: I278308a46da25f82ee3da787b628cf67df4b6f0b
Auto-generated-cl: translation import
2012-07-26 15:11:52 -07:00
Amith Yamasani
8442db24a1
Move Google-apps specific location settings to a Google package
...
Bug: 6882764
This removes the Google specific checkbox and adds a master toggle
for location providers which turns both providers on/off when
toggled.
Change-Id: I2a7af0953902bfd6f4b221725dc2d838bb3d0ce4
2012-07-26 14:28:07 -07:00
Ying Wang
f35b013beb
am 7717e194
: (-s ours) am 7021c6e6
: (-s ours) am c31f6b23
: Import translations. DO NOT MERGE
...
* commit '7717e194ce281a57c72628c5fcb51d9365fb5c7f':
Import translations. DO NOT MERGE
2012-07-25 23:05:21 -07:00
Ying Wang
7717e194ce
am 7021c6e6
: (-s ours) am c31f6b23
: Import translations. DO NOT MERGE
...
* commit '7021c6e6df25fc2d100d8351be0eab1605c1693d':
Import translations. DO NOT MERGE
2012-07-25 15:09:39 -07:00
Ying Wang
7021c6e6df
am c31f6b23
: Import translations. DO NOT MERGE
...
* commit 'c31f6b23e400dc00fa69dddf575c33a06def0363':
Import translations. DO NOT MERGE
2012-07-25 15:06:15 -07:00
Ying Wang
3616647488
Merge "Import translations. DO NOT MERGE"
2012-07-25 15:04:20 -07:00
Ying Wang
e275d65ad3
Import translations. DO NOT MERGE
...
Change-Id: I71914c5d78b072ce9ed4aeeaf4c07c0eb05f7967
Auto-generated-cl: translation import
2012-07-25 14:20:30 -07:00