summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-165-44/+164
|\ | | | | | | | | | | | | Merge commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp * commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87': Implement issue #3094621 and #3094609 - wipe sd card
| * Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-165-44/+164
| | | | | | | | | | | | | | | | | | | | 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
* | am 3594b1b7: Import revised translations DO NOT MERGEKenny Root2010-10-1520-700/+700
|\ \ | |/ | | | | | | | | | | Merge commit '3594b1b73d022d5815bcdef78e6143cfd63ee354' into gingerbread-plus-aosp * commit '3594b1b73d022d5815bcdef78e6143cfd63ee354': Import revised translations DO NOT MERGE
| * Import revised translations DO NOT MERGEKenny Root2010-10-1520-700/+700
| | | | | | | | Change-Id: I04e726f28a0ee4b249618c5e485d480ba6f340a9
* | am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox ↵Amith Yamasani2010-10-151-1/+1
|\ \ | |/ | | | | | | | | | | | | | | in Settings. Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp * commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed': Make summary appear for both checked and unchecked NFC checkbox in Settings.
| * Make summary appear for both checked and unchecked NFC checkbox in Settings.Amith Yamasani2010-10-151-1/+1
| | | | | | | | | | | | | | And remove the extra "Tag" in the summary. Bug: 3083079 Change-Id: I998c2556a88180098a060d43b720276a7619a368
* | am 2c489973: Change USB tab to USB storage if it fitsRoy West2010-10-151-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '2c4899737be92b858a9e2d9d743709cae310149b' into gingerbread-plus-aosp * commit '2c4899737be92b858a9e2d9d743709cae310149b': Change USB tab to USB storage if it fits
| * Change USB tab to USB storage if it fitsRoy West2010-10-151-1/+1
| | | | | | | | Change-Id: I7d0c5388b2673e5f513d05700f4f10650cf1a2b5
* | am d3abea0d: Fix a few more cases of USB storage missed at 4am pass...Roy West2010-10-141-4/+4
|\ \ | |/ | | | | | | | | | | Merge commit 'd3abea0d70648e77e694780b7e139b0ed36ba483' into gingerbread-plus-aosp * commit 'd3abea0d70648e77e694780b7e139b0ed36ba483': Fix a few more cases of USB storage missed at 4am pass...
| * Fix a few more cases of USB storage missed at 4am pass...Roy West2010-10-141-4/+4
| | | | | | | | Change-Id: Ia955d4378f4f9003a659763d88312ea7d42b4a3c
* | am b5848295: Merge "Import revised translations" into gingerbreadKenny Root2010-10-1420-1255/+1155
|\ \ | |/ | | | | | | | | | | Merge commit 'b5848295b346df619999458ad55ba8ce1f88bf4f' into gingerbread-plus-aosp * commit 'b5848295b346df619999458ad55ba8ce1f88bf4f': Import revised translations
| * Merge "Import revised translations" into gingerbreadKenny Root2010-10-1420-1255/+1155
| |\
| | * Import revised translationsKenny Root2010-10-1420-1255/+1155
| | | | | | | | | | | | Change-Id: I1902e768bde862ab73e3ddd806bb778c2b1098de
* | | am 825db2da: Update storage names to 10-13 decision; add USB erase nuggetRoy West2010-10-141-30/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '825db2da053598d36b5021b3468c7d599ee96a7c' into gingerbread-plus-aosp * commit '825db2da053598d36b5021b3468c7d599ee96a7c': Update storage names to 10-13 decision; add USB erase nugget
| * | Update storage names to 10-13 decision; add USB erase nuggetRoy West2010-10-141-30/+30
| |/ | | | | | | Change-Id: I9df5e217a9f6f4b26fea6d1ed865e359833e53ce
* | am 792d4356: Merge "Move NFC setting lower down the Setting\'s list." into ↵Nick Pelly2010-10-131-6/+6
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit '792d43560bdbf2f9982eb918cd841672ecfcf9de' into gingerbread-plus-aosp * commit '792d43560bdbf2f9982eb918cd841672ecfcf9de': Move NFC setting lower down the Setting's list.
| * Move NFC setting lower down the Setting's list.Nick Pelly2010-10-131-6/+6
| | | | | | | | Change-Id: I585d060a5b65df05d62c2bf156f5af76b3bf60e0
* | am 083310d3: Update NFC settings description, and fix polarity.Nick Pelly2010-10-121-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp * commit '083310d316059c6592120c32e1c0b736e85b83c0': Update NFC settings description, and fix polarity.
| * Update NFC settings description, and fix polarity.Nick Pelly2010-10-121-1/+1
| | | | | | | | Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
* | am 30186392: With luck, final take on bug3076083, re back up setttingRoy West2010-10-111-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '3018639200a3f04d274166e26c98307ab07fc3b9' into gingerbread-plus-aosp * commit '3018639200a3f04d274166e26c98307ab07fc3b9': With luck, final take on bug3076083, re back up settting
| * With luck, final take on bug3076083, re back up setttingRoy West2010-10-111-1/+1
| | | | | | | | Change-Id: I236854b4f5d679bd1581d80baba2bd43af7313eb
* | am 566b5bb0: Improve password hint visibilityIrfan Sheriff2010-10-111-0/+1
|\ \ | |/ | | | | | | | | | | Merge commit '566b5bb0f91224069bbc98ea7042d22c8929aa59' into gingerbread-plus-aosp * commit '566b5bb0f91224069bbc98ea7042d22c8929aa59': Improve password hint visibility
| * Improve password hint visibilityIrfan Sheriff2010-10-111-0/+1
| | | | | | | | | | Bug: 3083095 Change-Id: I9fcf9d529c598ad75dd438ef0e7a896c6568cbab
* | am b84291bb: Merge "Support showing "Cold" battery health."Jean-Baptiste Queru2010-10-101-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Merge commit 'b84291bbecb1ab8141cf8f56fd3d1523e5c707a6' into gingerbread-plus-aosp * commit 'b84291bbecb1ab8141cf8f56fd3d1523e5c707a6': Support showing "Cold" battery health.
| * | Support showing "Cold" battery health.Imre Sunyi2010-09-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | The Linux kernel supports reporting "cold" battery health to sysfs. Android framework has not implemented this and it defaults to "unknown" This adds handling the cold battery health. Change-Id: Idfc7029fabcdfdaaf2b5c95977c11e0eb3fd76a7
* | | am effdd53f: Fix bug3076083 re backup setting stringsRoy West2010-10-091-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit 'effdd53ff863d2ff8ffe64065c16b06ba01b3a8a' into gingerbread-plus-aosp * commit 'effdd53ff863d2ff8ffe64065c16b06ba01b3a8a': Fix bug3076083 re backup setting strings
| * | Fix bug3076083 re backup setting stringsRoy West2010-10-091-3/+3
| | | | | | | | | | | | Change-Id: I01939082d8179d28872a3367eb1691738595cb71
* | | am 82d2908b: do not mergeRoy West2010-10-071-4/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '82d2908b2e1fc67f72e40f47fe053efca2bfce6c' into gingerbread-plus-aosp * commit '82d2908b2e1fc67f72e40f47fe053efca2bfce6c': do not merge
| * | do not mergeRoy West2010-10-071-4/+2
| | | | | | | | | | | | Change-Id: I97a2717227f18ab0c1a2688be65f444ef9d40521
* | | am e3b0bda2: do not mergeRoy West2010-10-071-21/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'e3b0bda234e2cdcb6349c5c0385aad34c38b1ec6' into gingerbread-plus-aosp * commit 'e3b0bda234e2cdcb6349c5c0385aad34c38b1ec6': do not merge
| * | do not mergeRoy West2010-10-071-21/+13
| | | | | | | | | | | | Change-Id: I722fd2d58d6532b8fc241ada8e52a731b438f1b6
* | | am d86f58a9: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-10-0720-118/+80
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd86f58a93e14f6f187aa25d6714503af177031eb' into gingerbread-plus-aosp * commit 'd86f58a93e14f6f187aa25d6714503af177031eb': Import revised translations. DO NOT MERGE
| * | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-10-0620-118/+80
| |\ \
| | * | Import revised translations. DO NOT MERGEEric Fischer2010-10-0620-118/+80
| | | | | | | | | | | | | | | | Change-Id: I1ac2d76272f5d7e1d4dd8efff22a6bd249702dd3
* | | | am b8f9c9cf: Add confirmation when stopping system service, as per rwest.Dianne Hackborn2010-10-071-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b' into gingerbread-plus-aosp * commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b': Add confirmation when stopping system service, as per rwest.
| * | | Add confirmation when stopping system service, as per rwest.Dianne Hackborn2010-10-061-0/+6
| |/ / | | | | | | | | | Change-Id: I1cca31a87d3acfc49ffb4562d922d4577c0b1cba
* | | am 84c8c175: Import revised translations. DO NOT MERGEEric Fischer2010-10-0720-41/+61
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '84c8c175c8ee797f61121211c3ef8638d127cdf6' into gingerbread-plus-aosp * commit '84c8c175c8ee797f61121211c3ef8638d127cdf6': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2010-10-0620-41/+61
| | | | | | | | | | | | Change-Id: I58d987d8ee9629e2d035a3bfddefedbe185daf8f
* | | am 6dc1bf84: Manage apps "on SD card" now shows all apps that can go on SD card.Dianne Hackborn2010-10-041-2/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2' into gingerbread-plus-aosp * commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2': Manage apps "on SD card" now shows all apps that can go on SD card.
| * | Manage apps "on SD card" now shows all apps that can go on SD card.Dianne Hackborn2010-10-041-2/+11
| | | | | | | | | | | | Change-Id: Icc413891b2b884bb1af340b4c09ab3935c8e51ca
* | | am 340c5c42: Separate the Settings activity name into two different strings.Eric Fischer2010-10-011-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74' into gingerbread-plus-aosp * commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74': Separate the Settings activity name into two different strings.
| * | Separate the Settings activity name into two different strings.Eric Fischer2010-10-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am f20931bc: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-09-3020-759/+1657
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3' into gingerbread-plus-aosp * commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3': Import revised translations. DO NOT MERGE
| * | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-09-3020-759/+1657
| |\ \
| | * | Import revised translations. DO NOT MERGEEric Fischer2010-09-2920-759/+1657
| | | | | | | | | | | | | | | | Change-Id: I9ea6e351c10191e58ed1d1c2784022f3d099c84b
* | | | am 2d6c0b0d: Update strings for physical keyboard settings.Ken Wakasa2010-09-301-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1' into gingerbread-plus-aosp * commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1': Update strings for physical keyboard settings.
| * | | Update strings for physical keyboard settings.Ken Wakasa2010-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | bug: 2954950 Change-Id: I023de6dbe191ca6525cec51147a916eb746fb3e7
* | | | am a63b08d9: New assets for power widget: gps, syncGilles Debunne2010-09-304-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85' into gingerbread-plus-aosp * commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85': New assets for power widget: gps, sync
| * | | New assets for power widget: gps, syncGilles Debunne2010-09-294-0/+0
| |/ / | | | | | | | | | Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
* | | am 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbreadGilles Debunne2010-09-2922-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4' into gingerbread-plus-aosp * commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4': New assets (wifi, bluetooth...)