PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,072 Commits 1 Branch 0 Tags
00798e6bcd24b0ec446dffd748f9fb656812c67f
Commit Graph

8072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
5d72b27267 Merge "Add support for SE Android to the Settings app." 2012-08-08 13:19:26 -07:00
The Android Open Source Project
77ea82f697 am a01ab9e5: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'a01ab9e5763b16e89239f40a56edfee5f0c8fa75':
 2012-08-08 08:21:52 -07:00
The Android Open Source Project
a01ab9e576 Reconcile with jb-mr1-release - do not merge 
Change-Id: I6809fcad464f90b62407ba5e19da9a226ca3be83
 2012-08-08 08:18:04 -07:00
The Android Automerger
3f793b5654 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-08 06:47:58 -07:00
Matthew Xie
4b6c57c74b am 83457dd7: am a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev 
* commit '83457dd79bb481afe9a1ad16259802b0a09fe68a':
  Remove Profile Auto connection specific logic
 2012-08-08 00:37:48 -07:00
Matthew Xie
83457dd79b am a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev 
* commit 'a1f463cb1930e806420844d4915def2dcfe7ae72':
  Remove Profile Auto connection specific logic
 2012-08-08 00:35:29 -07:00
Matthew Xie
a1f463cb19 Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev 2012-08-08 00:33:38 -07:00
Baligh Uddin
e7522c808f Merge "Import translations. DO NOT MERGE" 2012-08-07 16:12:21 -07:00
The Android Open Source Project
227a1f66e7 am 422446e1: (-s ours) am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '422446e1ef8d42501a72800f81037ff142119f62':
 2012-08-07 15:22:53 -07:00
Baligh Uddin
13568ef880 am eb2de9e8: (-s ours) am 6ac8bae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'eb2de9e879489bc62adca6ea19c54836b77b7a6d':
  Import translations. DO NOT MERGE
 2012-08-07 15:22:43 -07:00
The Android Open Source Project
422446e1ef am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '4325cf22ef3d381bc9d28d264571ba305da94d57':
 2012-08-07 15:16:20 -07:00
The Android Open Source Project
4325cf22ef am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '7e107a0903707876c0ad7dd4ee2702fd5baed7ae':
 2012-08-07 15:14:14 -07:00
The Android Open Source Project
7e107a0903 Reconcile with jb-mr0-release - do not merge 
Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5
 2012-08-07 14:59:46 -07:00
Baligh Uddin
eb2de9e879 am 6ac8bae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6ac8bae6a927c918391224277ff3c1524e7565a4':
  Import translations. DO NOT MERGE
 2012-08-07 14:55:55 -07:00
Baligh Uddin
6ac8bae6a9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-07 14:54:02 -07:00
Baligh Uddin
502e4e2b50 Import translations. DO NOT MERGE 
Change-Id: I0aae3c990b8f8b72ef3e8c2cbb6719bf7b05135e
Auto-generated-cl: translation import
 2012-08-07 14:27:38 -07:00
Baligh Uddin
7eac4706a8 Import translations. DO NOT MERGE 
Change-Id: I9d1d42585e5e2f0299a2a761089bb7984ca55531
Auto-generated-cl: translation import
 2012-08-07 14:24:33 -07:00
The Android Automerger
9a85ed20ee merge in jb-mr0-release history after reset to jb-dev 2012-08-07 13:01:34 -07:00
Dianne Hackborn
4f7a133f36 am eb657dc8: am f621435e: Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev 
* commit 'eb657dc8eb8f6bb990b8dd974dd92844106f2572':
  Add dev setting to enable global actions bug report button.
 2012-08-07 11:52:56 -07:00
Dianne Hackborn
eb657dc8eb am f621435e: Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev 
* commit 'f621435eafcb46f69b35b8a6b8119ab87801e9ef':
  Add dev setting to enable global actions bug report button.
 2012-08-07 11:51:11 -07:00
Dianne Hackborn
f621435eaf Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev 2012-08-07 11:49:15 -07:00
Dianne Hackborn
2d803a3931 Add dev setting to enable global actions bug report button. 
Change-Id: I3768f95e1c6fbec9c10186093e5e1d48b0ef6ae4
 2012-08-07 11:26:32 -07:00
The Android Open Source Project
ab1db58b5d am 5acc9098: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '5acc909860388a8863e3ec9d38a290fd418cce22':
 2012-08-07 11:08:26 -07:00
The Android Open Source Project
5acc909860 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ie33aa8887f43fe794d289a745451db6fa73a9c20
 2012-08-07 11:04:56 -07:00
The Android Automerger
1b77762212 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-07 06:35:02 -07:00
Ganesh Ganapathi Batta
0654b71534 Remove Profile Auto connection specific logic 
Remove  profile auto connection specific logic as it is not implemented in
Bluetooth app
Disconnect PBAP server connection  when user initiates device level disconnection

Change-Id: I381ed96f6b57f414bbaccd694f55d2b992e330a4
 2012-08-06 23:27:27 -07:00
Matthew Xie
b0280b7dfc am 8756c500: am 9effd146: Merge "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 i 
* commit '8756c500a1aa22b9b81eeeb7f25ec7246a1c1464':
  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.
 2012-08-06 22:52:27 -07:00
Matthew Xie
8756c500a1 am 9effd146: Merge "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, 
* commit '9effd146114364c91d44b9a44ade761b69bdd1cf':
  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.
 2012-08-06 22:50:29 -07:00
Matthew Xie
9effd14611 Merge "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." into jb-mr1-dev 2012-08-06 22:48:41 -07:00
Baligh Uddin
2bea55eb2e am 92970227: (-s ours) am 2e80628f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '92970227f5d296c8a53a037dd825035706edb6b4':
  Import translations. DO NOT MERGE
 2012-08-06 19:54:43 -07:00
Baligh Uddin
92970227f5 am 2e80628f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2e80628f74abd6ec8d886cf82d70f6cc092faf90':
  Import translations. DO NOT MERGE
 2012-08-06 19:53:17 -07:00
Baligh Uddin
2e80628f74 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-06 19:51:22 -07:00
Baligh Uddin
e105d9ce09 Merge "Import translations. DO NOT MERGE" 2012-08-06 19:41:53 -07:00
Romain Guy
0c51012c86 am d542deb4: am cdc2c553: Add new dev settings to debug hardware layers 
* commit 'd542deb40e40d1af995b0757b86dd23402256e63':
  Add new dev settings to debug hardware layers
 2012-08-06 14:57:54 -07:00
Romain Guy
d542deb40e am cdc2c553: Add new dev settings to debug hardware layers 
* commit 'cdc2c5534f8815cf0fef3ece4b95c25a0423f461':
  Add new dev settings to debug hardware layers
 2012-08-06 14:56:12 -07:00
Romain Guy
cdc2c5534f Add new dev settings to debug hardware layers 
Change-Id: I2668552d70911a90e173efdf75bc44139ed394c8
 2012-08-06 14:52:52 -07:00
The Android Open Source Project
01f4ede776 am 20d8abc6: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '20d8abc638df1dba3c9dc95601aabed200a5abd1':
 2012-08-06 13:28:57 -07:00
The Android Open Source Project
20d8abc638 Reconcile with jb-mr1-release - do not merge 
Change-Id: I577fb5bc77b6df44adec589f76d0c2aecdd8eba0
 2012-08-06 13:25:50 -07:00
Baligh Uddin
5623fb2293 Import translations. DO NOT MERGE 
Change-Id: I032a2eed7c9fe4f3ef1bdf24de794f2143e5f7f0
Auto-generated-cl: translation import
 2012-08-06 13:12:11 -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
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