PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,982 Commits 1 Branch 0 Tags
5081855beb631f11f5ba35a43a65bb86d3e30f44
Commit Graph

7982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
930aca64f4 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-06 06:29:17 -07:00
Ying Wang
b44a7a0d4f am 010a775e: (-s ours) am 0a837485: am bdae7b01: (-s ours) am 3eee86b8: Import translations. DO NOT MERGE 
* commit '010a775e5120a86d8495806ccde3db11948831ee':
  Import translations. DO NOT MERGE
 2012-08-03 14:45:21 -07:00
Ying Wang
010a775e51 am 0a837485: am bdae7b01: (-s ours) am 3eee86b8: Import translations. DO NOT MERGE 
* commit '0a837485800aa38a2c6832c98c6dc09ee22c9047':
  Import translations. DO NOT MERGE
 2012-08-03 14:44:07 -07:00
Ying Wang
ff83792ba7 am ede6fa43: (-s ours) am c868a4ca: Import translations. DO NOT MERGE 
* commit 'ede6fa43b782bc256ab71e8ce39c397d4b087c5d':
  Import translations. DO NOT MERGE
 2012-08-03 14:42:09 -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
ede6fa43b7 am c868a4ca: Import translations. DO NOT MERGE 
* commit 'c868a4cae7c13671d97b960cc7fdf6b447d2f1ba':
  Import translations. DO NOT MERGE
 2012-08-03 14:39:27 -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
d42a078a78 Import translations. DO NOT MERGE 
Change-Id: I72db87024ffa750053b8ba14ced192e36e9727d3
Auto-generated-cl: translation import
 2012-08-03 13:48:26 -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
08c147392b am 31eab697: am 104ab231: Merge "Fixes list of TTS voices after changing voice data" into jb-mr1-dev 
* commit '31eab6973c5472475677532d0b4d63cacb64a656':
  Fixes list of TTS voices after changing voice data
 2012-08-03 09:21:56 -07:00
Przemyslaw Szczepaniak
31eab6973c am 104ab231: Merge "Fixes list of TTS voices after changing voice data" into jb-mr1-dev 
* commit '104ab231e5b8541b84460f32d30578755e60a765':
  Fixes list of TTS voices after changing voice data
 2012-08-03 09:19:53 -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
ef512efbeb am 09e97989: am b54b45d9: Merge "Re-enable dreams: Settings" into jb-mr1-dev 
* commit '09e97989f4d8846a202a8324e98a10ac52c543e6':
  Re-enable dreams: Settings
 2012-08-03 08:57:59 -07:00
John Spurlock
09e97989f4 am b54b45d9: Merge "Re-enable dreams: Settings" into jb-mr1-dev 
* commit 'b54b45d93ba378ef91e551f1073888de55b9e982':
  Re-enable dreams: Settings
 2012-08-03 08:55:53 -07:00
John Spurlock
b54b45d93b Merge "Re-enable dreams: Settings" into jb-mr1-dev 2012-08-03 08:53:22 -07:00
Michael Jurka
8c20dcf1df am 8ce21bdb: am 6e380d08: am 3d43f9c8: am ca511a81: Fix appwidget bind dialog 
* commit '8ce21bdbd2a9d20cd88bfd491e7281114cc77cfa':
  Fix appwidget bind dialog
 2012-08-02 22:35:22 -07:00
Michael Jurka
8ce21bdbd2 am 6e380d08: am 3d43f9c8: am ca511a81: Fix appwidget bind dialog 
* commit '6e380d0865e397e251f516c7ccefedf26ed8801d':
  Fix appwidget bind dialog
 2012-08-02 22:34:13 -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
The Android Open Source Project
3e3da16333 am 34ef420a: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '34ef420a1e99fda1b361f9552c1e8a0450db0715':
 2012-08-02 15:09:10 -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
The Android Open Source Project
34ef420a1e Reconcile with jb-mr1-release - do not merge 
Change-Id: Ic1a68162e9f5c0d65ef87216a47d17a7c4b52c27
 2012-08-02 11:27:20 -07:00
