OSDN Git Service
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
Eric Fischer [Tue, 20 Apr 2010 01:23:11 +0000 (18:23 -0700)]
Add tags around string formatting placeholders. DO NOT MERGE
Make the wording of one error message more idiomatic.
Change-Id: I1a427c8a211bca9b8c5261ceda37edf64ceb556c
Eric Fischer [Tue, 17 Aug 2010 23:50:55 +0000 (16:50 -0700)]
Import revised translations.
Change-Id: I6fd3420efd04353a89f6559a0fbefd95832ed753
Eric Fischer [Tue, 17 Aug 2010 23:44:19 +0000 (16:44 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic1f84b8846c17593036d8ac09baaeb96a4244c44
Jaikumar Ganesh [Wed, 11 Aug 2010 19:39:20 +0000 (12:39 -0700)]
am
d5b94fe6: am
ff2927dc: Merge "Optimize Opp Notification" into gingerbread
Merge commit '
d5b94fe6cd8144b9c6f0d6de35080f8ca49c601d'
* commit '
d5b94fe6cd8144b9c6f0d6de35080f8ca49c601d':
Optimize Opp Notification
Jaikumar Ganesh [Wed, 11 Aug 2010 19:07:33 +0000 (12:07 -0700)]
am
ff2927dc: Merge "Optimize Opp Notification" into gingerbread
Merge commit '
ff2927dcdff66114e56b0636d6b29ac71f62508b' into gingerbread-plus-aosp
* commit '
ff2927dcdff66114e56b0636d6b29ac71f62508b':
Optimize Opp Notification
Jaikumar Ganesh [Wed, 11 Aug 2010 18:37:39 +0000 (11:37 -0700)]
Merge "Optimize Opp Notification" into gingerbread
Liejun Tao [Mon, 2 Aug 2010 22:37:23 +0000 (17:37 -0500)]
Optimize Opp Notification
Current Opp notification is running too frequently. When file transfer
speed is fast, it could update notification 7-8 times in 1 second.
Use a timer to limit the notification to once per second.
Change-Id: I162033d9e12148260515c8ed318928e4de9a4392
Eric Fischer [Tue, 10 Aug 2010 19:19:02 +0000 (12:19 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 10 Aug 2010 19:11:06 +0000 (12:11 -0700)]
Import revised translations.
Change-Id: I52656d001c3c3454a0a5c54d3bdb29158bad0e98
Eric Fischer [Tue, 10 Aug 2010 19:01:45 +0000 (12:01 -0700)]
am
83f2754c: (-s ours) am
8759d55e: Import revised translations. DO NOT MERGE
Merge commit '
83f2754c1812457520880e7fe8f9c02e82bde2e5'
* commit '
83f2754c1812457520880e7fe8f9c02e82bde2e5':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 Aug 2010 18:57:57 +0000 (11:57 -0700)]
am
8759d55e: Import revised translations. DO NOT MERGE
Merge commit '
8759d55ec0668dec9ca2439085fe314fb0f21d27' into gingerbread-plus-aosp
* commit '
8759d55ec0668dec9ca2439085fe314fb0f21d27':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 Aug 2010 18:50:57 +0000 (11:50 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I2df2905587fcb58d7e40677282f0fa3eb27622e4
Eric Fischer [Thu, 5 Aug 2010 23:04:00 +0000 (16:04 -0700)]
Import revised translations.
Change-Id: I60421ab0e93faf83fcf6e3f6e859ae33e1e452fe
Eric Fischer [Thu, 5 Aug 2010 18:44:06 +0000 (11:44 -0700)]
am
8f8956aa: (-s ours) am
6c75d2f1: Import revised translations. DO NOT MERGE
Merge commit '
8f8956aa724929ad1781f0e922a0b02b17ad4542'
* commit '
8f8956aa724929ad1781f0e922a0b02b17ad4542':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 4 Aug 2010 17:54:03 +0000 (10:54 -0700)]
am
6c75d2f1: Import revised translations. DO NOT MERGE
Merge commit '
6c75d2f16e09a66927aad03423ce191f860369d3' into gingerbread-plus-aosp
* commit '
6c75d2f16e09a66927aad03423ce191f860369d3':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 4 Aug 2010 17:40:59 +0000 (10:40 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I751dea57ff96b08328284c6489acffafab0ebd51
The Android Open Source Project [Fri, 16 Jul 2010 20:12:10 +0000 (13:12 -0700)]
am
587ef795: merge from open-source master
Merge commit '
587ef79589b5b453e71f8472baea583390579e20'
* commit '
587ef79589b5b453e71f8472baea583390579e20':
PullvCardList implemented according to specification
The Android Open Source Project [Fri, 16 Jul 2010 20:08:06 +0000 (13:08 -0700)]
merge from open-source master
Change-Id: Id325ee50130e50b8080fd3a1e51a4fda8371e4c8
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
Kenny Root [Mon, 21 Jun 2010 18:37:18 +0000 (11:37 -0700)]
Kenny Root [Mon, 21 Jun 2010 18:17:12 +0000 (11:17 -0700)]
am
252a2736: Import revised translations
Merge commit '
252a273678109302c6c4a3e35306f5fe9ce52738' into gingerbread
* commit '
252a273678109302c6c4a3e35306f5fe9ce52738':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 18:04:14 +0000 (11:04 -0700)]
Import revised translations
Change-Id: Ia0887bd64eafcb3a3ef329b84805a2859cde44eb
Kenny Root [Mon, 21 Jun 2010 17:16:36 +0000 (10:16 -0700)]
Kenny Root [Mon, 21 Jun 2010 15:58:49 +0000 (08:58 -0700)]
am
25c3b801: Import revised translations
Merge commit '
25c3b801069d8c44854093b3cd1a93ecb9654020' into gingerbread
* commit '
25c3b801069d8c44854093b3cd1a93ecb9654020':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 01:56:36 +0000 (18:56 -0700)]
Import revised translations
Change-Id: I5351f0f604a561458f284c0e9444d5aec7767733
Kenny Root [Thu, 10 Jun 2010 05:35:50 +0000 (22:35 -0700)]
am
560c86fc: am
2b72fec0: Import revised translations
Kenny Root [Thu, 10 Jun 2010 05:31:36 +0000 (22:31 -0700)]
am
2b72fec0: Import revised translations
Merge commit '
2b72fec02d9094b1fc43694046f44ce511328f86' into kraken
* commit '
2b72fec02d9094b1fc43694046f44ce511328f86':
Import revised translations
Kenny Root [Thu, 10 Jun 2010 05:26:43 +0000 (22:26 -0700)]
Import revised translations
Change-Id: I118b7e54616b1144be81c8e9ea5de04efb388a97
Jaikumar Ganesh [Tue, 8 Jun 2010 17:14:45 +0000 (10:14 -0700)]
am
69b2c318: Merge "Set number as "Unknown" for private numbers." into kraken
Jaikumar Ganesh [Tue, 8 Jun 2010 00:00:34 +0000 (17:00 -0700)]
Merge "Set number as "Unknown" for private numbers." into kraken
Jaikumar Ganesh [Mon, 7 Jun 2010 17:08:11 +0000 (10:08 -0700)]
Set number as "Unknown" for private numbers.
Change-Id: I54bb9595913c90e72eef659627d95bb63398e84a
Joe Onorato [Thu, 3 Jun 2010 20:56:48 +0000 (13:56 -0700)]
am
feb2ae08: This icon shouldn\'t be animated, and that private class is gone.
Joe Onorato [Thu, 3 Jun 2010 20:52:33 +0000 (13:52 -0700)]
This icon shouldn't be animated, and that private class is gone.
Change-Id: I1652c4685c31b55e6519a9180490d86634732d87
Kenny Root [Tue, 1 Jun 2010 23:08:22 +0000 (16:08 -0700)]
am
669a11be: Fix-up es-419 translation
Kenny Root [Fri, 28 May 2010 21:28:56 +0000 (14:28 -0700)]
Fix-up es-419 translation
Change-Id: If56b21a216ffa585fa3c1c6134a7fefcd62caa0e
David Yue [Fri, 28 May 2010 06:05:17 +0000 (23:05 -0700)]
am
0c21a35d: correct PBAP call log parameters
David Yue [Thu, 27 May 2010 07:11:15 +0000 (15:11 +0800)]
correct PBAP call log parameters
Daisuke Miyakawa [Mon, 17 May 2010 15:24:44 +0000 (08:24 -0700)]
Use a static version of vCard library.
See also I435e1057.
Bug:
2689523
Change-Id: I6aaa893d13ad2ff66f1439731ef7dbcf079b5011
Kenny Root [Mon, 17 May 2010 22:03:41 +0000 (15:03 -0700)]
am
11100d8f: am
4900671a: Import revised translations
Kenny Root [Mon, 17 May 2010 21:02:34 +0000 (14:02 -0700)]
am
4900671a: Import revised translations
Merge commit '
4900671aa3d9329c8065c7da4e5ae544ed85b9e2' into kraken
* commit '
4900671aa3d9329c8065c7da4e5ae544ed85b9e2':
Import revised translations
Kenny Root [Mon, 17 May 2010 18:23:51 +0000 (11:23 -0700)]
Import revised translations
Change-Id: Ic96221d5e692ef4089ef4db39bcfedc392e6d321
Jaikumar Ganesh [Mon, 17 May 2010 16:20:44 +0000 (09:20 -0700)]
am
3246a9f0: am
6a148f10: Run Bluetooth Opp activities in the phone process.
android-build SharedAccount [Mon, 17 May 2010 16:16:05 +0000 (09:16 -0700)]
Merge commit '
ff55fbfa8cf30fe8a72e1a68420cd744ce957' with -s ours.
Original merge was done manually.
Change-Id: I4d5a02b052e356b26d04204dc7e96730d0990720
Jaikumar Ganesh [Sat, 15 May 2010 00:50:30 +0000 (17:50 -0700)]
am
6a148f10: Run Bluetooth Opp activities in the phone process.
Merge commit '
6a148f10d0e26eef9f94e08ac3f1897ce8983bfa' into kraken
* commit '
6a148f10d0e26eef9f94e08ac3f1897ce8983bfa':
Run Bluetooth Opp activities in the phone process.
Jaikumar Ganesh [Fri, 14 May 2010 22:00:28 +0000 (15:00 -0700)]
Run Bluetooth Opp activities in the phone process.
There were just too much shared code between the classes - we
cannot have them in 2 different process - it can work sometimes and
will fail sometimes depending on the ordering of processes.
Rework involves a lot of code change at this point of time.
Bug:
2684281
Change-Id: I76784650c5f635c1e961392b682c1d33fc2f343f
Jaikumar Ganesh [Thu, 13 May 2010 21:20:18 +0000 (14:20 -0700)]
Use FLAG_REFRAIN_PHONE_NUMBER_FORMATTING to prevent discard
of "+", "p", "w" etc in phone numbers.
Change-Id: I20aa8d697925ac68dbfd9dc997dcf66fc0d7f5d8
Daisuke Miyakawa [Thu, 15 Apr 2010 02:04:42 +0000 (11:04 +0900)]
Use FLAG_REFRAIN_PHONE_NUMBER_FORMATTING to prevent discard
of "+", "p", "w" etc in phone numbers.
Change-Id: Ic69d60e5831e59a497c523aa62c753922edf06f6
David Yue [Wed, 12 May 2010 14:57:21 +0000 (07:57 -0700)]
am
00cd32b6: am
b7533e86: Add missing moveToNext() calling.
David Yue [Wed, 12 May 2010 14:53:08 +0000 (07:53 -0700)]
am
b7533e86: Add missing moveToNext() calling.
Merge commit '
b7533e86bb84a2f95c2cff62c1565a8e1696d1ea' into kraken
* commit '
b7533e86bb84a2f95c2cff62c1565a8e1696d1ea':
Add missing moveToNext() calling.
David Yue [Tue, 11 May 2010 03:08:05 +0000 (11:08 +0800)]
Add missing moveToNext() calling.
Bug:
2674275
Change-Id: Ib5f5d2ebe3ff6ab02e43df38097a89541e132b55
Lixin Yue [Wed, 5 May 2010 20:28:40 +0000 (13:28 -0700)]
am
1d222264: Fix the %1 bug in UI when sdcard full
Lixin Yue [Fri, 16 Apr 2010 02:42:27 +0000 (10:42 +0800)]
Fix the %1 bug in UI when sdcard full
Kenny Root [Wed, 28 Apr 2010 01:56:54 +0000 (18:56 -0700)]
am
5dca0a3c: Import revised translations
Kenny Root [Tue, 27 Apr 2010 19:19:00 +0000 (12:19 -0700)]
Import revised translations
Change-Id: I70a15978fd77c45efd8a4e6478c98ee953c49a99
Eric Fischer [Fri, 23 Apr 2010 20:08:11 +0000 (13:08 -0700)]
Merge "Add tags around string formatting placeholders."
Eric Fischer [Tue, 20 Apr 2010 01:23:11 +0000 (18:23 -0700)]
Add tags around string formatting placeholders.
Make the wording of one error message more idiomatic.
Change-Id: Ibb59089ee894dbc65cc1ec8e62c0dc33118c51f4
Daisuke Miyakawa [Tue, 20 Apr 2010 04:16:05 +0000 (13:16 +0900)]
Remove wrong merge.
Change-Id: I94ff5633226d37fcc2df39fdcb7ad313a523d435
Daisuke Miyakawa [Tue, 20 Apr 2010 02:10:29 +0000 (19:10 -0700)]
am
96ae98f9: Make BluetoothPbapCallLogComposer use FLAG_REFRAIN_IMAGE_EXPORT.
Daisuke Miyakawa [Tue, 20 Apr 2010 01:27:31 +0000 (10:27 +0900)]
Make BluetoothPbapCallLogComposer use FLAG_REFRAIN_IMAGE_EXPORT.
Bug:
2603200
Change-Id: Ie6a40c12fafac5927b616f31a8335df0181f9e18
Daisuke Miyakawa [Fri, 16 Apr 2010 02:34:19 +0000 (11:34 +0900)]
Make BT new structure.
Change-Id: If1400731a1ba9a91d493ca96f2cc0364ef9b5b18
Lixin Yue [Fri, 26 Mar 2010 01:27:20 +0000 (09:27 +0800)]
Clear notifications when the user presses clear from the notifications bar.
Bug:
2542260
Change-Id: I00f9d8216d70543b93cfbcdb2cd8da8331044d77
Jaikumar Ganesh [Wed, 24 Mar 2010 17:36:06 +0000 (10:36 -0700)]
Fix pbap and opp running bluetooth in phone process problems.
1. Use the right context instead of application context.
2. Make PbapActivity run in the same process as PbapService as they
share state.
Change-Id: Ib50c63c271dd8b30108f22734c47ee8645cd4839
Jaikumar Ganesh [Thu, 18 Mar 2010 22:40:19 +0000 (15:40 -0700)]
Fix Typo.
Change-Id: Ia71a5b3bb970463132b2c25b90cf3897fc227fb9
OSDN Git Service
