GitLab

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

Change-Id: I118b7e54616b1144be81c8e9ea5de04efb388a97

Change-Id: Ic96221d5e692ef4089ef4db39bcfedc392e6d321

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

Bug: 2674275
Change-Id: Ib5f5d2ebe3ff6ab02e43df38097a89541e132b55

Change-Id: I70a15978fd77c45efd8a4e6478c98ee953c49a99

Bug: 2603200
Change-Id: Ie6a40c12fafac5927b616f31a8335df0181f9e18

Bug: 2542260
Change-Id: I00f9d8216d70543b93cfbcdb2cd8da8331044d77

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

Change-Id: Ia71a5b3bb970463132b2c25b90cf3897fc227fb9

Change-Id: Ia703afd0c3fd603a68f606b684bdf76cd2de32fe

Change-Id: I5fa328f2b8fd78986b9a1958e5899feca254f316

Add support to Browser link share via BT;
Add support to share files via BT in 3rd party file manager;

Change-Id: I9a93eb0891d0f670109afd44ab4064f7f15b01f3

When Opp service restart, we will trim the database.
a) No visible case is deleted.
b) Invisible complete outbound (failed and successful) are deleted.
c) Invisible complete failed inbound are deleted.
d) Invisible complete success inbound are deleted if needed to keep records max
to 1000.

Live folder only has received files, so the above makes sense.

Change-Id: If27080721d9abed025162ff805f661fde01564d3

This is to fix below issue: when an ongoing transfer is almost to complete,
click the ongoing notification to launch TransferActivity, there will be
possible crash due to NullPointerException.
Root casue is: when TransferActivity onCreate() is called, the transfer is
still ongoing, so mIsComplete is false; but when onCreate() call to
updateProgressbar(), the transfer may change to complete, and then  updateButton()
will be called; In updateButton(),  mAlert (which will be initialized in father
class AlertActivity) still not intialized, which caused NullPointerException.

Change-Id: Ibfe363f3822386a38b9b108e29f60ad6673f70f6

Change-Id: I3cdd8eee24082d0b0bf63d1bb80102cf8093b265

Merge "Add opp Transfer history to avoid cluster of notificatoins To reduce the cluster of Opp nofications, we introduce the concept of Opp transfer history. Only 2 notifications exist for finished opp transfers, one is for outbound transfers, and another is for inbound transfers. User can see all detailed items in corresponding screen when click the notification."

Add opp Transfer history to avoid cluster of notificatoins To reduce the cluster of Opp nofications, we introduce the concept of Opp transfer history. Only 2 notifications exist for finished opp transfers, one is for outbound transfers, and another is for inbound transfers. User can see all detailed items in corresponding screen when click the notification.

Change-Id: Iffed353ea6b0d7c958c71fe8d3996937058ced30

Bug: 2485875

Bug: 2456698

Change-Id: I96a9ed96420c20f9291e004a2d9e02300d53ff26

Merge commit '0341ac9a'

* commit '0341ac9a':
  android-2.1_r1 snapshot

Merge commit '8916d261' into eclair-plus-aosp

* commit '8916d261':
  android-2.1_r1 snapshot

Merge commit 'ac1140f7'

* commit 'ac1140f7':
  empty initial commit