The Android Automerger
d6b4c99a2f merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-02 08:18:19 -07: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
f9c28b59fd am 4c0ad89c: (-s ours) am 6a20ce5e: am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE 
* commit '4c0ad89c169af0d2841de1924c5fe1dd6931e6a0':
  Import translations. DO NOT MERGE
 2012-08-01 15:36:04 -07:00
Ying Wang
4c0ad89c16 am 6a20ce5e: am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE 
* commit '6a20ce5e515141b0934bd4093dbad53c14a19a6e':
  Import translations. DO NOT MERGE
 2012-08-01 15:34:00 -07:00
Ying Wang
099e9c017b am 3b290bc0: (-s ours) am 4c9e26b0: Import translations. DO NOT MERGE 
* commit '3b290bc0178fc211fb70d969848d5a392944f828':
  Import translations. DO NOT MERGE
 2012-08-01 15:32:17 -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
cb12d7f68d Merge "Import translations. DO NOT MERGE" 2012-08-01 15:30:23 -07:00
Ying Wang
3b290bc017 am 4c9e26b0: Import translations. DO NOT MERGE 
* commit '4c9e26b0d2ebee28027de0703fbdc9195166ba72':
  Import translations. DO NOT MERGE
 2012-08-01 15:29:02 -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
3a4cdfc58a Import translations. DO NOT MERGE 
Change-Id: Id0a6b06f181160927a341412ce78ed11bbdae615
Auto-generated-cl: translation import
 2012-08-01 14:18:26 -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
Justin Koh
0962a5cf35 am 7b065464: Move BT settings appliance check after foreground check. 
* commit '7b065464c996b792c1ecdd9d8c93db1bf0538b8d':
  Move BT settings appliance check after foreground check.
 2012-08-01 10:59:34 -07:00
Ravi Nagarajan
74b8a51d97 am dd2bf1d5: am c70f5483: Reset the priority on unbond 
* commit 'dd2bf1d583bf186075b807152b98e3d30179cb2a':
  Reset the priority on unbond
 2012-08-01 00:46:42 -07:00
Swaminatha Balaji
82d3a75f73 am 8f94abd0: am b45e3c8f: Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled 
* commit '8f94abd065ba3498e5b5eb986608c9950c4365ff':
  Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
 2012-08-01 00:46:41 -07:00
Ganesh Ganapathi Batta
aa9ab830f3 am 8a0103df: am 802956ec: Add dev to cached dev list if entry is missing before auto connect 
* commit '8a0103df4ef5425ca63071ab0b8db4b3cf00dbd2':
  Add dev to cached dev list if entry is missing before auto connect
 2012-08-01 00:46:40 -07:00
Ravi Nagarajan
dd2bf1d583 am c70f5483: Reset the priority on unbond 
* commit 'c70f5483553f5ff2bddc289ea8b7741bc81c9fbf':
  Reset the priority on unbond
 2012-08-01 00:44:12 -07:00
Swaminatha Balaji
8f94abd065 am b45e3c8f: Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled 
* commit 'b45e3c8fe9c08851800a6afa362d975944c0cd46':
  Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
 2012-08-01 00:44:09 -07:00
Ganesh Ganapathi Batta
8a0103df4e am 802956ec: Add dev to cached dev list if entry is missing before auto connect 
* commit '802956ec9b22464ed327c0c2cbc59f6b6a309c88':
  Add dev to cached dev list if entry is missing before auto connect
 2012-08-01 00:44:07 -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
Justin Koh
7b065464c9 Move BT settings appliance check after foreground check. 
Move the BT settings appliance check after the foreground activity check.
This allows us to pair bt devices if we have a UI hooked up instead of never
allowing it.

TESTED = runs on Nexus Q.

Change-Id: I3c1ea4abb8d05236d91d2525934bec757cc5ca88
 2012-07-31 18:32:39 -07:00
The Android Open Source Project
82b6c521af am c6e71902: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'c6e719022734f3f030327022f757e50f54970baa':
 2012-07-31 15:06:04 -07:00
The Android Open Source Project
c6e7190227 Reconcile with jb-mr1-release - do not merge 
Change-Id: Icc9358e5fffbcb4af923a9f66b59b15d6113fade
 2012-07-31 15:04:02 -07:00