PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,501 Commits 1 Branch 0 Tags
9698d3624c5e66cbff3c89e56a1388b6b2be9c1d
Commit Graph

7501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
9698d3624c Reconcile with jb-mr1-release - do not merge 
Change-Id: I73e4c2917ac2df4341096582c1a1d1eab7df8a66
 2012-08-10 08:53:55 -07:00
Przemyslaw Szczepaniak
06649d02b2 am 923187a1: Keep speech rate dialog after rotate 
* commit '923187a159cb0c192a2f978a6bf1dd51275ea916':
  Keep speech rate dialog after rotate
 2012-08-10 07:17:36 -07:00
Przemyslaw Szczepaniak
923187a159 Keep speech rate dialog after rotate 
It also adds some missing @Override

Bug: 5997716
Change-Id: I33a7b8ad16cd067af960a4808ae6003dde1d7693
 2012-08-10 07:13:52 -07:00
Baligh Uddin
2dc3d55196 am 658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '658f909d711b1598ec6f49447679569f0bc19c15':
  Import translations. DO NOT MERGE
 2012-08-09 19:52:40 -07:00
Baligh Uddin
658f909d71 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-09 19:50:14 -07:00
Irfan Sheriff
6a88ef4bd2 am aae0659e: Setting to turn off power optimizations 
* commit 'aae0659e18e013401b83717a83ec25393d4ba626':
  Setting to turn off power optimizations
 2012-08-09 15:58:13 -07:00
Irfan Sheriff
aae0659e18 Setting to turn off power optimizations 
Bug: 5885175
Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763
 2012-08-09 15:16:07 -07:00
Baligh Uddin
0ad6982813 Import translations. DO NOT MERGE 
Change-Id: Iae1a278483147ad7497d207856bb9cf6a56a0bb1
Auto-generated-cl: translation import
 2012-08-09 12:39:18 -07:00
The Android Automerger
9daa72c4e8 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-09 09:29:59 -07:00
John Spurlock
aeb7b57105 am eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev 
* commit 'eaffad37c19ac5859539c232a7dc8d2f47159f61':
  Fix NPE in Dreams settings.
 2012-08-09 06:20:50 -07:00
John Spurlock
eaffad37c1 Merge "Fix NPE in Dreams settings." into jb-mr1-dev 2012-08-09 06:18:45 -07:00
John Spurlock
7a99b21a4b Fix NPE in Dreams settings. 
Handle the null case to avoid crashing Settings.

Change-Id: I257b766370bd604e0af5b332241619258fb732c9
 2012-08-09 09:03:48 -04:00
Baligh Uddin
8aa634529c am 702cdf4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '702cdf4c9a84fd9bcb258cdb26c57fd8d50961d6':
  Import translations. DO NOT MERGE
 2012-08-08 20:04:24 -07:00
Baligh Uddin
702cdf4c9a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-08 20:02:24 -07:00
Jean-Baptiste Queru
17d915b7fd am 66321184: am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app." 
* commit '66321184570da9e93c089b2a1065fc3d4c7230a3':
  Add support for SE Android to the Settings app.
 2012-08-08 14:09:11 -07:00
Jean-Baptiste Queru
6632118457 am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app." 
* commit '7526636406087666d005d389ddc0cdacd79499fd':
  Add support for SE Android to the Settings app.
 2012-08-08 14:06:31 -07:00
Jean-Baptiste Queru
7526636406 am 5d72b272: Merge "Add support for SE Android to the Settings app." 
* commit '5d72b2726797374e402943182d8132045ed32d3a':
  Add support for SE Android to the Settings app.
 2012-08-08 14:04:11 -07:00
Baligh Uddin
24fb893381 Import translations. DO NOT MERGE 
Change-Id: I7a08f18c8f4ed45612e5491aa2b0ba2812373013
Auto-generated-cl: translation import
 2012-08-08 13:40:29 -07:00
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
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
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
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
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
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
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
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
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
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
20d8abc638 Reconcile with jb-mr1-release - do not merge 
Change-Id: I577fb5bc77b6df44adec589f76d0c2aecdd8eba0
 2012-08-06 13:25:50 -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
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
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
c868a4cae7 Import translations. DO NOT MERGE 
Change-Id: I1de6f9c42101f6c984c79a75882d691692f17af5
Auto-generated-cl: translation import
 2012-08-03 13:44:19 -07:00