PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,219 Commits 1 Branch 0 Tags
84ba32c91b91866bbab74eebe0097a90c4faac01
Commit Graph

5219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
d6dd555c77 Reconcile with ics-factoryrom-release 
Change-Id: If2f6db678efa1560ab1fa3349be18a03d69624f5
 2011-09-21 06:19:34 -07:00
The Android Automerger
12308cc8d1 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-20 20:43:07 -07:00
Svetoslav Ganov
76bf49e28e am fdff3e70: am 89cd48cd: Merge "Accessibility settings get into state not allowing to enable accessibility." into ics-factoryrom 
* commit 'fdff3e705a7624baf8c344361d2f61eeacb96521':
  Accessibility settings get into state not allowing to enable accessibility.
 2011-09-20 18:06:29 -07:00
Svetoslav Ganov
fdff3e705a am 89cd48cd: Merge "Accessibility settings get into state not allowing to enable accessibility." into ics-factoryrom 
* commit '89cd48cd8e01081f470ea299dbf841a0099226ae':
  Accessibility settings get into state not allowing to enable accessibility.
 2011-09-20 18:04:06 -07:00
Svetoslav Ganov
89cd48cd8e Merge "Accessibility settings get into state not allowing to enable accessibility." into ics-factoryrom 2011-09-20 18:02:20 -07:00
Amith Yamasani
8a73ef8434 am 7e911169: am bce7b69a: Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom 
* commit '7e9111695d42b6d794a5a9beb422b6727c6f6559':
  Move "Pulse notification light" to Display settings.
 2011-09-20 17:01:51 -07:00
Amith Yamasani
7e9111695d am bce7b69a: Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom 
* commit 'bce7b69a27731ae9a58dbfa8f446c3b93d1f1cc6':
  Move "Pulse notification light" to Display settings.
 2011-09-20 16:58:52 -07:00
Amith Yamasani
bce7b69a27 Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom 2011-09-20 16:57:32 -07:00
Eric Fischer
ee7637be42 am 7d858a45: (-s ours) am f85b8b1a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit '7d858a45444a4c3b6b3a91d63d9db12da99eaccf':
  Import revised translations.  DO NOT MERGE
 2011-09-20 16:25:47 -07:00
Freeman Ng
d60e977d84 am d6b8856b: am 01b20096: Merge "adjust char limit for translations" into ics-factoryrom 
* commit 'd6b8856bc1152994ddfb8055ac6a1c292b0dda61':
  adjust char limit for translations
 2011-09-20 16:25:45 -07:00
Amith Yamasani
a3002433f2 am 5faffefa: Merge "Allow shortcuts to Tethering and Data usage screens." 
* commit '5faffefa6308030a41a042129000642f7492ad38':
  Allow shortcuts to Tethering and Data usage screens.
 2011-09-20 16:25:43 -07:00
Eric Fischer
7d858a4544 am f85b8b1a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit 'f85b8b1a17d9c91d5fff5a55c1546544e682c4b1':
  Import revised translations.  DO NOT MERGE
 2011-09-20 15:38:38 -07:00
Eric Fischer
f85b8b1a17 Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-20 15:37:04 -07:00
Freeman Ng
d6b8856bc1 am 01b20096: Merge "adjust char limit for translations" into ics-factoryrom 
* commit '01b2009608a1ce58711efac4541f4acad62e038c':
  adjust char limit for translations
 2011-09-20 15:36:33 -07:00
Freeman Ng
01b2009608 Merge "adjust char limit for translations" into ics-factoryrom 2011-09-20 15:34:30 -07:00
Eric Fischer
513fd05c38 Import revised translations. DO NOT MERGE 
Change-Id: I9f4fbeded8f7d068d70fb1ed29b414d1cc9e4d11
 2011-09-20 15:24:00 -07:00
Freeman Ng
f471c4ece8 adjust char limit for translations 
bug: 5348039
Change-Id: I2c7153b3b8281398644a9a0ebdb1a4921af4f261
 2011-09-20 15:18:05 -07:00
