OSDN Git Service
Eric Fischer [Thu, 27 Jan 2011 23:03:43 +0000 (15:03 -0800)]
am
95112e5b: Import revised translations. DO NOT MERGE
* commit '
95112e5b9810b6a70974ace6ee1c017b57e466af':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Jan 2011 22:04:11 +0000 (14:04 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I64435ed3b620c5e748b0f15017d548eadf7adbd5
Amith Yamasani [Tue, 18 Jan 2011 17:08:41 +0000 (09:08 -0800)]
am
f7fd4ca8: Merge "Disable change PIN when PIN is inactive"
* commit '
f7fd4ca832e8ee28f0217d8096c3b401309a1f0f':
Disable change PIN when PIN is inactive
Amith Yamasani [Tue, 18 Jan 2011 16:52:40 +0000 (08:52 -0800)]
Merge "Disable change PIN when PIN is inactive"
Eric Fischer [Fri, 7 Jan 2011 04:30:09 +0000 (20:30 -0800)]
am
6418d373: Import translations for additional languages.
* commit '
6418d373679ef0b73701bacc1de34f68f1c9ade8':
Import translations for additional languages.
Eric Fischer [Thu, 6 Jan 2011 18:39:31 +0000 (10:39 -0800)]
Import translations for additional languages.
Change-Id: Ic94b9ae9229478ad7d0a49d3af9a954b50c8fdf5
Jean-Baptiste Queru [Tue, 28 Dec 2010 20:02:44 +0000 (12:02 -0800)]
am
e8531ff6: Merge "Changed the text input type of APN name to plain text"
* commit '
e8531ff6a03a0542b7b1531ddd469befed9bab85':
Changed the text input type of APN name to plain text
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:52:15 +0000 (11:52 -0800)]
Merge "Changed the text input type of APN name to plain text"
Nick Pelly [Sat, 11 Dec 2010 01:22:30 +0000 (17:22 -0800)]
am
c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
* commit '
c1286804cc839ec7006d6e9651c73ec7b3180157':
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
Nick Pelly [Sat, 11 Dec 2010 01:18:54 +0000 (17:18 -0800)]
Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
Eric Fischer [Fri, 10 Dec 2010 18:03:51 +0000 (10:03 -0800)]
am
99d2471d: Import revised translations. DO NOT MERGE
* commit '
99d2471d8d6c2a8cc0eb8e4540ba9090d46693d8':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:49:47 +0000 (08:49 -0800)]
am
2a7c5425: reconcile with open-source gingerbread
* commit '
2a7c542594e37f61e25fec7f441eb0a8dc14fd62':
Nick Pelly [Fri, 10 Dec 2010 03:39:58 +0000 (19:39 -0800)]
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
Eric Fischer [Fri, 10 Dec 2010 00:57:40 +0000 (16:57 -0800)]
Import revised translations. DO NOT MERGE
Bug
3272618
Change-Id: Id1c49e216342247bf8574db0bf2a53f8e15bdc6e
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:45:31 +0000 (10:45 -0800)]
am
1acfef82: merge from gingerbread
* commit '
1acfef82bd464fdbd3765321a051e59728b4d72b':
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:18:44 +0000 (10:18 -0800)]
reconcile with open-source gingerbread
Change-Id: I2c27148958dbc2c47121d4874e1108389da804c0
Jean-Baptiste Queru [Thu, 9 Dec 2010 17:11:15 +0000 (09:11 -0800)]
merge from gingerbread
Change-Id: Icee740e130b9ebd21446de79b63435f5d1d046e4
Jake Hamby [Sat, 4 Dec 2010 01:02:02 +0000 (17:02 -0800)]
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.
Bug:
3246147
Change-Id: I2f46303cf44951f0b3907c43d4b096736f08765b
Gustaf Nilklint [Mon, 6 Dec 2010 09:21:13 +0000 (10:21 +0100)]
Disable change PIN when PIN is inactive
Disabled the option to change PIN code when PIN lock is disabled.
This is done by adding dependency to the checkbox above in the XML file.
Change-Id: Idafae0820297b8f7ba7a14f5ebe4f7e691547cc8
Jake Hamby [Sun, 5 Dec 2010 07:45:23 +0000 (23:45 -0800)]
am
b0fda6f5: Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
* commit '
b0fda6f56a0ee3c42cf02813b5fc346382873c4f':
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
Jake Hamby [Sat, 4 Dec 2010 01:02:02 +0000 (17:02 -0800)]
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.
Bug:
3246147
Change-Id: I320fc7a9a0bfdf8067387ec8de80efccaca2b5f6
Irfan Sheriff [Wed, 1 Dec 2010 23:53:32 +0000 (15:53 -0800)]
am
fa04d89f: avoid view creation on orientation change
* commit '
fa04d89fd8dd8674375de7a10ca755056b88b811':
avoid view creation on orientation change
Irfan Sheriff [Wed, 1 Dec 2010 23:05:44 +0000 (15:05 -0800)]
avoid view creation on orientation change
Bug:
3238075
Change-Id: Ia245e701b9663a1a8eb0457b8a181a7899e8d6c5
Eric Fischer [Tue, 30 Nov 2010 19:48:26 +0000 (11:48 -0800)]
am
e1e257f4: Import revised translations. DO NOT MERGE
* commit '
e1e257f4b45fcd5dd59b73295804df94eefc4970':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 30 Nov 2010 00:21:55 +0000 (16:21 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I74acfc5708208509b1afe3ad55ba8a4777c7b34f
Jean-Baptiste Queru [Tue, 30 Nov 2010 00:11:16 +0000 (16:11 -0800)]
am
04b646df: Merge "Possible NumberFormatException of parseInt is outside try-catch"
* commit '
04b646df1e9f00719d2d547fa1da59407bb6be67':
Possible NumberFormatException of parseInt is outside try-catch
Jean-Baptiste Queru [Tue, 30 Nov 2010 00:07:44 +0000 (16:07 -0800)]
Merge "Possible NumberFormatException of parseInt is outside try-catch"
Peter Kuterna [Sun, 28 Nov 2010 21:35:31 +0000 (22:35 +0100)]
Possible NumberFormatException of parseInt is outside try-catch
Change-Id: I77c1e41185a8d3a1724af848d6bbfbb1da816b55
Eric Fischer [Thu, 11 Nov 2010 23:45:50 +0000 (15:45 -0800)]
am
5c205262: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5c205262460ecc5bcfb92ffb10185a573a4b7c90':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 11 Nov 2010 23:43:19 +0000 (15:43 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Dianne Hackborn [Thu, 11 Nov 2010 02:07:18 +0000 (18:07 -0800)]
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
Dianne Hackborn [Thu, 11 Nov 2010 01:58:58 +0000 (17:58 -0800)]
Merge "Fix issue #
3177284: Account for wake lock power usage on Crespo" into gingerbread
Eric Fischer [Tue, 9 Nov 2010 20:19:25 +0000 (12:19 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ic9978f86bf778e815896bbe858e07d953d53843b
Dianne Hackborn [Tue, 9 Nov 2010 03:05:00 +0000 (19:05 -0800)]
Fix issue #
3177284: Account for wake lock power usage on Crespo
Change-Id: I5988d28fd192cd7fdb85140172a92141eb389964
Nick Pelly [Thu, 4 Nov 2010 02:59:47 +0000 (19:59 -0700)]
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.
Nick Pelly [Thu, 4 Nov 2010 02:56:36 +0000 (21:56 -0500)]
Update settings text on success, so we clear out error text after recovery.
Change-Id: Ie6bff9f1b56d0218120cf98638b9cbfe505bd02d
Signed-off-by: Nick Pelly <npelly@google.com>
Dianne Hackborn [Fri, 29 Oct 2010 22:40:36 +0000 (15:40 -0700)]
am
4e4ed14e: Fix issue #
3146784: ANR in manage applications
* commit '
4e4ed14ee2b82cb90a25b3027eb36f190ce2e1e7':
Fix issue #
3146784: ANR in manage applications
Dianne Hackborn [Fri, 29 Oct 2010 20:49:20 +0000 (13:49 -0700)]
Fix issue #
3146784: ANR in manage applications
See the big comment.
Change-Id: I36164a6fcba58fe2b0e2b3aa216780d0d0e5ed37
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:32:17 +0000 (17:32 -0700)]
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.
Jean-Baptiste Queru [Mon, 25 Oct 2010 23:40:13 +0000 (16:40 -0700)]
Merge "Always set right auth_type value in apn."
Eric Fischer [Mon, 25 Oct 2010 23:16:14 +0000 (16:16 -0700)]
am
873a27c3: Import revised translations. DO NOT MERGE
Merge commit '
873a27c399a50cb2a4703cc895c1601124ae208d' into gingerbread-plus-aosp
* commit '
873a27c399a50cb2a4703cc895c1601124ae208d':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 22:46:11 +0000 (15:46 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I0cb51009ba4b9954dd673d7f653f0e0b8376ca72
Marta Białka [Mon, 25 Oct 2010 13:39:04 +0000 (15:39 +0200)]
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
Eric Fischer [Fri, 22 Oct 2010 23:03:49 +0000 (16:03 -0700)]
am
901f4fbe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:01:29 +0000 (16:01 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 22:31:13 +0000 (15:31 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I3edc02925b4d8bc149dd8a76056f86f3b5130e4e
Dianne Hackborn [Fri, 22 Oct 2010 19:59:31 +0000 (12:59 -0700)]
am
5e34f239: Fix issue #
3124528: Mange applications is including cache files in storage size
Dianne Hackborn [Fri, 22 Oct 2010 19:18:16 +0000 (12:18 -0700)]
Fix issue #
3124528: Mange applications is including cache files in storage size
Change-Id: If26aeaed7572354feca7b8e65b7451a024a10266
Eric Fischer [Fri, 22 Oct 2010 01:22:09 +0000 (18:22 -0700)]
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.
Eric Fischer [Fri, 22 Oct 2010 01:15:34 +0000 (18:15 -0700)]
Fix the build. A "--" token is not just text in an XML comment.
Change-Id: Ifbc3de1dd209860f516920e5b9c1742813845380
Roy West [Fri, 22 Oct 2010 00:53:37 +0000 (17:53 -0700)]
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
Roy West [Fri, 22 Oct 2010 00:18:40 +0000 (17:18 -0700)]
Try to fix bug3119318 without breaking the build this time
Change-Id: Ic89675546f3ab72588ce18fbe7740749da6f870c
Mathias Agopian [Fri, 22 Oct 2010 00:07:11 +0000 (17:07 -0700)]
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"
Mathias Agopian [Thu, 21 Oct 2010 23:37:59 +0000 (16:37 -0700)]
Revert "Fix bug3119318, missing Mount USB storage strings"
This reverts commit
af06d7a94a69d82ef5f2d8082e75c368f4204afb.
Roy West [Thu, 21 Oct 2010 22:57:35 +0000 (15:57 -0700)]
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
Roy West [Thu, 21 Oct 2010 22:47:14 +0000 (15:47 -0700)]
Fix bug3119318, missing Mount USB storage strings
Change-Id: Iefebd97d85ad4a51f604e9a7fa709ba84c94239d
Nick Pelly [Thu, 21 Oct 2010 16:37:55 +0000 (09:37 -0700)]
am
781c0aa2: Merge "NFC Settings cleanup." into gingerbread
Merge commit '
781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp
* commit '
781c0aa21ed1e4a38dc3ec1a5facc7be48386571':
NFC Settings cleanup.
Nick Pelly [Thu, 21 Oct 2010 10:56:18 +0000 (03:56 -0700)]
Merge "NFC Settings cleanup." into gingerbread
Nick Pelly [Thu, 21 Oct 2010 01:42:23 +0000 (18:42 -0700)]
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>
Dianne Hackborn [Thu, 21 Oct 2010 00:05:19 +0000 (17:05 -0700)]
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
Dianne Hackborn [Wed, 20 Oct 2010 23:58:47 +0000 (16:58 -0700)]
Merge "Fix issue #
3114356: Storage visualization in Manage Apps is confusing" into gingerbread
Dianne Hackborn [Wed, 20 Oct 2010 23:01:50 +0000 (16:01 -0700)]
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
Nick Pelly [Wed, 20 Oct 2010 23:47:25 +0000 (16:47 -0700)]
am
ff8018dc: Merge "Fix NFC permission." into gingerbread
Merge commit '
ff8018dcbd0488160519481d4ca1567fa397d44e' into gingerbread-plus-aosp
* commit '
ff8018dcbd0488160519481d4ca1567fa397d44e':
Fix NFC permission.
Nick Pelly [Wed, 20 Oct 2010 23:44:41 +0000 (16:44 -0700)]
Merge "Fix NFC permission." into gingerbread
Nick Pelly [Wed, 20 Oct 2010 23:39:44 +0000 (16:39 -0700)]
Fix NFC permission.
(it's not actually needed right now, hence why nothing was broken).
Change-Id: I52ea0b49a77eca4e3a688d37aa721d3483227553
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
OSDN Git Service
