PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,189 Commits 1 Branch 0 Tags
4c8ef82c27b450fbba3c6aa763ff0ac5eefe7b7c
Commit Graph

5189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
2e56b15ae7 am 16a9b14f: Merge "Don\'t append list of accounts every time we return to this screen." 
* commit '16a9b14fa748c742c62f621586244303da4f4d8e':
  Don't append list of accounts every time we return to this screen.
 2011-09-22 17:05:41 -07:00
Amith Yamasani
16a9b14fa7 Merge "Don't append list of accounts every time we return to this screen." 2011-09-22 17:04:12 -07:00
Wink Saville
fbea38fd2b Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom 2011-09-22 15:29:19 -07:00
Wink Saville
382a75b105 Add a button to enable/disable Mobile Terminated SMS over IMS 
This toggles persist.radio.imsallowmtsms between 0/1 which can
be used during testing and bring up of SMS over IMS.

Change-Id: I4581bca76899445e825260e8af6a39903d029c44
 2011-09-22 15:17:00 -07:00
Amith Yamasani
3f45de559f Don't append list of accounts every time we return to this screen. 
Bug: 5355920

Remove the contents of the layout before adding the accounts.

Change-Id: Ic9256140f892968b2388f47d982eaada720df892
 2011-09-22 14:34:17 -07:00
The Android Open Source Project
11f7d40e68 am 2407efcf: Reconcile with ics-factoryrom-release 
* commit '2407efcf42baf1646094d80035997ff169d3eff4':
 2011-09-22 11:00:53 -07:00
The Android Open Source Project
2407efcf42 Reconcile with ics-factoryrom-release 
Change-Id: I5c6e500d5a097aa638399321001fec81493cc0c4
 2011-09-22 10:57:43 -07:00
Jeff Hamilton
041a34075c am 4cfe1055: am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-factoryrom 
* commit '4cfe105506035f151242080e0ac7bd205542a2d9':
  Bring back the Android Beam settings panel.
 2011-09-22 10:49:53 -07:00
Jeff Hamilton
4cfe105506 am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-factoryrom 
* commit '0d299625ebadae3d8b0881979633680e16b07daa':
  Bring back the Android Beam settings panel.
 2011-09-22 10:48:20 -07:00
Jeff Hamilton
0d299625eb Merge "Bring back the Android Beam settings panel." into ics-factoryrom 2011-09-22 10:47:03 -07:00
Jeff Hamilton
8ccddfd8d4 am a1b6fdf4: am 4a2aabc4: Merge "Add strings for translation." into ics-factoryrom 
* commit 'a1b6fdf4738e0d0aec4eb389316a7c354fe37c00':
  Add strings for translation.
 2011-09-22 10:43:03 -07:00
Jeff Hamilton
a1b6fdf473 am 4a2aabc4: Merge "Add strings for translation." into ics-factoryrom 
* commit '4a2aabc4d739ded949daa721adfce55fed2be2b6':
  Add strings for translation.
 2011-09-22 10:41:34 -07:00
Jeff Hamilton
4a2aabc4d7 Merge "Add strings for translation." into ics-factoryrom 2011-09-22 10:40:23 -07:00
Jeff Hamilton
3d670de5ce Bring back the Android Beam settings panel. 
Bug: 5350022
Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf
 2011-09-22 12:35:55 -05:00
Jeff Hamilton
7c430090c9 Add strings for translation. 2011-09-22 12:35:54 -05:00
Ben Komalo
80aa812f86 am dd3302ef: am 9ee164f4: Properly initialize wakelock for cryptkeeper. 
* commit 'dd3302efbed7ea3c596e6ef99a9c8b578e76f14c':
  Properly initialize wakelock for cryptkeeper.
 2011-09-22 10:04:16 -07:00
Ben Komalo
dd3302efbe am 9ee164f4: Properly initialize wakelock for cryptkeeper. 
* commit '9ee164f44ea1ad66fa16ed702eb885e36ade0d8b':
  Properly initialize wakelock for cryptkeeper.
 2011-09-22 10:02:22 -07:00
Ben Komalo
9ee164f44e Properly initialize wakelock for cryptkeeper. 
Bug: 3385856
Change-Id: I6dc39b02b81e290af0b47f6a6c9ba2da3e7c65c3
 2011-09-21 10:40:50 -07:00
The Android Automerger
bdf9546b53 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-21 06:30:24 -07:00
The Android Open Source Project
5a6a965ff1 am d6dd555c: Reconcile with ics-factoryrom-release 
* commit 'd6dd555c7768a009cb40c70b5a94b786f79f2ad0':
 2011-09-21 06:21:16 -07:00
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