OSDN Git Service
Dianne Hackborn [Wed, 20 Oct 2010 01:20:40 +0000 (18:20 -0700)]
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
Dianne Hackborn [Tue, 19 Oct 2010 23:23:53 +0000 (16:23 -0700)]
Fix issue #
3108683: GRH18: Battery usage chart FCs
Make array more bigger, and bounds check the thing.
Change-Id: Iaffebefd27c16c6ecf57566803859be1a5049b8a
Brad Fitzpatrick [Tue, 19 Oct 2010 00:04:16 +0000 (17:04 -0700)]
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.
Brad Fitzpatrick [Mon, 18 Oct 2010 21:04:24 +0000 (14:04 -0700)]
NFC: async enabling/disabling, ala Bluewooth & Wifi.
Don't ANR when toggling.
Bug:
3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
Brad Fitzpatrick [Mon, 18 Oct 2010 21:04:24 +0000 (14:04 -0700)]
NFC: async enabling/disabling, ala Bluewooth & Wifi.
Don't ANR when toggling.
Bug:
3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
Roy West [Mon, 18 Oct 2010 18:33:34 +0000 (11:33 -0700)]
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
Roy West [Mon, 18 Oct 2010 10:12:57 +0000 (03:12 -0700)]
Del "erase" from new unmount setting subtext
Change-Id: I4beca53892d446578f36a7c32847465dcc7999f3
Roy West [Sun, 17 Oct 2010 21:04:25 +0000 (14:04 -0700)]
am
8abc40bb: Correct some typos, impose more consistency.
Merge commit '
8abc40bb11690125fa441775041e0a64c79acc43' into gingerbread-plus-aosp
* commit '
8abc40bb11690125fa441775041e0a64c79acc43':
Correct some typos, impose more consistency.
Roy West [Sun, 17 Oct 2010 16:19:34 +0000 (09:19 -0700)]
Correct some typos, impose more consistency.
Change-Id: Id2532a8eb619c38a8c683e77ae449b740d7b9bda
Dianne Hackborn [Sat, 16 Oct 2010 23:55:30 +0000 (16:55 -0700)]
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
Dianne Hackborn [Thu, 14 Oct 2010 18:58:30 +0000 (11:58 -0700)]
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
Kenny Root [Sat, 16 Oct 2010 01:41:47 +0000 (18:41 -0700)]
am
3594b1b7: Import revised translations DO NOT MERGE
Merge commit '
3594b1b73d022d5815bcdef78e6143cfd63ee354' into gingerbread-plus-aosp
* commit '
3594b1b73d022d5815bcdef78e6143cfd63ee354':
Import revised translations DO NOT MERGE
Nick Pelly [Sat, 16 Oct 2010 01:21:06 +0000 (18:21 -0700)]
am
e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Merge commit '
e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp
* commit '
e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Kenny Root [Fri, 15 Oct 2010 22:24:57 +0000 (15:24 -0700)]
Import revised translations DO NOT MERGE
Change-Id: I04e726f28a0ee4b249618c5e485d480ba6f340a9
Nick Pelly [Fri, 15 Oct 2010 17:56:05 +0000 (10:56 -0700)]
Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Amith Yamasani [Fri, 15 Oct 2010 17:06:18 +0000 (10:06 -0700)]
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.
Amith Yamasani [Fri, 15 Oct 2010 00:20:59 +0000 (17:20 -0700)]
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
Roy West [Fri, 15 Oct 2010 15:54:08 +0000 (08:54 -0700)]
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
Roy West [Fri, 15 Oct 2010 12:18:04 +0000 (05:18 -0700)]
Change USB tab to USB storage if it fits
Change-Id: I7d0c5388b2673e5f513d05700f4f10650cf1a2b5
Nick Pelly [Fri, 15 Oct 2010 08:19:43 +0000 (01:19 -0700)]
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a
Signed-off-by: Nick Pelly <npelly@google.com>
Roy West [Fri, 15 Oct 2010 01:26:01 +0000 (18:26 -0700)]
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...
Roy West [Thu, 14 Oct 2010 22:59:33 +0000 (15:59 -0700)]
Fix a few more cases of USB storage missed at 4am pass...
Change-Id: Ia955d4378f4f9003a659763d88312ea7d42b4a3c
Jaikumar Ganesh [Thu, 14 Oct 2010 22:33:42 +0000 (15:33 -0700)]
am
022299df: Merge "Disconnect dock only if its connected." into gingerbread
Merge commit '
022299dfce6a705a8cbaff972a4309da6e90a8c2' into gingerbread-plus-aosp
* commit '
022299dfce6a705a8cbaff972a4309da6e90a8c2':
Disconnect dock only if its connected.
Jaikumar Ganesh [Thu, 14 Oct 2010 22:30:55 +0000 (15:30 -0700)]
Merge "Disconnect dock only if its connected." into gingerbread
Jaikumar Ganesh [Thu, 14 Oct 2010 22:01:38 +0000 (15:01 -0700)]
Disconnect dock only if its connected.
Scenario: BT is off, device is paired with the desk dock.
Media is switched off. So when the user docks, it was trying to
disconnect even when BT was off and hence DBUS was crashing.
Bug:
3097224
Change-Id: I13e1dd4459c47d5ba9a403f2ae1cc8a131f02a08
Kenny Root [Thu, 14 Oct 2010 21:24:49 +0000 (14:24 -0700)]
am
b5848295: Merge "Import revised translations" into gingerbread
Merge commit '
b5848295b346df619999458ad55ba8ce1f88bf4f' into gingerbread-plus-aosp
* commit '
b5848295b346df619999458ad55ba8ce1f88bf4f':
Import revised translations
Kenny Root [Thu, 14 Oct 2010 21:16:47 +0000 (14:16 -0700)]
Merge "Import revised translations" into gingerbread
Roy West [Thu, 14 Oct 2010 19:03:12 +0000 (12:03 -0700)]
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
Kenny Root [Thu, 14 Oct 2010 16:46:33 +0000 (09:46 -0700)]
Import revised translations
Change-Id: I1902e768bde862ab73e3ddd806bb778c2b1098de
Roy West [Thu, 14 Oct 2010 12:07:45 +0000 (05:07 -0700)]
Update storage names to 10-13 decision; add USB erase nugget
Change-Id: I9df5e217a9f6f4b26fea6d1ed865e359833e53ce
Jake Hamby [Wed, 13 Oct 2010 23:28:34 +0000 (16:28 -0700)]
am
8021537f: BT settings wait for HS service before connect. DO NOT MERGE
Merge commit '
8021537ffea45d1a36274217610a314b3a0ac774' into gingerbread-plus-aosp
* commit '
8021537ffea45d1a36274217610a314b3a0ac774':
BT settings wait for HS service before connect. DO NOT MERGE
Jake Hamby [Tue, 12 Oct 2010 23:12:06 +0000 (16:12 -0700)]
BT settings wait for HS service before connect. DO NOT MERGE
Bluetooth connections from Settings app can sometimes fail if the
connection to BluetoothHeadsetService isn't ready. Changed code to
delay any headset connect or disconnect attempt when the service isn't
connected until onServiceConnected() is called.
Tested by adding a call to Thread.sleep(5000) before the return
statement in BluetoothHeadsetService.onBind(). This makes it easier to
kill the phone process and then attempt to connect in the settings app
before the service restarts.
Bug:
3048839
Change-Id: I2114ff8ad67c8c672fcf6ce0bf3de61fca7a49b3
Nick Pelly [Wed, 13 Oct 2010 21:23:05 +0000 (14:23 -0700)]
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.
Nick Pelly [Wed, 13 Oct 2010 20:59:00 +0000 (13:59 -0700)]
Merge "Move NFC setting lower down the Setting's list." into gingerbread
Nick Pelly [Wed, 13 Oct 2010 19:22:37 +0000 (12:22 -0700)]
Move NFC setting lower down the Setting's list.
Change-Id: I585d060a5b65df05d62c2bf156f5af76b3bf60e0
Jaikumar Ganesh [Wed, 13 Oct 2010 18:13:33 +0000 (11:13 -0700)]
am
03403712: Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread
Merge commit '
0340371297887290d7593d7c346e422a4c9ecd1a' into gingerbread-plus-aosp
* commit '
0340371297887290d7593d7c346e422a4c9ecd1a':
DO NOT MERGE Add null check before disconnecting a device.
Jaikumar Ganesh [Wed, 13 Oct 2010 18:09:35 +0000 (11:09 -0700)]
Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread
Jaikumar Ganesh [Wed, 13 Oct 2010 17:53:05 +0000 (10:53 -0700)]
DO NOT MERGE Add null check before disconnecting a device.
Bug:
3076404
Change-Id: I8ef140395503816296124a38e42ab9cc7e6f7159
Nick Pelly [Wed, 13 Oct 2010 04:27:48 +0000 (21:27 -0700)]
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.
Nick Pelly [Wed, 13 Oct 2010 04:22:54 +0000 (21:22 -0700)]
Update NFC settings description, and fix polarity.
Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
Jaikumar Ganesh [Wed, 13 Oct 2010 02:06:15 +0000 (19:06 -0700)]
am
bdf13107: Merge "Call disconnect / connect without checking the current status" into gingerbread
Merge commit '
bdf1310707e436db484113d7aa2881c966cddd0f' into gingerbread-plus-aosp
* commit '
bdf1310707e436db484113d7aa2881c966cddd0f':
Call disconnect / connect without checking the current status
Nick Pelly [Wed, 13 Oct 2010 02:04:17 +0000 (19:04 -0700)]
am
cd99332f: Merge "Update settings app for new NFC API." into gingerbread
Merge commit '
cd99332fee649afd85798499cea5c45a098b8a20' into gingerbread-plus-aosp
* commit '
cd99332fee649afd85798499cea5c45a098b8a20':
Update settings app for new NFC API.
Jaikumar Ganesh [Wed, 13 Oct 2010 02:04:01 +0000 (19:04 -0700)]
Merge "Call disconnect / connect without checking the current status" into gingerbread
Nick Pelly [Wed, 13 Oct 2010 01:58:46 +0000 (18:58 -0700)]
Merge "Update settings app for new NFC API." into gingerbread
Jaikumar Ganesh [Tue, 12 Oct 2010 23:14:10 +0000 (16:14 -0700)]
Call disconnect / connect without checking the current status
Its the job of the framework to check that, it already does that.
Framework will queue the commands. Earlier settings app used to queue
them.
Bug:
3076404
Change-Id: I664e1c4e2c0ef9c697066251ccca382ad12dfa2f
Nick Pelly [Tue, 12 Oct 2010 20:07:06 +0000 (13:07 -0700)]
Update settings app for new NFC API.
Change-Id: I2702e36d33591245fa86e00454348fc1a16f5cf8
Signed-off-by: Nick Pelly <npelly@google.com>
Kenny Root [Tue, 12 Oct 2010 19:29:15 +0000 (12:29 -0700)]
am
737e91ef: Merge "Don\'t show the sort menu for running process list" into gingerbread
Merge commit '
737e91efb15fe5908781bc1cf446d28abc7726e8' into gingerbread-plus-aosp
* commit '
737e91efb15fe5908781bc1cf446d28abc7726e8':
Don't show the sort menu for running process list
Kenny Root [Tue, 12 Oct 2010 19:25:34 +0000 (12:25 -0700)]
Merge "Don't show the sort menu for running process list" into gingerbread
Freeman Ng [Tue, 12 Oct 2010 18:23:29 +0000 (11:23 -0700)]
am
1054e489: Merge "Hide "System tutorial" option if there\'s no IME tutorial bug:
3074212" into gingerbread
Merge commit '
1054e4890ae50d2550ee822f0680346f48d48c97' into gingerbread-plus-aosp
* commit '
1054e4890ae50d2550ee822f0680346f48d48c97':
Hide "System tutorial" option if there's no IME tutorial
Freeman Ng [Tue, 12 Oct 2010 18:06:46 +0000 (11:06 -0700)]
Merge "Hide "System tutorial" option if there's no IME tutorial bug:
3074212" into gingerbread
Kenny Root [Tue, 12 Oct 2010 16:42:44 +0000 (09:42 -0700)]
Don't show the sort menu for running process list
You could bring up the menu and sort running processes by size or name
which would display the applications list at the same time the running
process list was being displayed. This happened because the
mApplicationsAdapter is used for the list of apps and is sortable, but
the running process list doesn't use the adapter.
Disable the menu when the running applications list is presented to
prevent this situation where two ListViews are visible.
Bug:
3084901
Change-Id: I5304cf7a1f426269ed4858e649729a35b9344717
Freeman Ng [Tue, 12 Oct 2010 01:51:34 +0000 (18:51 -0700)]
Hide "System tutorial" option if there's no IME tutorial
bug:
3074212
Change-Id: I3653c23cd893114cec7822efb2d6acb08b7ba91e
Roy West [Tue, 12 Oct 2010 00:39:34 +0000 (17:39 -0700)]
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
Roy West [Tue, 12 Oct 2010 00:34:27 +0000 (17:34 -0700)]
With luck, final take on bug3076083, re back up settting
Change-Id: I236854b4f5d679bd1581d80baba2bd43af7313eb
Jake Hamby [Mon, 11 Oct 2010 20:07:09 +0000 (13:07 -0700)]
am
4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into gingerbread
Merge commit '
4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3' into gingerbread-plus-aosp
* commit '
4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3':
Fix bug where car dock sometimes doesn't connect.
Jake Hamby [Mon, 11 Oct 2010 20:05:11 +0000 (13:05 -0700)]
Merge "Fix bug where car dock sometimes doesn't connect." into gingerbread
Irfan Sheriff [Mon, 11 Oct 2010 17:30:17 +0000 (10:30 -0700)]
am
566b5bb0: Improve password hint visibility
Merge commit '
566b5bb0f91224069bbc98ea7042d22c8929aa59' into gingerbread-plus-aosp
* commit '
566b5bb0f91224069bbc98ea7042d22c8929aa59':
Improve password hint visibility
Irfan Sheriff [Mon, 11 Oct 2010 17:26:14 +0000 (10:26 -0700)]
Improve password hint visibility
Bug:
3083095
Change-Id: I9fcf9d529c598ad75dd438ef0e7a896c6568cbab
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:50:41 +0000 (17:50 -0700)]
am
b84291bb: Merge "Support showing "Cold" battery health."
Merge commit '
b84291bbecb1ab8141cf8f56fd3d1523e5c707a6' into gingerbread-plus-aosp
* commit '
b84291bbecb1ab8141cf8f56fd3d1523e5c707a6':
Support showing "Cold" battery health.
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:37:59 +0000 (17:37 -0700)]
Merge "Support showing "Cold" battery health."
Roy West [Sat, 9 Oct 2010 17:07:54 +0000 (10:07 -0700)]
am
effdd53f: Fix bug3076083 re backup setting strings
Merge commit '
effdd53ff863d2ff8ffe64065c16b06ba01b3a8a' into gingerbread-plus-aosp
* commit '
effdd53ff863d2ff8ffe64065c16b06ba01b3a8a':
Fix bug3076083 re backup setting strings
Roy West [Sat, 9 Oct 2010 16:40:23 +0000 (09:40 -0700)]
Fix bug3076083 re backup setting strings
Change-Id: I01939082d8179d28872a3367eb1691738595cb71
Roy West [Thu, 7 Oct 2010 22:48:18 +0000 (15:48 -0700)]
Roy West [Thu, 7 Oct 2010 22:15:45 +0000 (15:15 -0700)]
do not merge
Change-Id: I97a2717227f18ab0c1a2688be65f444ef9d40521
Roy West [Thu, 7 Oct 2010 21:04:23 +0000 (14:04 -0700)]
Roy West [Thu, 7 Oct 2010 15:34:41 +0000 (08:34 -0700)]
do not merge
Change-Id: I722fd2d58d6532b8fc241ada8e52a731b438f1b6
Eric Fischer [Thu, 7 Oct 2010 14:17:15 +0000 (07:17 -0700)]
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
Dianne Hackborn [Thu, 7 Oct 2010 14:16:40 +0000 (07:16 -0700)]
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.
Dianne Hackborn [Thu, 7 Oct 2010 14:16:02 +0000 (07:16 -0700)]
am
4b21f7cd: Fix issue #
3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
Merge commit '
4b21f7cd9424eeb83838071a4419912ee5d5e41d' into gingerbread-plus-aosp
* commit '
4b21f7cd9424eeb83838071a4419912ee5d5e41d':
Fix issue #
3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
Eric Fischer [Thu, 7 Oct 2010 14:14:16 +0000 (07:14 -0700)]
am
84c8c175: Import revised translations. DO NOT MERGE
Merge commit '
84c8c175c8ee797f61121211c3ef8638d127cdf6' into gingerbread-plus-aosp
* commit '
84c8c175c8ee797f61121211c3ef8638d127cdf6':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 7 Oct 2010 00:33:02 +0000 (17:33 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Thu, 7 Oct 2010 00:15:09 +0000 (17:15 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I1ac2d76272f5d7e1d4dd8efff22a6bd249702dd3
Dianne Hackborn [Wed, 6 Oct 2010 23:46:53 +0000 (16:46 -0700)]
Add confirmation when stopping system service, as per rwest.
Change-Id: I1cca31a87d3acfc49ffb4562d922d4577c0b1cba
Dianne Hackborn [Wed, 6 Oct 2010 21:28:23 +0000 (14:28 -0700)]
Fix issue #
3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
Make the receiver private. Also fix to correctly update when sync
status changes.
Change-Id: I35481bf5b473196b00427da4df49aa76f691d38b
Eric Fischer [Wed, 6 Oct 2010 18:56:08 +0000 (11:56 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I58d987d8ee9629e2d035a3bfddefedbe185daf8f
Dianne Hackborn [Tue, 5 Oct 2010 06:04:57 +0000 (23:04 -0700)]
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.
Dianne Hackborn [Tue, 5 Oct 2010 01:32:59 +0000 (18:32 -0700)]
Manage apps "on SD card" now shows all apps that can go on SD card.
Change-Id: Icc413891b2b884bb1af340b4c09ab3935c8e51ca
Eric Fischer [Fri, 1 Oct 2010 19:04:08 +0000 (12:04 -0700)]
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.
Eric Fischer [Fri, 1 Oct 2010 18:45:47 +0000 (11:45 -0700)]
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
Dianne Hackborn [Fri, 1 Oct 2010 02:14:28 +0000 (19:14 -0700)]
am
95d7a702: Merge "Fix android:allowClearUserData." into gingerbread
Merge commit '
95d7a702c3a36ffe79da099b717dc76d62a5bab2' into gingerbread-plus-aosp
* commit '
95d7a702c3a36ffe79da099b717dc76d62a5bab2':
Fix android:allowClearUserData.
Dianne Hackborn [Fri, 1 Oct 2010 02:03:55 +0000 (19:03 -0700)]
Merge "Fix android:allowClearUserData." into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 01:49:18 +0000 (18:49 -0700)]
Fix android:allowClearUserData.
Now respect this flag for system apps.
Change-Id: I496b0051a4998cb41b8c07fd0eb85e253de1eb97
Eric Fischer [Thu, 30 Sep 2010 22:58:20 +0000 (15:58 -0700)]
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
Eric Fischer [Thu, 30 Sep 2010 22:48:14 +0000 (15:48 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Ken Wakasa [Thu, 30 Sep 2010 17:10:29 +0000 (10:10 -0700)]
am
2d6c0b0d: Update strings for physical keyboard settings.
Merge commit '
2d6c0b0d7750237caf5e4b679ed14786fe81fde1' into gingerbread-plus-aosp
* commit '
2d6c0b0d7750237caf5e4b679ed14786fe81fde1':
Update strings for physical keyboard settings.
Gilles Debunne [Thu, 30 Sep 2010 17:08:43 +0000 (10:08 -0700)]
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
Ken Wakasa [Thu, 30 Sep 2010 03:52:52 +0000 (12:52 +0900)]
Update strings for physical keyboard settings.
bug:
2954950
Change-Id: I023de6dbe191ca6525cec51147a916eb746fb3e7
Gilles Debunne [Wed, 29 Sep 2010 23:02:13 +0000 (16:02 -0700)]
New assets for power widget: gps, sync
Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
Jake Hamby [Wed, 29 Sep 2010 22:06:42 +0000 (15:06 -0700)]
Fix bug where car dock sometimes doesn't connect.
Attempt to connect to car/desk dock after pairing completes. This
fixes a bug where we didn't try to connect if we received the UUID
change intent before the bonding state change intent.
Change-Id: I7c12a4eb23d17d506e43a64bf2a3aa5241debcb9
Eric Fischer [Wed, 29 Sep 2010 21:36:34 +0000 (14:36 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I9ea6e351c10191e58ed1d1c2784022f3d099c84b
Gilles Debunne [Wed, 29 Sep 2010 19:20:36 +0000 (12:20 -0700)]
am
98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread
Merge commit '
98289826e6a36dcb9f6df7b8f407195b2760e3b4' into gingerbread-plus-aosp
* commit '
98289826e6a36dcb9f6df7b8f407195b2760e3b4':
New assets (wifi, bluetooth...)
Gilles Debunne [Wed, 29 Sep 2010 19:18:12 +0000 (12:18 -0700)]
Merge "New assets (wifi, bluetooth...)" into gingerbread
Eric Fischer [Wed, 29 Sep 2010 19:17:20 +0000 (12:17 -0700)]
am
5698a75f: Split strings with SD card references into variations.
Merge commit '
5698a75f15526a38ee8e0b647d05e4ee358c575a' into gingerbread-plus-aosp
* commit '
5698a75f15526a38ee8e0b647d05e4ee358c575a':
Split strings with SD card references into variations.
Gilles Debunne [Wed, 29 Sep 2010 19:10:37 +0000 (12:10 -0700)]
New assets (wifi, bluetooth...)
Change-Id: I1b6c3a7049348aa63dddbacaf615b9ff5d630583
Eric Fischer [Tue, 28 Sep 2010 23:35:31 +0000 (16:35 -0700)]
Split strings with SD card references into variations.
Change-Id: I75263d57928817a211fbaf6ed45f828936f8d1be
Ken Wakasa [Wed, 29 Sep 2010 16:58:01 +0000 (09:58 -0700)]
am
d2c3f37f: Revise the Language & keyboard settings layout.
Merge commit '
d2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp
* commit '
d2c3f37fa445130c8cce0f16347d61f66b4b0025':
Revise the Language & keyboard settings layout.
Ken Wakasa [Tue, 28 Sep 2010 10:01:17 +0000 (19:01 +0900)]
Revise the Language & keyboard settings layout.
bug:
2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
Nick Pelly [Wed, 29 Sep 2010 05:34:42 +0000 (22:34 -0700)]
am
48ad5dfe: Merge "Add NFC checkbox to Settings app." into gingerbread
Merge commit '
48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp
* commit '
48ad5dfe3189534cc3c9b8cb6f84758db19524c4':
Add NFC checkbox to Settings app.
Nick Pelly [Wed, 29 Sep 2010 05:32:51 +0000 (22:32 -0700)]
Merge "Add NFC checkbox to Settings app." into gingerbread
Nick Pelly [Wed, 22 Sep 2010 17:55:13 +0000 (10:55 -0700)]
Add NFC checkbox to Settings app.
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)
Heavily modified to remove dead code.
Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
OSDN Git Service
