PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,493 Commits 1 Branch 0 Tags
838c0f2ad07d12f315b51b7ada99281bfbad8f2c
Commit Graph

2493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
838c0f2ad0 am 28539897: am 8815f032: Merge "Always set right auth_type value in apn." 
Merge commit '28539897151f0980b0a190ce82b3adf6337d081c'

* commit '28539897151f0980b0a190ce82b3adf6337d081c':
  Always set right auth_type value in apn.
 2010-10-25 17:59:56 -07:00
Jean-Baptiste Queru
2853989715 am 8815f032: Merge "Always set right auth_type value in apn." 
Merge commit '8815f03202abf3117b6a1f6a058a835915ddae04' into gingerbread-plus-aosp

* commit '8815f03202abf3117b6a1f6a058a835915ddae04':
  Always set right auth_type value in apn.
 2010-10-25 17:32:17 -07:00
Jean-Baptiste Queru
8815f03202 Merge "Always set right auth_type value in apn." 2010-10-25 16:40:13 -07:00
Eric Fischer
9ea6e2500f am c26cfa35: (-s ours) am 873a27c3: Import revised translations. DO NOT MERGE 
Merge commit 'c26cfa35b8e7d9e1ecc50f93825a05c08afed976'

* commit 'c26cfa35b8e7d9e1ecc50f93825a05c08afed976':
  Import revised translations.  DO NOT MERGE
 2010-10-25 16:22:34 -07:00
Eric Fischer
c26cfa35b8 am 873a27c3: Import revised translations. DO NOT MERGE 
Merge commit '873a27c399a50cb2a4703cc895c1601124ae208d' into gingerbread-plus-aosp

* commit '873a27c399a50cb2a4703cc895c1601124ae208d':
  Import revised translations.  DO NOT MERGE
 2010-10-25 16:16:14 -07:00
Eric Fischer
873a27c399 Import revised translations. DO NOT MERGE 
Change-Id: I0cb51009ba4b9954dd673d7f653f0e0b8376ca72
 2010-10-25 15:46:11 -07:00
Roy West
1e8d29868d Fix bug3100739 re dev admin settings strings 
Change-Id: Ica5cc926fb8a3ec3af9d4925f086ded0ac683c3a
 2010-10-25 07:33:41 -07:00