Amith Yamasani
5faffefa63 Merge "Allow shortcuts to Tethering and Data usage screens." 2011-09-20 15:13:35 -07:00
Amith Yamasani
883d850ede Move "Pulse notification light" to Display settings. 
Bug: 5242350
Change-Id: I91cb23ca8f49c1c053710031b0316b10d55fbab4
 2011-09-20 14:41:03 -07:00
Eric Fischer
c4caeeb994 am 367bb497: Merge "Import revised translations." 
* commit '367bb497be57bb4504daf2f9f11ee004348be6d8':
  Import revised translations.
 2011-09-20 14:16:19 -07:00
Luca Zanolin
fc8bad9f17 am c8caf47c: Merge "Change title in the setting for "Speech" category" 
* commit 'c8caf47c7ab8897a9416ad9df188bbc760a99461':
  Change title in the setting for "Speech" category
 2011-09-20 14:15:30 -07:00
The Android Open Source Project
3d67a17861 am dea226fe: Reconcile with ics-factoryrom-release 
* commit 'dea226fec748105535cc32b008a031b127734e3b':
  Add Button to *#*#INFO#*#* for ims registration.
 2011-09-20 14:14:38 -07:00
Svetoslav Ganov
232d031a13 Accessibility settings get into state not allowing to enable accessibility. 
If the setting for enabled accessibility serivces contains a service that
is not installed on the device the system gets into a state that does not
allow enabling accessibility. This state is not recoverable.

bug:5343351

Change-Id: I6127ae00f7a16b190cfe43b68b8e71d49b10911e
 2011-09-20 12:16:13 -07:00
Eric Fischer
367bb497be Merge "Import revised translations." 2011-09-20 11:02:16 -07:00
Eric Fischer
24c4fb1567 Import revised translations. 
Change-Id: Id6474f106ab35f9f0b9c799f3d9c3888868c6f58
 2011-09-20 10:37:57 -07:00
Luca Zanolin
c8caf47c7a Merge "Change title in the setting for "Speech" category" 2011-09-20 10:03:42 -07:00
Luca Zanolin
8cb280ddff Change title in the setting for "Speech" category 
Bug: 5049218
Change-Id: I42a6726600459b9ff3f3ab25118f1c7896f705a8
 2011-09-20 17:58:45 +01:00
The Android Open Source Project
dea226fec7 Reconcile with ics-factoryrom-release 
Change-Id: Id11b3b3373d00ebc6afce94f21ca1b6edfcfca42
 2011-09-20 07:43:27 -07:00
The Android Automerger
255a44f376 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-20 06:28:47 -07:00
Ben Komalo
9333637ca7 am b2e4a5aa: am 69dfd425: Merge "Mark Settings as a "core" app." into ics-factoryrom 
* commit 'b2e4a5aac00fbb5a6796a70841cde76711e52fd0':
  Mark Settings as a "core" app.
 2011-09-19 16:58:39 -07:00
Ben Komalo
b2e4a5aac0 am 69dfd425: Merge "Mark Settings as a "core" app." into ics-factoryrom 
* commit '69dfd42520ccea4556a860b483e264a229293fa2':
  Mark Settings as a "core" app.
 2011-09-19 16:55:51 -07:00
Ben Komalo
69dfd42520 Merge "Mark Settings as a "core" app." into ics-factoryrom 2011-09-19 16:52:32 -07:00
Wink Saville
fdc0217ef7 Add Button to *#*#INFO#*#* for ims registration. 
For testing add a button to toggle SystemProperty
persist.radio.imsregrequired

Bug: 5337311
Change-Id: Id2d8ffa4c67992245d80b0ccafb6ed719fa749cc
 2011-09-19 16:38:56 -07:00
Wink Saville
82650a18a6 am 37dceac5: am 1e596f30: Add Button to *#*#INFO#*#* for ims registration. 
* commit '37dceac57199c4ce135b8eb060ad22d9d697a2c5':
  Add Button to *#*#INFO#*#* for ims registration.
 2011-09-19 15:06:31 -07:00
