Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,166 Commits 1 Branch 0 Tags
5721cb1d528b097bd2f95dc3cf5cdcb6fec00a8e
Commit Graph

807 Commits

Author SHA1 Message Date
Eric Fischer
5721cb1d52 am 99d2471d: Import revised translations. DO NOT MERGE 
* commit '99d2471d8d6c2a8cc0eb8e4540ba9090d46693d8':
  Import revised translations.  DO NOT MERGE
 2010-12-10 10:03:51 -08:00
Eric Fischer
99d2471d8d Import revised translations. DO NOT MERGE 
Bug 3272618

Change-Id: Id1c49e216342247bf8574db0bf2a53f8e15bdc6e
 2010-12-09 16:57:40 -08:00
Eric Fischer
39f8dba114 am e1e257f4: Import revised translations. DO NOT MERGE 
* commit 'e1e257f4b45fcd5dd59b73295804df94eefc4970':
  Import revised translations.  DO NOT MERGE
 2010-11-30 11:48:26 -08:00
Eric Fischer
e1e257f4b4 Import revised translations. DO NOT MERGE 
Change-Id: I74acfc5708208509b1afe3ad55ba8a4777c7b34f
 2010-11-29 16:21:55 -08: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
c885743699 Import revised translations. DO NOT MERGE 
Change-Id: Ic9978f86bf778e815896bbe858e07d953d53843b
 2010-11-09 12:19:25 -08: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
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
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
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
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
Dianne Hackborn
1337d0f70b Implement issue #3094621 and #3094609 - wipe sd card 
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Implements requested UI changes.  Also some final tweaks to
Manage Applications.

Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89
 2010-10-16 16:27:25 -07:00
Kenny Root
ea86bcd12b am 3594b1b7: Import revised translations DO NOT MERGE 
Merge commit '3594b1b73d022d5815bcdef78e6143cfd63ee354' into gingerbread-plus-aosp

* commit '3594b1b73d022d5815bcdef78e6143cfd63ee354':
  Import revised translations DO NOT MERGE
 2010-10-15 18:41:47 -07:00
Kenny Root
3594b1b73d Import revised translations DO NOT MERGE 
Change-Id: I04e726f28a0ee4b249618c5e485d480ba6f340a9
 2010-10-15 15:24:57 -07:00
Amith Yamasani
8de45a6686 am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings. 
Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp

* commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed':
  Make summary appear for both checked and unchecked NFC checkbox in Settings.
 2010-10-15 10:06:18 -07:00
Amith Yamasani
1bdb7874ad Make summary appear for both checked and unchecked NFC checkbox in Settings. 
And remove the extra "Tag" in the summary.

Bug: 3083079
Change-Id: I998c2556a88180098a060d43b720276a7619a368
 2010-10-15 10:00:40 -07:00
Roy West
d3c1749b77 am 2c489973: Change USB tab to USB storage if it fits 
Merge commit '2c4899737be92b858a9e2d9d743709cae310149b' into gingerbread-plus-aosp

* commit '2c4899737be92b858a9e2d9d743709cae310149b':
  Change USB tab to USB storage if it fits
 2010-10-15 08:54:08 -07:00
Roy West
2c4899737b Change USB tab to USB storage if it fits 
Change-Id: I7d0c5388b2673e5f513d05700f4f10650cf1a2b5
 2010-10-15 05:18:04 -07:00
Roy West
cfcad4e45f am d3abea0d: Fix a few more cases of USB storage missed at 4am pass... 
Merge commit 'd3abea0d70648e77e694780b7e139b0ed36ba483' into gingerbread-plus-aosp

* commit 'd3abea0d70648e77e694780b7e139b0ed36ba483':
  Fix a few more cases of USB storage missed at 4am pass...
 2010-10-14 18:26:01 -07:00
Roy West
d3abea0d70 Fix a few more cases of USB storage missed at 4am pass... 
Change-Id: Ia955d4378f4f9003a659763d88312ea7d42b4a3c
 2010-10-14 15:59:33 -07:00
Kenny Root
c915d16a90 am b5848295: Merge "Import revised translations" into gingerbread 
Merge commit 'b5848295b346df619999458ad55ba8ce1f88bf4f' into gingerbread-plus-aosp

* commit 'b5848295b346df619999458ad55ba8ce1f88bf4f':
  Import revised translations
 2010-10-14 14:24:49 -07:00
Kenny Root
b5848295b3 Merge "Import revised translations" into gingerbread 2010-10-14 14:16:47 -07:00
Roy West
2a612605f5 am 825db2da: Update storage names to 10-13 decision; add USB erase nugget 
Merge commit '825db2da053598d36b5021b3468c7d599ee96a7c' into gingerbread-plus-aosp

* commit '825db2da053598d36b5021b3468c7d599ee96a7c':
  Update storage names to 10-13 decision; add USB erase nugget
 2010-10-14 12:03:12 -07:00
Kenny Root
4f6196a03d Import revised translations 
Change-Id: I1902e768bde862ab73e3ddd806bb778c2b1098de
 2010-10-14 09:46:33 -07:00
Roy West
825db2da05 Update storage names to 10-13 decision; add USB erase nugget 
Change-Id: I9df5e217a9f6f4b26fea6d1ed865e359833e53ce
 2010-10-14 05:07:45 -07:00
Nick Pelly
da08f31f79 am 792d4356: Merge "Move NFC setting lower down the Setting\'s list." into gingerbread 
Merge commit '792d43560bdbf2f9982eb918cd841672ecfcf9de' into gingerbread-plus-aosp

* commit '792d43560bdbf2f9982eb918cd841672ecfcf9de':
  Move NFC setting lower down the Setting's list.
 2010-10-13 14:23:05 -07:00
Nick Pelly
72ce892dd9 Move NFC setting lower down the Setting's list. 
Change-Id: I585d060a5b65df05d62c2bf156f5af76b3bf60e0
 2010-10-13 12:22:37 -07:00
Nick Pelly
f4e4319f41 am 083310d3: Update NFC settings description, and fix polarity. 
Merge commit '083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp

* commit '083310d316059c6592120c32e1c0b736e85b83c0':
  Update NFC settings description, and fix polarity.
 2010-10-12 21:27:48 -07:00
Nick Pelly
083310d316 Update NFC settings description, and fix polarity. 
Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
 2010-10-12 21:22:54 -07:00
Roy West
f233ec77eb am 30186392: With luck, final take on bug3076083, re back up settting 
Merge commit '3018639200a3f04d274166e26c98307ab07fc3b9' into gingerbread-plus-aosp

* commit '3018639200a3f04d274166e26c98307ab07fc3b9':
  With luck, final take on bug3076083, re back up settting
 2010-10-11 17:39:34 -07:00
Roy West
3018639200 With luck, final take on bug3076083, re back up settting 
Change-Id: I236854b4f5d679bd1581d80baba2bd43af7313eb
 2010-10-11 17:34:27 -07:00