Marta Białka
1929008ac5 Always set right auth_type value in apn. 
It fixes a bug that automatically sets auth_type value
of editing apn that has and should have that value set
to null (-1 = Not yet set) to auth_type value of an
apn previously displayed in the apn editor. It is
caused by careless persisting and reading data from
SharedPreferences. Fixed to keep and persist (to be
consistent with other apn's Preferences) null value
for not yet set auth_type property.

Change-Id: I4e125a4cdbad968c9f6ea8781a8c849f4c31c929
 2010-10-25 15:39:04 +02:00
Daisuke Miyakawa
1aac3240ef Merge "Disable Wifi when a user press cancel in XL setup" 2010-10-24 13:43:52 -07:00
Eric Fischer
e94640aa93 am 0b655575: (-s ours) am 901f4fbe: Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:06:48 -07:00
Eric Fischer
0b655575d9 am 901f4fbe: Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:03:49 -07:00
Eric Fischer
901f4fbe29 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:01:29 -07:00
Eric Fischer
e6d4ba594c Import revised translations. DO NOT MERGE 
Change-Id: I3edc02925b4d8bc149dd8a76056f86f3b5130e4e
 2010-10-22 15:31:13 -07:00
Dianne Hackborn
2d968c6d84 am 8731cb1b: am 5e34f239: Fix issue #3124528: Mange applications is including cache files in storage size 2010-10-22 13:01:02 -07:00
Dianne Hackborn
8731cb1b6a am 5e34f239: Fix issue #3124528: Mange applications is including cache files in storage size 2010-10-22 12:59:31 -07:00
Dianne Hackborn
5e34f23986 Fix issue #3124528: Mange applications is including cache files in storage size 
Change-Id: If26aeaed7572354feca7b8e65b7451a024a10266
 2010-10-22 12:18:16 -07:00
Jaikumar Ganesh
659b39abf8 Update BT APIs for change in return type. 
Change-Id: Ic85b47da50876fd6bdc6e223af4248a8586d82bc
 2010-10-22 11:12:48 -07:00
Mathew Inwood
f8b25796f0 Add 'Use My Location for Google services'. 
This interfaces to GSF to actually change the setting as Settings doesn't
have the permissions to do it directly. When GSF is not present on the device,
the setting will be hidden.

Depending on change: Ib3809571fe22f40ba34468d39fedfff70f0742ef
Bug: 3093036

Change-Id: I98596cce118f0fa5ebae45a7f8ab9c9f8a3bf2bc
 2010-10-22 12:24:02 +01:00
Daisuke Miyakawa
55de702961 Disable Wifi when a user press cancel in XL setup 
Bug: 3122182
Change-Id: Id333b9ede9093fa7fb8aa256b720effa5abf290d
 2010-10-21 19:40:16 -07:00
Eric Fischer
d947937f4d resolved conflicts for merge of 92acdba0 to master 
Change-Id: I3598e15091fdb2593a2d9d56f6bf646ddc87e879
 2010-10-21 18:31:02 -07:00
Eric Fischer
92acdba01c am a640fb4f: Fix the build. A "--" token is not just text in an XML comment. 
Merge commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38' into gingerbread-plus-aosp

* commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38':
  Fix the build.  A "--" token is not just text in an XML comment.
 2010-10-21 18:22:09 -07:00
Eric Fischer
a640fb4f97 Fix the build. A "--" token is not just text in an XML comment. 
Change-Id: Ifbc3de1dd209860f516920e5b9c1742813845380
 2010-10-21 18:15:34 -07:00
Roy West
2ae29ff0ed am d2927990: (-s ours) am 69827524: Try to fix bug3119318 without breaking the build this time 
Merge commit 'd2927990ffe0d8ac385e16a38c189ace00065cff'

* commit 'd2927990ffe0d8ac385e16a38c189ace00065cff':
  Try to fix bug3119318 without breaking the build this time
 2010-10-21 17:59:54 -07:00
Roy West
d2927990ff am 69827524: Try to fix bug3119318 without breaking the build this time 
Merge commit '69827524365ae448d19b2089c46534e925cc2bfd' into gingerbread-plus-aosp

* commit '69827524365ae448d19b2089c46534e925cc2bfd':
  Try to fix bug3119318 without breaking the build this time
 2010-10-21 17:53:37 -07:00
Roy West
6982752436 Try to fix bug3119318 without breaking the build this time 
Change-Id: Ic89675546f3ab72588ce18fbe7740749da6f870c
 2010-10-21 17:42:44 -07:00
Jean-Baptiste Queru
da7eb065b6 Merge from gingerbread-plus-aosp 
Change-Id: Ib645dbd78ffc393b6cbe568d9a351ced2d3adc30
 2010-10-21 17:19:27 -07:00
Mathias Agopian
340db2bafa am 9f869d11: Revert "Fix bug3119318, missing Mount USB storage strings" 
Merge commit '9f869d1198fcf1866ad2a6451df05f5d72653711' into gingerbread-plus-aosp

* commit '9f869d1198fcf1866ad2a6451df05f5d72653711':
  Revert "Fix bug3119318, missing Mount USB storage strings"
 2010-10-21 17:07:11 -07:00
Mathias Agopian
9f869d1198 Revert "Fix bug3119318, missing Mount USB storage strings" 
This reverts commit af06d7a94a.
 2010-10-21 16:37:59 -07:00
Roy West
c1267a9883 am af06d7a9: Fix bug3119318, missing Mount USB storage strings 
Merge commit 'af06d7a94a69d82ef5f2d8082e75c368f4204afb' into gingerbread-plus-aosp

* commit 'af06d7a94a69d82ef5f2d8082e75c368f4204afb':
  Fix bug3119318, missing Mount USB storage strings
 2010-10-21 15:57:35 -07:00
Roy West
af06d7a94a Fix bug3119318, missing Mount USB storage strings 
Change-Id: Iefebd97d85ad4a51f604e9a7fa709ba84c94239d
 2010-10-21 15:47:14 -07:00
Nick Pelly
26d5c2b283 am 26d6e470: am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread 
Merge commit '26d6e4704a9e514097ad88c04b29a4e8b325344f'

* commit '26d6e4704a9e514097ad88c04b29a4e8b325344f':
  NFC Settings cleanup.
 2010-10-21 13:50:02 -07:00
Dianne Hackborn
50ee821003 am 149fec6a: am 7a519955: Merge "Fix issue #3114356: Storage visualization in Manage Apps is confusing" into gingerbread 
Merge commit '149fec6a899079eba30743e7055834969c138d52'

* commit '149fec6a899079eba30743e7055834969c138d52':
  Fix issue #3114356: Storage visualization in Manage Apps is confusing
 2010-10-21 13:47:00 -07:00
Nick Pelly
834735a955 am 029f23c3: am ff8018dc: Merge "Fix NFC permission." into gingerbread 
Merge commit '029f23c32c9fe0c7f288d383a8704bfa420d4ed0'

* commit '029f23c32c9fe0c7f288d383a8704bfa420d4ed0':
  Fix NFC permission.
 2010-10-21 13:46:55 -07:00
Dianne Hackborn
0fda1ad88c am 5cfa7587: am 916adce0: Fix issue #3108683: GRH18: Battery usage chart FCs 
Merge commit '5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7'

* commit '5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7':
  Fix issue #3108683: GRH18: Battery usage chart FCs
 2010-10-21 10:41:35 -07:00
Nick Pelly
26d6e4704a am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread 
Merge commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp

* commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571':
  NFC Settings cleanup.
 2010-10-21 09:37:55 -07:00
Nick Pelly
781c0aa21e Merge "NFC Settings cleanup." into gingerbread 2010-10-21 03:56:18 -07:00
Nick Pelly
e16f78d54a NFC Settings cleanup. 
NFC service now tracks its own settings. Call the NFC API to determine
state.

Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-20 18:42:23 -07:00
Dianne Hackborn
149fec6a89 am 7a519955: Merge "Fix issue #3114356: Storage visualization in Manage Apps is confusing" into gingerbread 
Merge commit '7a51995581128a9ade44682abe064d9fcca79aa6' into gingerbread-plus-aosp

* commit '7a51995581128a9ade44682abe064d9fcca79aa6':
  Fix issue #3114356: Storage visualization in Manage Apps is confusing
 2010-10-20 17:05:19 -07:00
Dianne Hackborn
7a51995581 Merge "Fix issue #3114356: Storage visualization in Manage Apps is confusing" into gingerbread 2010-10-20 16:58:47 -07:00
Dianne Hackborn
d2be882d8f Fix issue #3114356: Storage visualization in Manage Apps is confusing 
Also fixes issue #3097388: If you launch Manage Applications when SD
card app info isn't available, incomplete information gets cached

Change-Id: If3377a965653590e5bc1df25e38764a83e96b820
 2010-10-20 16:54:41 -07:00
Nick Pelly
029f23c32c am ff8018dc: Merge "Fix NFC permission." into gingerbread 
Merge commit 'ff8018dcbd0488160519481d4ca1567fa397d44e' into gingerbread-plus-aosp

* commit 'ff8018dcbd0488160519481d4ca1567fa397d44e':
  Fix NFC permission.
 2010-10-20 16:47:25 -07:00
Nick Pelly
ff8018dcbd Merge "Fix NFC permission." into gingerbread 2010-10-20 16:44:41 -07:00
Nick Pelly
f2917ac3c5 Fix NFC permission. 
(it's not actually needed right now, hence why nothing was broken).

Change-Id: I52ea0b49a77eca4e3a688d37aa721d3483227553
 2010-10-20 16:39:44 -07:00
Dianne Hackborn
5cfa75875f am 916adce0: Fix issue #3108683: GRH18: Battery usage chart FCs 
Merge commit '916adce02d5b37038cd78d11a8c884237684f9a8' into gingerbread-plus-aosp

* commit '916adce02d5b37038cd78d11a8c884237684f9a8':
  Fix issue #3108683: GRH18: Battery usage chart FCs
 2010-10-19 18:20:40 -07:00
Jean-Baptiste Queru
c4ddcbd347 Fix build 
This was causing a resource conflict in open-source crespo builds

Change-Id: I7b683d735c851b830fdbab90c78096736ca4f5dd
 2010-10-19 16:49:14 -07:00
Dianne Hackborn
916adce02d Fix issue #3108683: GRH18: Battery usage chart FCs 
Make array more bigger, and bounds check the thing.

Change-Id: Iaffebefd27c16c6ecf57566803859be1a5049b8a
 2010-10-19 16:23:53 -07:00
Brad Fitzpatrick
9c8ba9f1af am 4036e768: am d36d650a: NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Merge commit '4036e768d0909ba947eb205d12d1dd3b23ed492b'

* commit '4036e768d0909ba947eb205d12d1dd3b23ed492b':
  NFC: async enabling/disabling, ala Bluewooth & Wifi.
 2010-10-19 10:43:43 -07:00
Brad Fitzpatrick
4453ecaca4 am 17001cea: NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Merge commit '17001cea9e198228c55111871518ebdf710f8544'

* commit '17001cea9e198228c55111871518ebdf710f8544':
  NFC: async enabling/disabling, ala Bluewooth & Wifi.
 2010-10-19 10:43:38 -07:00
Daisuke Miyakawa
c05efc1df7 UI refresh 
Bug: 3110575
Change-Id: Ia6ffef6de8882920b89372052b5e29968bedfe5f
 2010-10-19 10:12:50 -07:00
Roy West
cfcb55d3f5 resolved conflicts for merge of 98f3aff3 to master 
Change-Id: Icfc107998728e8571cf1e887027ab0067f3d40f8
 2010-10-18 19:57:59 -07:00