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

2153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
b68b35dd6a am 04b646df: Merge "Possible NumberFormatException of parseInt is outside try-catch" 
* commit '04b646df1e9f00719d2d547fa1da59407bb6be67':
  Possible NumberFormatException of parseInt is outside try-catch
 2010-11-29 16:11:16 -08:00
Jean-Baptiste Queru
04b646df1e Merge "Possible NumberFormatException of parseInt is outside try-catch" 2010-11-29 16:07:44 -08:00
Peter Kuterna
378b6f6740 Possible NumberFormatException of parseInt is outside try-catch 
Change-Id: I77c1e41185a8d3a1724af848d6bbfbb1da816b55
 2010-11-28 22:35:31 +01:00
Eric Fischer
71d43248b9 am 5c205262: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '5c205262460ecc5bcfb92ffb10185a573a4b7c90':
  Import revised translations.  DO NOT MERGE
 2010-11-11 15:45:50 -08:00
Eric Fischer
5c20526246 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-11-11 15:43:19 -08:00
Dianne Hackborn
969773aa73 am 83d2698f: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread 
* commit '83d2698f4f271f568333532ddbae33f8e2e13052':
  Fix issue #3177284: Account for wake lock power usage on Crespo
 2010-11-10 18:07:18 -08:00
Dianne Hackborn
83d2698f4f Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread 2010-11-10 17:58:58 -08:00
Eric Fischer
c885743699 Import revised translations. DO NOT MERGE 
Change-Id: Ic9978f86bf778e815896bbe858e07d953d53843b
 2010-11-09 12:19:25 -08:00
Dianne Hackborn
21023464b2 Fix issue #3177284: Account for wake lock power usage on Crespo 
Change-Id: I5988d28fd192cd7fdb85140172a92141eb389964
 2010-11-08 19:05:00 -08:00
Nick Pelly
b93b018ac6 am 91ba0709: Update settings text on success, so we clear out error text after recovery. 
* commit '91ba0709b032d0c80ca086f53552f251a21c6df4':
  Update settings text on success, so we clear out error text after recovery.
 2010-11-03 19:59:47 -07:00
Nick Pelly
91ba0709b0 Update settings text on success, so we clear out error text after recovery. 
Change-Id: Ie6bff9f1b56d0218120cf98638b9cbfe505bd02d
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-11-03 21:56:36 -05:00
Dianne Hackborn
5f3017975a am 4e4ed14e: Fix issue #3146784: ANR in manage applications 
* commit '4e4ed14ee2b82cb90a25b3027eb36f190ce2e1e7':
  Fix issue #3146784: ANR in manage applications
 2010-10-29 15:40:36 -07:00
Dianne Hackborn
4e4ed14ee2 Fix issue #3146784: ANR in manage applications 
See the big comment.

Change-Id: I36164a6fcba58fe2b0e2b3aa216780d0d0e5ed37
 2010-10-29 13:58:49 -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
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
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
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
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
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
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
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
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
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
4036e768d0 am d36d650a: NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Merge commit 'd36d650a8132e8aea375239e6dfff92708771b7a' into gingerbread-plus-aosp

* commit 'd36d650a8132e8aea375239e6dfff92708771b7a':
  NFC: async enabling/disabling, ala Bluewooth & Wifi.
 2010-10-18 17:04:16 -07:00
Brad Fitzpatrick
17001cea9e NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Don't ANR when toggling.

Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
 2010-10-18 17:03:44 -07:00
Brad Fitzpatrick
d36d650a81 NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Don't ANR when toggling.

Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
 2010-10-18 15:25:49 -07:00
Roy West
98f3aff3c5 am dd49624e: Del "erase" from new unmount setting subtext 
Merge commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0' into gingerbread-plus-aosp

* commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0':
  Del "erase" from new unmount setting subtext
 2010-10-18 11:33:34 -07:00
Roy West
dd49624ed0 Del "erase" from new unmount setting subtext 
Change-Id: I4beca53892d446578f36a7c32847465dcc7999f3
 2010-10-18 03:12:57 -07:00
Roy West
b7eb8cdad9 am 8abc40bb: Correct some typos, impose more consistency. 
Merge commit '8abc40bb11690125fa441775041e0a64c79acc43' into gingerbread-plus-aosp

* commit '8abc40bb11690125fa441775041e0a64c79acc43':
  Correct some typos, impose more consistency.
 2010-10-17 14:04:25 -07:00
Roy West
8abc40bb11 Correct some typos, impose more consistency. 
Change-Id: Id2532a8eb619c38a8c683e77ae449b740d7b9bda
 2010-10-17 09:19:34 -07:00
Dianne Hackborn
593a7049f5 am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd card 
Merge commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp

* commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87':
  Implement issue #3094621 and #3094609 - wipe sd card
 2010-10-16 16:55:30 -07:00