Commit Graph

778 Commits

Author SHA1 Message Date
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
Irfan Sheriff
52ad3f2f6c am 566b5bb0: Improve password hint visibility
Merge commit '566b5bb0f91224069bbc98ea7042d22c8929aa59' into gingerbread-plus-aosp

* commit '566b5bb0f91224069bbc98ea7042d22c8929aa59':
  Improve password hint visibility
2010-10-11 10:30:17 -07:00
Irfan Sheriff
566b5bb0f9 Improve password hint visibility
Bug: 3083095
Change-Id: I9fcf9d529c598ad75dd438ef0e7a896c6568cbab
2010-10-11 10:26:14 -07:00
Jean-Baptiste Queru
80455f367f am b84291bb: Merge "Support showing "Cold" battery health."
Merge commit 'b84291bbecb1ab8141cf8f56fd3d1523e5c707a6' into gingerbread-plus-aosp

* commit 'b84291bbecb1ab8141cf8f56fd3d1523e5c707a6':
  Support showing "Cold" battery health.
2010-10-10 17:50:41 -07:00
Roy West
816350778a am effdd53f: Fix bug3076083 re backup setting strings
Merge commit 'effdd53ff863d2ff8ffe64065c16b06ba01b3a8a' into gingerbread-plus-aosp

* commit 'effdd53ff863d2ff8ffe64065c16b06ba01b3a8a':
  Fix bug3076083 re backup setting strings
2010-10-09 10:07:54 -07:00
Roy West
effdd53ff8 Fix bug3076083 re backup setting strings
Change-Id: I01939082d8179d28872a3367eb1691738595cb71
2010-10-09 09:40:23 -07:00
Roy West
83caf0b26f am 82d2908b: do not merge
Merge commit '82d2908b2e1fc67f72e40f47fe053efca2bfce6c' into gingerbread-plus-aosp

* commit '82d2908b2e1fc67f72e40f47fe053efca2bfce6c':
  do not merge
2010-10-07 15:48:18 -07:00
Roy West
82d2908b2e do not merge
Change-Id: I97a2717227f18ab0c1a2688be65f444ef9d40521
2010-10-07 15:15:45 -07:00
Roy West
60d9b33fcf am e3b0bda2: do not merge
Merge commit 'e3b0bda234e2cdcb6349c5c0385aad34c38b1ec6' into gingerbread-plus-aosp

* commit 'e3b0bda234e2cdcb6349c5c0385aad34c38b1ec6':
  do not merge
2010-10-07 14:04:23 -07:00
Roy West
e3b0bda234 do not merge
Change-Id: I722fd2d58d6532b8fc241ada8e52a731b438f1b6
2010-10-07 08:34:41 -07:00
Eric Fischer
5e51c769c7 am d86f58a9: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'd86f58a93e14f6f187aa25d6714503af177031eb' into gingerbread-plus-aosp

* commit 'd86f58a93e14f6f187aa25d6714503af177031eb':
  Import revised translations.  DO NOT MERGE
2010-10-07 07:17:15 -07:00
Dianne Hackborn
10ebf928d8 am b8f9c9cf: Add confirmation when stopping system service, as per rwest.
Merge commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b' into gingerbread-plus-aosp

* commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b':
  Add confirmation when stopping system service, as per rwest.
2010-10-07 07:16:40 -07:00
Eric Fischer
27db062dd8 am 84c8c175: Import revised translations. DO NOT MERGE
Merge commit '84c8c175c8ee797f61121211c3ef8638d127cdf6' into gingerbread-plus-aosp

* commit '84c8c175c8ee797f61121211c3ef8638d127cdf6':
  Import revised translations.  DO NOT MERGE
2010-10-07 07:14:16 -07:00
Eric Fischer
d86f58a93e Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-06 17:33:02 -07:00
Eric Fischer
5a2708d544 Import revised translations. DO NOT MERGE
Change-Id: I1ac2d76272f5d7e1d4dd8efff22a6bd249702dd3
2010-10-06 17:15:09 -07:00
Dianne Hackborn
b8f9c9cf7c Add confirmation when stopping system service, as per rwest.
Change-Id: I1cca31a87d3acfc49ffb4562d922d4577c0b1cba
2010-10-06 17:09:54 -07:00
Eric Fischer
84c8c175c8 Import revised translations. DO NOT MERGE
Change-Id: I58d987d8ee9629e2d035a3bfddefedbe185daf8f
2010-10-06 11:56:08 -07:00
Dianne Hackborn
3e15e4e91b am 6dc1bf84: Manage apps "on SD card" now shows all apps that can go on SD card.
Merge commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2' into gingerbread-plus-aosp

* commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2':
  Manage apps "on SD card" now shows all apps that can go on SD card.
2010-10-04 23:04:57 -07:00
Dianne Hackborn
6dc1bf84cf Manage apps "on SD card" now shows all apps that can go on SD card.
Change-Id: Icc413891b2b884bb1af340b4c09ab3935c8e51ca
2010-10-04 22:35:26 -07:00
Eric Fischer
25c52b70fa am 340c5c42: Separate the Settings activity name into two different strings.
Merge commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74' into gingerbread-plus-aosp

* commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74':
  Separate the Settings activity name into two different strings.
2010-10-01 12:04:08 -07:00
Eric Fischer
340c5c4237 Separate the Settings activity name into two different strings.
The German translators would like to be able to hyphenate the name
shown in the Launcher but to keep the name shown within the activity
as a single word.

Change-Id: I22402c41186fdcdaed2712933ddf0f215b3a3329
2010-10-01 11:45:47 -07:00
Eric Fischer
ddaf8f490f am f20931bc: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3' into gingerbread-plus-aosp

* commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3':
  Import revised translations.  DO NOT MERGE
2010-09-30 15:58:20 -07:00
Eric Fischer
f20931bc56 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-30 15:48:14 -07:00
Ken Wakasa
bc692e83c4 am 2d6c0b0d: Update strings for physical keyboard settings.
Merge commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1' into gingerbread-plus-aosp

* commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1':
  Update strings for physical keyboard settings.
2010-09-30 10:10:29 -07:00
Gilles Debunne
345fbf926a am a63b08d9: New assets for power widget: gps, sync
Merge commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85' into gingerbread-plus-aosp

* commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85':
  New assets for power widget: gps, sync
2010-09-30 10:08:43 -07:00
Ken Wakasa
2d6c0b0d77 Update strings for physical keyboard settings.
bug: 2954950
Change-Id: I023de6dbe191ca6525cec51147a916eb746fb3e7
2010-09-30 12:52:52 +09:00
Gilles Debunne
a63b08d9c8 New assets for power widget: gps, sync
Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
2010-09-29 16:21:19 -07:00
Eric Fischer
3388aac10a Import revised translations. DO NOT MERGE
Change-Id: I9ea6e351c10191e58ed1d1c2784022f3d099c84b
2010-09-29 14:36:34 -07:00
Gilles Debunne
a48d2dbeb2 am 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread
Merge commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4' into gingerbread-plus-aosp

* commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4':
  New assets (wifi, bluetooth...)
2010-09-29 12:20:36 -07:00
Gilles Debunne
98289826e6 Merge "New assets (wifi, bluetooth...)" into gingerbread 2010-09-29 12:18:13 -07:00