summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEEric Fischer2012-05-2948-97/+145
| | | | Change-Id: I45b218ab020a6452a2954db326d014a303beb704
* am ff4263e1: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
|\ | | | | | | * commit 'ff4263e19522bc8db124405541da59434b652054':
| *-. Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Idcd615270e5572f17209cc2f91396c38144a0915
| | | * merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | | |\
| | * | \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-290-0/+0
| | |\ \ \ | | | |/ /
* | | | | am 62a89973: am d0387061: Merge "Use new handover intent actions." into jb-devMartijn Coenen2012-05-252-18/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '62a8997361a059183f2547365a6055db3d45e9c9': Use new handover intent actions.
| * | | | am d0387061: Merge "Use new handover intent actions." into jb-devMartijn Coenen2012-05-252-18/+26
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd03870614245ed7807afe449fd20f5e9b2f36609': Use new handover intent actions.
| | * | | Merge "Use new handover intent actions." into jb-devMartijn Coenen2012-05-252-18/+26
| | |\ \ \
| | | * | | Use new handover intent actions.Martijn Coenen2012-05-252-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new handover intent actions that allow us to select any mime-type. Also, add unique filename counter before extension instead of after it. Bug: 6561169 Change-Id: I04b83460099b42ba6220d7eb4dcff7a095022304
* | | | | | am abf67e1b: am 423cc45a: Merge "Fall back to NDEF push if handover SNEP get ↵Martijn Coenen2012-05-254-5/+79
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fails." into jb-dev * commit 'abf67e1baa0a4b313d9338e69261db47c33725be': Fall back to NDEF push if handover SNEP get fails.
| * | | | | am 423cc45a: Merge "Fall back to NDEF push if handover SNEP get fails." into ↵Martijn Coenen2012-05-254-5/+79
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit '423cc45adf0a67c321eb03bb2e3a0b5f9b324e54': Fall back to NDEF push if handover SNEP get fails.
| | * | | | Merge "Fall back to NDEF push if handover SNEP get fails." into jb-devMartijn Coenen2012-05-254-5/+79
| | |\ \ \ \ | | | |/ / /
| | | * | | Fall back to NDEF push if handover SNEP get fails.Martijn Coenen2012-05-254-5/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows applications to be able to set both a Uri (for handover) and an NDEF message, which will only be sent if the handover request does not work (as will be the case on pre-J devices). Also, show a toast if the remote device does not support connection handover. Bug: 6561174 Change-Id: I9ffdcfdf0cded319fbb4ab646ae1da5382fcb74a
* | | | | | am f1566deb: (-s ours) am b2753981: Import translations. DO NOT MERGEEric Fischer2012-05-250-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'f1566deb91461f68f98ebd8dd3c13c44c202904a': Import translations. DO NOT MERGE
| * | | | | am b2753981: Import translations. DO NOT MERGEEric Fischer2012-05-2548-629/+713
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'b2753981c23a095ee416a7540bb19bee2a6d1ce0': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-05-2548-629/+713
| | |/ / / | | | | | | | | | | | | | | | Change-Id: Id4aa85e6401a2bd21b8b45d78fdd1017b4d1b843
* | | | | Import translations. DO NOT MERGEEric Fischer2012-05-2548-629/+713
| | | | | | | | | | | | | | | | | | | | Change-Id: I13f22b25fc0348613aae6f5cc7b11ca635869ec2
* | | | | am 085bde96: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit '085bde9613a918be8b16bd90b0b0071545cfcdf8':
| | | | |
| | \ \ \
| *-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| Change-Id: If036594cba8f270d4a71cd2a126b57a398c71d22
| | | * | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | | |\ \
| | * | \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-230-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
* | | | | am 7d44aa52: am befa3d6d: Show time in NFC handover notifications.Martijn Coenen2012-05-221-4/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7d44aa52f36e8b0a08fcbb7fdf3af207cd54a97b': Show time in NFC handover notifications.
| * | | | am befa3d6d: Show time in NFC handover notifications.Martijn Coenen2012-05-221-4/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'befa3d6d8bca86f28968069128d6f454b39ed9a8': Show time in NFC handover notifications.
| | * | | Show time in NFC handover notifications.Martijn Coenen2012-05-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notification sorting is coupled to the time associated with the notifications, and there's no way to hide the time in the notification without setting the time to zero. Since we prefer a proper sorting over hiding the time, just show the time again. Change-Id: I3188a80f8d7b7fcac54ffa790df58faa53241557
* | | | | am 3309445e: am 973ff9be: Fix some strings.Martijn Coenen2012-05-221-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3309445e707ed23ffd8f31b7cfe27a9fc6fb98c4': Fix some strings.
| * | | | am 973ff9be: Fix some strings.Martijn Coenen2012-05-221-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '973ff9be9a4de6b493c6ec09900b3015188b9b38': Fix some strings.
| | * | | Fix some strings.Martijn Coenen2012-05-221-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I94103a7318cc72dc4c48aa59e942e3a4ae92a743
* | | | | am 5dccb9a4: Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit '5dccb9a416bf5171805140b9b09e589a5367408f':
| * | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I56d5e7da1f2c56109295f9fb6d836b4abd148ee4
| | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am 67038a30: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-210-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '67038a303747888714067d18745573b61206eb1d': Eliminate obsolete flag.
| | | | |
| | \ \ \
| *-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-180-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| Change-Id: Id94f334e6a92cf48ac774f1f4233df95d9241274
| | | * | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-180-0/+0
| | | |\ \ | | |/ / /
| | * | | Eliminate obsolete flag.Craig Mautner2012-05-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FLAG_KEEP_SURFACE_WHILE_ANIMATING has been removed. Change-Id: Ia9623fb1fd5a124145bbb827acfb77767b05f636
| | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-170-0/+0
| | |\ \ \
* | | \ \ \ am beb7b1b4: am 0de27370: Bluetooth Beam: generate unique filenames.Martijn Coenen2012-05-211-2/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'beb7b1b4b95b1762b507eb2a9c6380e24c8b7a62': Bluetooth Beam: generate unique filenames.
| * | | | | am 0de27370: Bluetooth Beam: generate unique filenames.Martijn Coenen2012-05-181-2/+15
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '0de2737031fd18aeeadcbc8f46cd0ebcb18ee730': Bluetooth Beam: generate unique filenames.
| | * | | | Bluetooth Beam: generate unique filenames.Martijn Coenen2012-05-181-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When moving files to beam/, make sure the destination file is unique. Also, give the transfer a little more time to be initiated; OPP can take quite some time to startup, especially with debug logging. Change-Id: I304c297587e3ad2f339438201bb0b53152084af4
* | | | | | am 91ebf1e2: am 0f2b555f: Don\'t use NPP for connection handover.Martijn Coenen2012-05-211-1/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '91ebf1e2e815034504265f1f7472780bcbd30123': Don't use NPP for connection handover.
| * | | | | am 0f2b555f: Don\'t use NPP for connection handover.Martijn Coenen2012-05-181-1/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '0f2b555fe51f3d8a828cf61d269b8be6eecbf68b': Don't use NPP for connection handover.
| | * | | | Don't use NPP for connection handover.Martijn Coenen2012-05-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handover will only work with SNEP; if SNEP fails, don't try with NPP. Change-Id: Ib92c90cb588b99e177fa1c70b89753ef8d0e16ea
* | | | | | am e769540a: am 1179ee22: Merge "Close NFCEE when NFC is being shut down." ↵Martijn Coenen2012-05-211-1/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'e769540a26900bb809c210c976eaca3ac6cf2605': Close NFCEE when NFC is being shut down.
| * | | | | am 1179ee22: Merge "Close NFCEE when NFC is being shut down." into jb-devMartijn Coenen2012-05-171-1/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '1179ee22543abdd350f0a60b887e2fb7cf95d6a6': Close NFCEE when NFC is being shut down.
| | * | | | Merge "Close NFCEE when NFC is being shut down." into jb-devMartijn Coenen2012-05-171-1/+9
| | |\ \ \ \
| | | * | | | Close NFCEE when NFC is being shut down.Martijn Coenen2012-05-171-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6501921 Change-Id: Ib76fd3a436632ddad0da7c73f7972018990f37c0
* | | | | | | am 0b610930: am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam ↵Martijn Coenen2012-05-215-30/+111
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transfers." into jb-dev * commit '0b61093016daae3df331e1a6780757254c06859a': Allow cancelling of Bluetooth Beam transfers.
| * | | | | | am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam transfers." into jb-devMartijn Coenen2012-05-175-30/+111
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2aa9b461d148f49ab9c63858f1c8f87c0b40b824': Allow cancelling of Bluetooth Beam transfers.
| | * | | | | Merge "Allow cancelling of Bluetooth Beam transfers." into jb-devMartijn Coenen2012-05-175-30/+111
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Allow cancelling of Bluetooth Beam transfers.Martijn Coenen2012-05-165-30/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an action to the notification entry that allows cancelling Beam transfers. Also, each transfer now has a generic timer that marks the transfer as failed, in case no updates happen on the transfer at all for 10 seconds. Change-Id: I9670e4e782e5c1b846a07f7e490a2f317a45fb70
* | | | | | | am c9f617a9: am b0f96e9d: Merge "Eliminate obsolete flag." into jb-devCraig Mautner2012-05-211-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c9f617a9c99f579e753a09387629f3ddac8e9ca7': Eliminate obsolete flag.
generated by cgit v1.1 at 2024-12-24 20:30:52 +0000