Wink Saville
37dceac571 am 1e596f30: Add Button to *#*#INFO#*#* for ims registration. 
* commit '1e596f303520d211aebc87dfc0c08108efe80921':
  Add Button to *#*#INFO#*#* for ims registration.
 2011-09-19 15:02:02 -07:00
Ben Komalo
b08172eec6 Mark Settings as a "core" app. 
This ensures settings is still loaded when the framework loads in a
minified state (e.g. while encrypting the device).

Bug: 5031399
Change-Id: I8c1c7331eb34c192abb18b9a77426f2e028baccb
 2011-09-19 14:27:13 -07:00
Wink Saville
1e596f3035 Add Button to *#*#INFO#*#* for ims registration. 
For testing add a button to toggle SystemProperty
persist.radio.imsregrequired

Bug: 5337311
Change-Id: Id2d8ffa4c67992245d80b0ccafb6ed719fa749cc
 2011-09-19 14:24:39 -07:00
Amith Yamasani
7836e4ad7b Allow shortcuts to Tethering and Data usage screens. 
Bug: 5290301
Change-Id: Id271fd33a54adb38ce3312d4a03fd6f4a05394e8
 2011-09-19 13:25:52 -07:00
Jeff Sharkey
c8657d38fc am 3361663e: am 2ae88521: Merge "Surface tethering stats in data usage." into ics-factoryrom 
* commit '3361663e37154b19316179e05955f05887d9ddc4':
  Surface tethering stats in data usage.
 2011-09-18 16:19:39 -07:00
Jeff Sharkey
3361663e37 am 2ae88521: Merge "Surface tethering stats in data usage." into ics-factoryrom 
* commit '2ae885210ef04d2533a2fc121a7f2b8770efa7e4':
  Surface tethering stats in data usage.
 2011-09-18 16:17:37 -07:00
Jeff Sharkey
2ae885210e Merge "Surface tethering stats in data usage." into ics-factoryrom 2011-09-18 16:15:53 -07:00
Mike Lockwood
239c225994 am ed9d4618: Fix race condition in MTP/PTP checkbox updating 
* commit 'ed9d461818780a6c38a081030a55983ea0883fa6':
  Fix race condition in MTP/PTP checkbox updating
 2011-09-18 15:30:52 -07:00
Mike Lockwood
ed9d461818 Fix race condition in MTP/PTP checkbox updating 
UsbManager.getDefaultFunction() might not return the updated state immediately
after changing the USB configuration, so do not rely on it for updating
after a checkbox has been clicked.

Change-Id: I5ae8d46854f24403cda2c62e006c742dcd257d1d
Bug: 5334777

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-09-18 17:52:54 -04:00
Jeff Sharkey
a83a24f48a Surface tethering stats in data usage. 
Bug: 5244846
Change-Id: Ib4ac03ab634278714576a66ef8d6fdbc6d15c82a
 2011-09-16 18:28:39 -07:00
Danielle Millett
375909a823 am c57b135d: Merge "Adding info explaining facelock\'s backup lock" 
* commit 'c57b135d560c2b23631083dde86b74463c036085':
  Adding info explaining facelock's backup lock
 2011-09-16 17:51:40 -07:00
Danielle Millett
c57b135d56 Merge "Adding info explaining facelock's backup lock" 2011-09-16 17:48:35 -07:00
Eric Fischer
e22b4babd7 am 7f1f5f84: (-s ours) am f4d6c876: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit '7f1f5f8481ecb2203940d10664800cd3062aad1a':
  Import revised translations.  DO NOT MERGE
 2011-09-16 16:29:12 -07:00
Eric Fischer
7f1f5f8481 am f4d6c876: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit 'f4d6c876218124364e0e044426cc86058b20d935':
  Import revised translations.  DO NOT MERGE
 2011-09-16 16:27:30 -07:00
Eric Fischer
f4d6c87621 Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-16 16:25:25 -07:00
Irfan Sheriff
20ddc7e0f9 am 735f312b: Merge "Update p2p settings UI" 
* commit '735f312beb39fd45b8cce0544042487968a30e18':
  Update p2p settings UI
 2011-09-16 16:08:39 -07:00