OSDN Git Service
Eric Fischer [Thu, 2 Dec 2010 22:06:39 +0000 (14:06 -0800)]
Rename Indonesian and Hebrew translations to match Locale.java conventions
Change-Id: I581dcd7bd932ba48f21388cfc16d3c033ec9c7d6
Eric Fischer [Mon, 29 Nov 2010 23:13:26 +0000 (15:13 -0800)]
Import revised translations.
Change-Id: I5900ca6df7e3099b354e792b9287733380e38d13
Eric Fischer [Thu, 18 Nov 2010 00:27:05 +0000 (16:27 -0800)]
Import initial translations for 20 new locales.
Change-Id: Ic441b87aeb0da31a26c1301cfa487e3eba516fc5
Gilles Debunne [Tue, 16 Nov 2010 23:12:25 +0000 (15:12 -0800)]
Merge "Removed unused assets."
Daisuke Miyakawa [Tue, 16 Nov 2010 22:50:47 +0000 (14:50 -0800)]
Use system coler for Notification message.
Current UI uses black for background, so all texts in
Bluetooth notifications are invisible. Same root cause as
Ibb4b91e025ba89ed202c7919a89ecd8c9bd7e24a
Change-Id: I1e8daed46e7f8ebbb6e884436b51d4784adcdec0
Gilles Debunne [Tue, 16 Nov 2010 21:33:46 +0000 (13:33 -0800)]
Removed unused assets.
Change-Id: Id53fed964a8cd577c115dbc7f1334fd1d59c9cdd
Eric Fischer [Thu, 11 Nov 2010 23:53:26 +0000 (15:53 -0800)]
am
84f70555: (-s ours) am
2acef5de: Import revised translations. DO NOT MERGE
* commit '
84f705552c547c5697578653c727c12e23c8f486':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 11 Nov 2010 23:49:11 +0000 (15:49 -0800)]
am
2acef5de: Import revised translations. DO NOT MERGE
* commit '
2acef5dec3faa043fc433f4f7f22a3e002d89bd0':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 10 Nov 2010 01:38:11 +0000 (17:38 -0800)]
Import revised translations.
Change-Id: I7731593d9573ea3f21f40f8ab8df36992279db86
Eric Fischer [Tue, 9 Nov 2010 20:16:53 +0000 (12:16 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I63625c958e02adf11ab0dd21c0432a924acb5b57
Eric Fischer [Thu, 4 Nov 2010 00:10:35 +0000 (17:10 -0700)]
Split strings referring to "phone" into phone and tablet variants.
Change-Id: I27f5782a762896d6faba89d3d7d2319db8b47f27
Eric Fischer [Wed, 27 Oct 2010 21:29:50 +0000 (14:29 -0700)]
Import revised translations.
Change-Id: I5b337570698d0ab7bb6c7fc873a78bf3261e368a
Jaikumar Ganesh [Fri, 22 Oct 2010 22:43:54 +0000 (15:43 -0700)]
Send CONNECTION_STATE_CHANGE intent.
Change-Id: Ibbf53b1f96d92c9d0c6acbfc491e93046136e95d
Eric Fischer [Tue, 26 Oct 2010 00:31:26 +0000 (17:31 -0700)]
am
7c40d5ee: (-s ours) am
afd569b4: Import revised translations. DO NOT MERGE
Merge commit '
7c40d5ee855c4468d74b7ce030415763a9649ff7'
* commit '
7c40d5ee855c4468d74b7ce030415763a9649ff7':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 26 Oct 2010 00:12:08 +0000 (17:12 -0700)]
am
afd569b4: Import revised translations. DO NOT MERGE
Merge commit '
afd569b4b294e226fa6c35a4ee863bd189daf62a' into gingerbread-plus-aosp
* commit '
afd569b4b294e226fa6c35a4ee863bd189daf62a':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 23:49:51 +0000 (16:49 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I3067481b00b451811cce1795d23f5c9402bdaa04
Eric Fischer [Mon, 25 Oct 2010 23:22:43 +0000 (16:22 -0700)]
am
f80b655f: (-s ours) am
c0460579: Import revised translations. DO NOT MERGE
Merge commit '
f80b655f8b9058a2501476e5c8cc9b9743d4e132'
* commit '
f80b655f8b9058a2501476e5c8cc9b9743d4e132':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 23:16:23 +0000 (16:16 -0700)]
am
c0460579: Import revised translations. DO NOT MERGE
Merge commit '
c0460579699b696eceec5eadbfcdc1543aa45929' into gingerbread-plus-aosp
* commit '
c0460579699b696eceec5eadbfcdc1543aa45929':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 22:42:56 +0000 (15:42 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ia8c5a9b2ad897e37c09be2a951c6734e637bb145
Eric Fischer [Thu, 21 Oct 2010 20:42:33 +0000 (13:42 -0700)]
am
a769c2b2: am
2acd43d3: Replace shared storage with USB storage.
Merge commit '
a769c2b2b13bff94cf21deada89f0ededac6a2b2'
* commit '
a769c2b2b13bff94cf21deada89f0ededac6a2b2':
Replace shared storage with USB storage.
Eric Fischer [Wed, 20 Oct 2010 20:57:15 +0000 (13:57 -0700)]
am
2acd43d3: Replace shared storage with USB storage.
Merge commit '
2acd43d31cf5ffdda9b4e72a303c1db7205af613' into gingerbread-plus-aosp
* commit '
2acd43d31cf5ffdda9b4e72a303c1db7205af613':
Replace shared storage with USB storage.
Eric Fischer [Wed, 20 Oct 2010 01:11:55 +0000 (18:11 -0700)]
Replace shared storage with USB storage.
Change-Id: Ia32a91daad6e0247fa6d870207d56724535d0f61
Kenny Root [Mon, 18 Oct 2010 17:32:23 +0000 (10:32 -0700)]
am
4099df64: (-s ours) am
b141d86c: Import revised translations DO NOT MERGE
Merge commit '
4099df64e3aae5a0475d5e22074497900d9459b7'
* commit '
4099df64e3aae5a0475d5e22074497900d9459b7':
Import revised translations DO NOT MERGE
Kenny Root [Sat, 16 Oct 2010 15:50:52 +0000 (08:50 -0700)]
am
c0dcd8d4: (-s ours) am
7facaf19: Import revised translations
Merge commit '
c0dcd8d449e110130307577973f512cd9afb8e25'
* commit '
c0dcd8d449e110130307577973f512cd9afb8e25':
Import revised translations
Kenny Root [Sat, 16 Oct 2010 01:41:15 +0000 (18:41 -0700)]
am
b141d86c: Import revised translations DO NOT MERGE
Merge commit '
b141d86cda32d072851ee661caa7ddaa20526aeb' into gingerbread-plus-aosp
* commit '
b141d86cda32d072851ee661caa7ddaa20526aeb':
Import revised translations DO NOT MERGE
Kenny Root [Fri, 15 Oct 2010 22:18:43 +0000 (15:18 -0700)]
Import revised translations DO NOT MERGE
Change-Id: I70140735d15c789f795d5fdd3759d6666d3798ea
Kenny Root [Thu, 14 Oct 2010 21:56:13 +0000 (14:56 -0700)]
am
7facaf19: Import revised translations
Merge commit '
7facaf194dfe5b1d2bb2e59dfca355db07d0c8c4' into gingerbread-plus-aosp
* commit '
7facaf194dfe5b1d2bb2e59dfca355db07d0c8c4':
Import revised translations
Kenny Root [Thu, 14 Oct 2010 16:42:33 +0000 (09:42 -0700)]
Import revised translations
Change-Id: I71274a01ab66aeecb0d13b8708589a2df49f3403
Jaikumar Ganesh [Thu, 14 Oct 2010 02:15:51 +0000 (19:15 -0700)]
am
5eadab02: am
4492b2c6: Fix OPP crash and Call Log sort order.
Merge commit '
5eadab02ea3202f417434a13a7637379fffc43de'
* commit '
5eadab02ea3202f417434a13a7637379fffc43de':
Fix OPP crash and Call Log sort order.
Jaikumar Ganesh [Tue, 12 Oct 2010 20:57:03 +0000 (13:57 -0700)]
am
4492b2c6: Fix OPP crash and Call Log sort order.
Merge commit '
4492b2c66cf3b26fd988f3b7f1f5df6cc9ed49f2' into gingerbread-plus-aosp
* commit '
4492b2c66cf3b26fd988f3b7f1f5df6cc9ed49f2':
Fix OPP crash and Call Log sort order.
Jaikumar Ganesh [Tue, 12 Oct 2010 18:49:18 +0000 (11:49 -0700)]
Fix OPP crash and Call Log sort order.
Bug:
3067780 3067770
Dr No: jerry
Change-Id: I2ac39e2f1f0233a6ada84af39d8addfe0fe04cea
Jaikumar Ganesh [Mon, 11 Oct 2010 17:42:08 +0000 (10:42 -0700)]
am
c47e9733: am
3f475149: Merge "Make "search by number" function work" into gingerbread
Merge commit '
c47e9733b12c81b24ec32f0707f2cd5288aaf6b0'
* commit '
c47e9733b12c81b24ec32f0707f2cd5288aaf6b0':
Make "search by number" function work
Jaikumar Ganesh [Sun, 10 Oct 2010 19:55:34 +0000 (12:55 -0700)]
am
0b1672a9: am
e298302a: Merge "Add intent filter to PBAP service." into gingerbread
Merge commit '
0b1672a98621c794363dddc2a1b61a854de98ded'
* commit '
0b1672a98621c794363dddc2a1b61a854de98ded':
Add intent filter to PBAP service.
Jaikumar Ganesh [Sun, 10 Oct 2010 18:08:18 +0000 (11:08 -0700)]
am
3f475149: Merge "Make "search by number" function work" into gingerbread
Merge commit '
3f475149a4c74ccce703cab676283ab4355dc3c6' into gingerbread-plus-aosp
* commit '
3f475149a4c74ccce703cab676283ab4355dc3c6':
Make "search by number" function work
Jaikumar Ganesh [Sun, 10 Oct 2010 17:57:00 +0000 (10:57 -0700)]
Merge "Make "search by number" function work" into gingerbread
Jaikumar Ganesh [Fri, 8 Oct 2010 00:00:38 +0000 (17:00 -0700)]
am
e298302a: Merge "Add intent filter to PBAP service." into gingerbread
Merge commit '
e298302a02408a2440fac8a7e84f8b8403c99371' into gingerbread-plus-aosp
* commit '
e298302a02408a2440fac8a7e84f8b8403c99371':
Add intent filter to PBAP service.
Jaikumar Ganesh [Thu, 7 Oct 2010 23:56:20 +0000 (16:56 -0700)]
Merge "Add intent filter to PBAP service." into gingerbread
Nick Pelly [Thu, 7 Oct 2010 19:23:30 +0000 (12:23 -0700)]
am
a6a28724: am
82d9bdb1: Merge "Don\'t enforce Authenticated Link key (MITM protection) on PBAP." into gingerbread
Merge commit '
a6a28724002f61ad69d240192e3886be11a61693'
* commit '
a6a28724002f61ad69d240192e3886be11a61693':
Don't enforce Authenticated Link key (MITM protection) on PBAP.
Liejun Tao [Tue, 5 Oct 2010 17:21:25 +0000 (12:21 -0500)]
Make "search by number" function work
Previous "search by number" is wrong. Re-implement it to make it work.
Add flexible to handle searchValue as both null-terminated and not
null-terminated.
Change-Id: Ie50f8d29dfcbae868c43d482467b09b08ed2be0f
Jaikumar Ganesh [Wed, 6 Oct 2010 22:39:15 +0000 (00:39 +0200)]
Add intent filter to PBAP service.
Change-Id: I4059c74fcd6622c0e5688ffa171ff5d1f3be6b8f
Nick Pelly [Tue, 5 Oct 2010 23:56:24 +0000 (16:56 -0700)]
am
82d9bdb1: Merge "Don\'t enforce Authenticated Link key (MITM protection) on PBAP." into gingerbread
Merge commit '
82d9bdb117558939d975ca996522f881b0985a68' into gingerbread-plus-aosp
* commit '
82d9bdb117558939d975ca996522f881b0985a68':
Don't enforce Authenticated Link key (MITM protection) on PBAP.
Nick Pelly [Tue, 5 Oct 2010 23:53:23 +0000 (16:53 -0700)]
Merge "Don't enforce Authenticated Link key (MITM protection) on PBAP." into gingerbread
Jaikumar Ganesh [Mon, 4 Oct 2010 21:51:52 +0000 (23:51 +0200)]
Don't enforce Authenticated Link key (MITM protection) on PBAP.
Gory Details:
SecureRfcomm API => authentication is true and encyrption is true. (HIGH)
InSecureRfcomm API => authentication is false and encryption is true. (MEDIUM)
The authentication above refers to the authentication of the link
key i.e prevention of MITM attacks.
Bluetooth 2.0 legacy pairing doesn't provide MITM protection.
Bluetooth 2.1 -> If pairing is done with MITM protection already,
this doesn't matter. If pairing is NOT done with MITM protection
we have the same security as the other core profiles. It dones't make
sense to enfore MITM for this profile while having Handsfree profile
to not have MITM i.e some attacker can listen in on conversations.
Why are we changing this now: More headsets with 2.1 and No Input/Output
have started to support PBAP. So we pair without MITM with them and then
when the PBAP request comes it fails because we need MITM protection and
we try to exchange keys (i.e pair again)
The headset don't allow pairing to happen at any time because its a security
issue and hence PBAP request fails.
Change-Id: Ia80c15c545e9396e7c6882b731c90a8ede119827
Gilles Debunne [Mon, 4 Oct 2010 19:11:05 +0000 (12:11 -0700)]
Gilles Debunne [Mon, 4 Oct 2010 19:07:20 +0000 (12:07 -0700)]
am
0ca9e88b: New bluetooth folder icons. Bug
3040343
Merge commit '
0ca9e88b03dd34a1bbf63a218d34a7449ff2635b' into gingerbread-plus-aosp
* commit '
0ca9e88b03dd34a1bbf63a218d34a7449ff2635b':
New bluetooth folder icons. Bug
3040343
Gilles Debunne [Mon, 4 Oct 2010 18:43:54 +0000 (11:43 -0700)]
New bluetooth folder icons. Bug
3040343
Change-Id: I4d89a58a5180a150635768e3d46a38ed61d96f51
Ola Johnsson [Mon, 4 Oct 2010 12:30:51 +0000 (05:30 -0700)]
am
20d24a75: am
4ce32fcc: PullvCardList implemented according to specification
Merge commit '
20d24a75ff0111a86418d77fdd98dd2e7ef4a0ca'
* commit '
20d24a75ff0111a86418d77fdd98dd2e7ef4a0ca':
PullvCardList implemented according to specification
Ola Johnsson [Mon, 4 Oct 2010 12:23:39 +0000 (05:23 -0700)]
am
4ce32fcc: PullvCardList implemented according to specification
Merge commit '
4ce32fccf381a3b448f0d5ff56665201c0e0e6d3' into gingerbread-plus-aosp
* commit '
4ce32fccf381a3b448f0d5ff56665201c0e0e6d3':
PullvCardList implemented according to specification
Ola Johnsson [Wed, 16 Jun 2010 08:39:05 +0000 (10:39 +0200)]
PullvCardList implemented according to specification
The value tag sent as a byte array was not parsed correctly
leading to illegal strings. The list count value was not used
according to the specification, now refers to number of entries
that should be returned. Specification for Phone book access
profile chapter 5.3 default max list size of OxFFFF (65535)
taken from 5.3.4.4. Now uses default values when Application
Parameter headers are missing.
Change-Id: Ib17f2208a91b4f896d9beebaf3a21566502ac291
Eric Fischer [Fri, 1 Oct 2010 01:12:22 +0000 (18:12 -0700)]
am
7b560f1c: (-s ours) am
34760a31: Import revised translations. DO NOT MERGE
Merge commit '
7b560f1cc7e7661ed4ee3f2056346c336fa43fe4'
* commit '
7b560f1cc7e7661ed4ee3f2056346c336fa43fe4':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 30 Sep 2010 22:54:34 +0000 (15:54 -0700)]
am
34760a31: Import revised translations. DO NOT MERGE
Merge commit '
34760a3117ff3fe4f1e8fe80c9367bcc7390c2b6' into gingerbread-plus-aosp
* commit '
34760a3117ff3fe4f1e8fe80c9367bcc7390c2b6':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 30 Sep 2010 05:12:48 +0000 (22:12 -0700)]
am
c9c801a4: am
a26109b2: Merge "Split strings with SD card references into variations." into gingerbread
Merge commit '
c9c801a48baeed7b5af85e88b69e02444dafabe5'
* commit '
c9c801a48baeed7b5af85e88b69e02444dafabe5':
Split strings with SD card references into variations.
Eric Fischer [Wed, 29 Sep 2010 21:30:20 +0000 (14:30 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I0f5729fa9041ac4ba030b939b899f66d0952d1c6
Eric Fischer [Wed, 29 Sep 2010 17:56:17 +0000 (10:56 -0700)]
am
a26109b2: Merge "Split strings with SD card references into variations." into gingerbread
Merge commit '
a26109b280f2967514454a9b99522faeb35f580f' into gingerbread-plus-aosp
* commit '
a26109b280f2967514454a9b99522faeb35f580f':
Split strings with SD card references into variations.
Eric Fischer [Wed, 29 Sep 2010 17:53:31 +0000 (10:53 -0700)]
Merge "Split strings with SD card references into variations." into gingerbread
Jaikumar Ganesh [Wed, 29 Sep 2010 01:21:58 +0000 (18:21 -0700)]
am
8b08754f: am
5f78d4ef: Merge "Update BT folder icon." into gingerbread
Merge commit '
8b08754fe9d87d6f6f3b19b81330622889ac8264'
* commit '
8b08754fe9d87d6f6f3b19b81330622889ac8264':
Update BT folder icon.
Jaikumar Ganesh [Wed, 29 Sep 2010 01:13:11 +0000 (18:13 -0700)]
am
5f78d4ef: Merge "Update BT folder icon." into gingerbread
Merge commit '
5f78d4ef75710e3dbf608644b16da7c6f88d00ed' into gingerbread-plus-aosp
* commit '
5f78d4ef75710e3dbf608644b16da7c6f88d00ed':
Update BT folder icon.
Jaikumar Ganesh [Wed, 29 Sep 2010 01:10:48 +0000 (18:10 -0700)]
Merge "Update BT folder icon." into gingerbread
Jaikumar Ganesh [Wed, 29 Sep 2010 01:09:57 +0000 (18:09 -0700)]
Update BT folder icon.
Change-Id: I1aecca20d4a9aaaf8e4aad37eb5c2e2357fad6ad
Eric Fischer [Tue, 28 Sep 2010 23:34:10 +0000 (16:34 -0700)]
Split strings with SD card references into variations.
Change-Id: Ie01f4de45b427f06b0daec3847b865d0e4b2d6e7
Brad Fitzpatrick [Tue, 28 Sep 2010 20:20:48 +0000 (13:20 -0700)]
am
c24d5e25: am
0a79bdbb: Trim the Bluetooth database off the main thread.
Merge commit '
c24d5e2584346d02fe6a6cabae2ada4cf3e04ee1'
* commit '
c24d5e2584346d02fe6a6cabae2ada4cf3e04ee1':
Trim the Bluetooth database off the main thread.
Brad Fitzpatrick [Tue, 28 Sep 2010 17:34:59 +0000 (10:34 -0700)]
am
0a79bdbb: Trim the Bluetooth database off the main thread.
Merge commit '
0a79bdbbfa3b79b808cbbe7490731e5aae4489e9' into gingerbread-plus-aosp
* commit '
0a79bdbbfa3b79b808cbbe7490731e5aae4489e9':
Trim the Bluetooth database off the main thread.
Brad Fitzpatrick [Tue, 28 Sep 2010 15:53:41 +0000 (08:53 -0700)]
Trim the Bluetooth database off the main thread.
This looks to be most if not all of the remaining StrictMode
violations in this process. Not a huge deal, but cleaning up noise
will make bigger problems stand out easier in the future.
Change-Id: I262194c12114114fbe059d73475afb1bbb5654ab
Eric Fischer [Mon, 27 Sep 2010 21:39:20 +0000 (14:39 -0700)]
am
e1a84b31: (-s ours) am
d50b3d13: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '
e1a84b31d5945c4690b25d3c86ee82bfa9278bb8'
* commit '
e1a84b31d5945c4690b25d3c86ee82bfa9278bb8':
Trim unwanted whitespace from translations. DO NOT MERGE
Eric Fischer [Mon, 27 Sep 2010 19:31:10 +0000 (12:31 -0700)]
am
d50b3d13: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '
d50b3d1388577370cfe61c34b238cb6c245667a8' into gingerbread-plus-aosp
* commit '
d50b3d1388577370cfe61c34b238cb6c245667a8':
Trim unwanted whitespace from translations. DO NOT MERGE
Eric Fischer [Mon, 27 Sep 2010 19:26:50 +0000 (12:26 -0700)]
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Eric Fischer [Mon, 27 Sep 2010 19:16:38 +0000 (12:16 -0700)]
Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: I22c96b9e3540bd220c01987a0830c3e6b2420e29
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:57:57 +0000 (17:57 -0700)]
am
f7394446: (-s ours) am
58ffcb38: reconcile froyo-release into gingerbread
Merge commit '
f739444694a8378142250f930bc575f9628d7ace'
* commit '
f739444694a8378142250f930bc575f9628d7ace':
Fix string placeholders that got mangled in translation. DO NOT MERGE
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:42:14 +0000 (17:42 -0700)]
am
58ffcb38: reconcile froyo-release into gingerbread
Merge commit '
58ffcb38828199b04a756e93a525779554efd9c9' into gingerbread-plus-aosp
* commit '
58ffcb38828199b04a756e93a525779554efd9c9':
Fix string placeholders that got mangled in translation. DO NOT MERGE
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:30:07 +0000 (17:30 -0700)]
reconcile froyo-release into gingerbread
Change-Id: I5b2492a62bab246a41ad43f45f7a1d4c13b15985
a5206c [Wed, 22 Sep 2010 21:41:21 +0000 (14:41 -0700)]
am
541939ff: am
77b122f5: For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
Merge commit '
541939ff48867b2a8656503d29f29eb6bf6f1a30'
* commit '
541939ff48867b2a8656503d29f29eb6bf6f1a30':
For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
a5206c [Wed, 22 Sep 2010 20:34:39 +0000 (13:34 -0700)]
am
77b122f5: For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
Merge commit '
77b122f551ae37811c75ae76fa2029f7b3f2f404' into gingerbread-plus-aosp
* commit '
77b122f551ae37811c75ae76fa2029f7b3f2f404':
For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
a5206c [Wed, 22 Sep 2010 19:47:06 +0000 (03:47 +0800)]
For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
Eric Fischer [Thu, 9 Sep 2010 18:58:37 +0000 (11:58 -0700)]
Fix string placeholders that got mangled in translation. DO NOT MERGE
Pull the new versions of the three affected strings back from gingerbread
(where the placeholders are explicitly marked as such) and reimport the
zh-rTW translations.
Change-Id: Ica839e87d3efe32f5cc8ae0ab42346d8f60d3015
Daisuke Miyakawa [Mon, 13 Sep 2010 20:35:35 +0000 (13:35 -0700)]
Let BT use FLAG_REFRAIN_IMAGE_EXPORT.
Bug:
2603200
Change-Id: I385e831b8c5684cc75c249ee6d41d5256a29f3c5
Eric Fischer [Thu, 9 Sep 2010 23:23:38 +0000 (16:23 -0700)]
am
0aabafe3: (-s ours) am
037bb6c9: am
bf992c5b: (-s ours) Fix string placeholders that got mangled in translation. DO NOT MERGE
Merge commit '
0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e'
* commit '
0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e':
Fix string placeholders that got mangled in translation. DO NOT MERGE
Eric Fischer [Thu, 9 Sep 2010 23:20:06 +0000 (16:20 -0700)]
am
037bb6c9: am
bf992c5b: (-s ours) Fix string placeholders that got mangled in translation. DO NOT MERGE
Merge commit '
037bb6c989f4bbce24585abcca790fdc3115ff14' into gingerbread-plus-aosp
* commit '
037bb6c989f4bbce24585abcca790fdc3115ff14':
Fix string placeholders that got mangled in translation. DO NOT MERGE
Eric Fischer [Thu, 9 Sep 2010 23:17:16 +0000 (16:17 -0700)]
am
bf992c5b: (-s ours) Fix string placeholders that got mangled in translation. DO NOT MERGE
Merge commit '
bf992c5b8417c41779e6cb5890b65949dc3353bf' into gingerbread
* commit '
bf992c5b8417c41779e6cb5890b65949dc3353bf':
Fix string placeholders that got mangled in translation. DO NOT MERGE
Eric Fischer [Thu, 9 Sep 2010 18:58:37 +0000 (11:58 -0700)]
Fix string placeholders that got mangled in translation. DO NOT MERGE
Pull the new versions of the three affected strings back from gingerbread
(where the placeholders are explicitly marked as such) and reimport the
zh-rTW translations.
Change-Id: Ica839e87d3efe32f5cc8ae0ab42346d8f60d3015
Brad Fitzpatrick [Fri, 3 Sep 2010 21:58:24 +0000 (14:58 -0700)]
am
d4693ca9: am
55470710: Replace use of SharedPreference commit() with apply().
Merge commit '
d4693ca99284a12703a0de9fd6c70f50262073e0'
* commit '
d4693ca99284a12703a0de9fd6c70f50262073e0':
Replace use of SharedPreference commit() with apply().
Brad Fitzpatrick [Fri, 3 Sep 2010 21:55:19 +0000 (14:55 -0700)]
am
55470710: Replace use of SharedPreference commit() with apply().
Merge commit '
55470710c2624bde2aa56275d29b60055638c06c' into gingerbread-plus-aosp
* commit '
55470710c2624bde2aa56275d29b60055638c06c':
Replace use of SharedPreference commit() with apply().
Brad Fitzpatrick [Fri, 3 Sep 2010 20:57:15 +0000 (13:57 -0700)]
Replace use of SharedPreference commit() with apply().
Also fix a typo and replace a bunch of redundant
SharedPreference.Editor commits with one at the end.
Change-Id: I75623cb6809a363d05421f80f1560d586ae1ab80
Daisuke Miyakawa [Thu, 2 Sep 2010 20:08:48 +0000 (13:08 -0700)]
am
6a962312: am
0ddb8aab: Modify variables used in vCard code.
Merge commit '
6a962312358451fbb3c77ff7f6048388178f5677'
* commit '
6a962312358451fbb3c77ff7f6048388178f5677':
Modify variables used in vCard code.
Daisuke Miyakawa [Thu, 2 Sep 2010 19:59:32 +0000 (12:59 -0700)]
am
0ddb8aab: Modify variables used in vCard code.
Merge commit '
0ddb8aabe0f62d7741ee0aa040e43643b823c441' into gingerbread-plus-aosp
* commit '
0ddb8aabe0f62d7741ee0aa040e43643b823c441':
Modify variables used in vCard code.
Daisuke Miyakawa [Thu, 2 Sep 2010 19:53:43 +0000 (12:53 -0700)]
Modify variables used in vCard code.
See also Icf265ce7f83c1e2bd5db0c3d9bd4c142afd6db34
Change-Id: I3a94e86d0788a395ac0744bdf6e31c8e64fb0c15
Edward Savage-Jones [Mon, 30 Aug 2010 20:30:54 +0000 (13:30 -0700)]
am
f6856304: am
b8c5dba8: Send vCard with Unicode encoded Strings over BT
Merge commit '
f6856304763652829df07acf688b77714d4eb5c6'
* commit '
f6856304763652829df07acf688b77714d4eb5c6':
Send vCard with Unicode encoded Strings over BT
Jaikumar Ganesh [Mon, 30 Aug 2010 20:29:22 +0000 (13:29 -0700)]
am
44fbf5a3: am
8e658ce5: Merge "Send vCard with Unicode encoded Strings over BT" into gingerbread
Merge commit '
44fbf5a3537d1d701eedbd85e7115c36ef851c58'
* commit '
44fbf5a3537d1d701eedbd85e7115c36ef851c58':
Send vCard with Unicode encoded Strings over BT
Eric Fischer [Mon, 30 Aug 2010 20:29:19 +0000 (13:29 -0700)]
am
273db609: (-s ours) am
6bbc1370: Import revised translations. DO NOT MERGE
Merge commit '
273db609e2f6deb8449be3256e3d75e8ad2a15a5'
* commit '
273db609e2f6deb8449be3256e3d75e8ad2a15a5':
Import revised translations. DO NOT MERGE
Edward Savage-Jones [Mon, 30 Aug 2010 20:20:48 +0000 (13:20 -0700)]
am
b8c5dba8: Send vCard with Unicode encoded Strings over BT
Merge commit '
b8c5dba8b3e9a46873b8568d5cbead6d7390f96b' into gingerbread-plus-aosp
* commit '
b8c5dba8b3e9a46873b8568d5cbead6d7390f96b':
Send vCard with Unicode encoded Strings over BT
Jaikumar Ganesh [Mon, 30 Aug 2010 19:33:46 +0000 (12:33 -0700)]
am
8e658ce5: Merge "Send vCard with Unicode encoded Strings over BT" into gingerbread
Merge commit '
8e658ce507d2525616ca27aa7135032eee9a5e75' into gingerbread-plus-aosp
* commit '
8e658ce507d2525616ca27aa7135032eee9a5e75':
Send vCard with Unicode encoded Strings over BT
Eric Fischer [Mon, 30 Aug 2010 19:32:57 +0000 (12:32 -0700)]
am
6bbc1370: Import revised translations. DO NOT MERGE
Merge commit '
6bbc13705ca8a9798607a63f2f251e0f992885b7' into gingerbread-plus-aosp
* commit '
6bbc13705ca8a9798607a63f2f251e0f992885b7':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Mon, 30 Aug 2010 18:21:23 +0000 (11:21 -0700)]
Merge "Send vCard with Unicode encoded Strings over BT" into gingerbread
Edward Savage-Jones [Fri, 27 Aug 2010 10:05:58 +0000 (12:05 +0200)]
Send vCard with Unicode encoded Strings over BT
The standard Android code doesn't correctly handle creation of byte
packets when sending vCard data. The length of a String is used to
specify the number of bytes being sent, which works if all
characters are ASCII (1 byte per char), but if Unicode characters
exist within the string, then bytes vs String length differ which
causes a truncation of the vCard during Bluetooth send.
Change-Id: Ic39dd53a38f1f353523c625940b0317b00e86d4f
Eric Fischer [Sat, 28 Aug 2010 00:10:00 +0000 (17:10 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I6059c994c650c5e581a8e953616aaf3941b5afb1
Edward Savage-Jones [Fri, 27 Aug 2010 10:05:58 +0000 (12:05 +0200)]
Send vCard with Unicode encoded Strings over BT
The standard Android code doesn't correctly handle creation of byte
packets when sending vCard data. The length of a String is used to
specify the number of bytes being sent, which works if all
characters are ASCII (1 byte per char), but if Unicode characters
exist within the string, then bytes vs String length differ which
causes a truncation of the vCard during Bluetooth send.
Change-Id: Ic39dd53a38f1f353523c625940b0317b00e86d4f
Jaikumar Ganesh [Wed, 18 Aug 2010 20:43:15 +0000 (13:43 -0700)]
am
553ced65: (-s ours) am
4a27976f: Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread
Merge commit '
553ced659c99dbba81c1d5ab3ab1c176920d84b7'
* commit '
553ced659c99dbba81c1d5ab3ab1c176920d84b7':
Add tags around string formatting placeholders. DO NOT MERGE
Eric Fischer [Wed, 18 Aug 2010 20:43:13 +0000 (13:43 -0700)]
am
0193c6ac: (-s ours) am
98a1288a: Import revised translations. DO NOT MERGE
Merge commit '
0193c6ac625e7abc14ebd625c0d6992aff54c71f'
* commit '
0193c6ac625e7abc14ebd625c0d6992aff54c71f':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Wed, 18 Aug 2010 20:39:26 +0000 (13:39 -0700)]
am
4a27976f: Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread
Merge commit '
4a27976f0c876e4159bec9dbf3fed0eb49bf60ed' into gingerbread-plus-aosp
* commit '
4a27976f0c876e4159bec9dbf3fed0eb49bf60ed':
Add tags around string formatting placeholders. DO NOT MERGE
Eric Fischer [Wed, 18 Aug 2010 20:36:18 +0000 (13:36 -0700)]
am
98a1288a: Import revised translations. DO NOT MERGE
Merge commit '
98a1288abc737a8dc00d044c0f5ca306bc4b2880' into gingerbread-plus-aosp
* commit '
98a1288abc737a8dc00d044c0f5ca306bc4b2880':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Wed, 18 Aug 2010 18:25:58 +0000 (11:25 -0700)]
Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread