drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,613 Commits 1 Branch 0 Tags
Commit Graph

29613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
623baf8edb am 29f9ee97: Merge "Need to check ndef before writing ndef." into gingerbread 
* commit '29f9ee973eefea3c68382ed38e69db1f1a396f3f':
  Need to check ndef before writing ndef.
 2010-12-20 11:29:40 -08:00
Scott Main
cdd76cf587 am 0d1e38ef: cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference 
* commit '0d1e38ef99252cb14e6bcc4b3135021da025330f':
  cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
 2010-12-20 11:29:32 -08:00
Nick Pelly
29f9ee973e Merge "Need to check ndef before writing ndef." into gingerbread 2010-12-16 16:35:51 -08:00
Martijn Coenen
01d159aa2c Need to check ndef before writing ndef. 
Regression due to all the (re)connect changes.

Change-Id: I637618f63518965e893a5a59db61002271666fa4
 2010-12-16 16:34:56 -08:00
Eric Laurent
a1608902f9 am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread 
* commit '5a756fb0f1f3f8cd7612284c889dfc69875577a8':
  Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
 2010-12-16 16:05:16 -08:00
Scott Main
49cdfcf574 am 3165bbb1: cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move 
* commit '3165bbb15560ed9facdfb906da55a9b24eb5989a':
  cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
 2010-12-16 16:05:00 -08:00
Scott Main
c4172983fb am 4ea442b4: Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread 
* commit '4ea442b49c2f44c180346fe780a2b8c9766b587b':
  cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links
 2010-12-16 16:04:54 -08:00
Martijn Coenen
12e5c1a21e am c58c3f1a: Implement additional Mifare Ultralight convenience methods. 
* commit 'c58c3f1ae27c0c7f560bd381180397d7f6a2ebed':
  Implement additional Mifare Ultralight convenience methods.
 2010-12-16 16:04:47 -08:00
Martijn Coenen
bf76b52f05 am 0d27f999: Expose reconnect(), to allow applications to reset tag state. 
* commit '0d27f999f4b1ad51da11946800b40d2978fc6326':
  Expose reconnect(), to allow applications to reset tag state.
 2010-12-16 16:04:41 -08:00
Martijn Coenen
9dce44ffbb am 4049f9d0: Implement multi-tech connect, enfore tech exclusivity. 
* commit '4049f9d00a86f848d42d2429068496b31a6795ad':
  Implement multi-tech connect, enfore tech exclusivity.
 2010-12-16 16:04:28 -08:00
Scott Main
0d1e38ef99 cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c 
docs: misc fixes to the drawable reference

Change-Id: I8b867234250ca18d5b6ee78a22b6150e1ba3e588
 2010-12-16 15:48:36 -08:00
Eric Laurent
5a756fb0f1 Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread 2010-12-16 11:18:29 -08:00
Scott Main
3165bbb155 cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 
docs: misc fixes for the adb move

Change-Id: Ie7701d9c1656c6cb5ae6063562efeabd9eb737a3
 2010-12-16 10:34:54 -08:00
Eric Laurent
36d41b8103 Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO. 
The problem is that when an input stream is opened for record over bluetooth SCO, the kernel
mono audio device should be opened in RW mode to allow further use of this same device by an output stream
also routed to bluetooth SCO.
This does not happen because of a bug in AudioSystem::isBluetoothScoDevice() that does not return true
when the device is DEVICE_IN_BLUETOOTH_SCO_HEADSET (input device for blurtooth SCO).

Change-Id: Ic78bf324b4a68e65721d763dc7682ce7a8f14f75
 2010-12-15 19:09:42 -08:00
Scott Main
4ea442b49c Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread 2010-12-15 17:47:02 -08:00
Scott Main
58d1966767 cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 
docs: misc changes;
add path to adb tool in sdk;
fix broken link to ninepatch docs;
fix and add some other links

Change-Id: I27c7284ac2db2e6020c9cb0115fb932a2f503033
 2010-12-15 17:44:38 -08:00
Martijn Coenen
c58c3f1ae2 Implement additional Mifare Ultralight convenience methods. 
Change-Id: I8d9dfadb5911b2d11d1ba6dcf1381decbb8386ef
 2010-12-15 16:41:38 -06:00
Martijn Coenen
0d27f999f4 Expose reconnect(), to allow applications to reset tag state. 
Change-Id: Ib5432e7f6b6aaf6ec1cb06693592cb7c6440a6f8
 2010-12-15 16:41:38 -06:00
Martijn Coenen
4049f9d00a Implement multi-tech connect, enfore tech exclusivity. 
- The NfcService now allows for connecting to a specific technology;
- The "active" parts of technology classes may not be used at the same time.

Change-Id: Ibb569f51cc6da4f3e24df9d0850c6f49a022b0c2
 2010-12-15 16:41:38 -06:00
Scott Main
61aeb2b721 am b094b0c4: modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup 
* commit 'b094b0c4a4309f48d9da7253de78ebda20a8a81c':
  modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
 2010-12-15 14:11:08 -08:00
Scott Main
b094b0c4a4 modifications to webinars: 
add the ability to add an upcoming webinar event to Google Calendar;
add some introduction text;
adjust some markup

Change-Id: I4d18a183b1520e79a45e114dc49e725fe27a43c9
 2010-12-15 14:02:59 -08:00
Dianne Hackborn
b32ea25529 am 7daaa98c: Merge "Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread 
* commit '7daaa98c6531373a2a742c1360f0a2795de0619f':
  Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity
 2010-12-15 12:58:54 -08:00
Dianne Hackborn
7daaa98c65 Merge "Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread 2010-12-15 12:56:53 -08:00
Scott Main
9278d32168 am 52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642 
* commit '52078255dacabe9b779613b032a4dc3706b2b5d3':
  cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
 2010-12-15 11:56:04 -08:00
Scott Main
d88c90fb08 am 6390fa6b: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882 
* commit '6390fa6bdf50a3bf10cd6c54328397fe709f7c37':
  cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
 2010-12-15 11:56:00 -08:00
Scott Main
8591872a5c am 92b03085: cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8 
* commit '92b0308530d21195425c918cbe6057dd84f37992':
  cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
 2010-12-15 11:53:20 -08:00
Scott Main
52078255da cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd 
docs: fix bug 3216642

Change-Id: Ic42d97d4e67a09dc4e366862e2b72ff92f152b85
 2010-12-15 11:49:42 -08:00
Scott Main
6390fa6bdf cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee 
docs: fix bug 3273882

Change-Id: Ie53ba246c39bf448bfe199ae3754e50749ceb340
 2010-12-15 11:47:38 -08:00
Dianne Hackborn
99441c45e4 Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity 
{com.android.settings/com.android.settings.applications.StorageUse}

AbsListView could call mAdapter.getItemId() if a save state happened
after the data changed but before a layout occurred.

Change-Id: Ica020971dc458dff79b56dd810733e217f4f7da6
 2010-12-15 11:02:55 -08:00
Scott Main
92b0308530 cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e 
docs: update to adt 8.0.1;
delete ADT archive page, put a redirect in its place;
update tools release notes and sys reqs to require ant 1.8

Change-Id: Id039d81953452d8f7cefc0c4d61e7d9ead575541
 2010-12-14 17:55:27 -08:00
Scott Main
f6847bf386 am e09009d6: cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc 
* commit 'e09009d6a63cfab2a64d02ca49a462d46e62f750':
  cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc
 2010-12-14 17:45:24 -08:00
Scott Main
3354f4dc3d am 369c1c1f: cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes 
* commit '369c1c1fa22802b6504c5cde533d797841700a66':
  cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
 2010-12-14 17:42:28 -08:00
Scott Main
e09009d6a6 cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 
docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc

Change-Id: Ib6bdc6220543d71b803c78e1c762f84e5b9d55c3
 2010-12-14 17:40:30 -08:00
Scott Main
3c585db26c am 090a3dc3: cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a docs: remove uninstalling link from adt docs (section was previously removed) 
* commit '090a3dc33fbb0d450dd5823fd2756360e4acdd12':
  cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a docs: remove uninstalling link from adt docs (section was previously removed)
 2010-12-14 17:34:35 -08:00
Scott Main
369c1c1fa2 cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e 
docs: anchor link fixes

Change-Id: I41175d61bb4ee2b0e087515e609e5ebfb19b1ea1
 2010-12-14 17:34:00 -08:00
Scott Main
cb27bc7d29 am 0846a2f5: cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72 docs: update sitemap add new webmaster tools verification file 
* commit '0846a2f5ec77a8862d92430b6721da0960d0d001':
  cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72 docs: update sitemap add new webmaster tools verification file
 2010-12-14 17:30:04 -08:00
Scott Main
090a3dc33f cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a 
docs: remove uninstalling link from adt docs
(section was previously removed)

Change-Id: I16e384a12a5ed810cd60dde73c915801745c7cdb
 2010-12-14 17:28:02 -08:00
Scott Main
0846a2f5ec cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72 
docs: update sitemap
add new webmaster tools verification file

Change-Id: I9a261fbb0f863696e257f99a40a9f9a173995d50
 2010-12-14 17:25:06 -08:00
Scott Main
14e6325da9 am 1bcfd85c: cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd docs: fix syntax error; enlarge screenshot thumbnail 
* commit '1bcfd85cc0f274b250b68a122f964b276ef4be4a':
  cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd docs: fix syntax error; enlarge screenshot thumbnail
 2010-12-14 17:06:58 -08:00
Scott Main
1bcfd85cc0 cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd 
docs: fix syntax error; enlarge screenshot thumbnail

Change-Id: I0fe043969a9754237c6bce6999598033c510d8f3
 2010-12-14 17:03:53 -08:00
Scott Main
84bf9bc70f am e9123960: cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes 
* commit 'e9123960764d7b2e94fb0d68aae21fccc472abcd':
  cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes
 2010-12-14 16:48:38 -08:00
Scott Main
a925b6a64c am 93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882 
* commit '93d204ed98019322e434b714c7c0a619d69f24f5':
  cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882
 2010-12-14 16:43:28 -08:00
Scott Main
e912396076 cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 
docs: misc doc fixes

Change-Id: Ib5f8aaf8feb42c825bc0149ec3775999856f5f57
 2010-12-14 16:42:48 -08:00
Scott Main
627b78f49d am 071360d1: cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux. 
* commit '071360d1fe5cb75925e5a7ff1b799c5cab160a44':
  cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.
 2010-12-14 16:40:39 -08:00
Scott Main
93d204ed98 cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df 
docs: fix misc broken links; update some screenshots using windows
bug: 3258882

Change-Id: I3d4a2c66be4e563f4c45d72fec30c9a1b5d8fc23
 2010-12-14 16:39:22 -08:00
Scott Main
071360d1fe cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 
Doc change: Update min glibc version for linux.

Change-Id: I97a79004362e97732fa7d3be07c7396180f5fa99
 2010-12-14 16:35:36 -08:00
Scott Main
178d500551 am b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last 
* commit 'b94df620959de658990c1ed1263e2e1c42df7f6b':
  cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
 2010-12-14 16:22:56 -08:00
Scott Main
b94df62095 cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee 
docs: edit manifest samples to indicate <application> element is always last

Change-Id: I993d130c26efd87147913d5607a2e7f15bd12fe8
 2010-12-14 16:11:02 -08:00
Dianne Hackborn
042042b809 am 2bd83c00: Merge "Work on issue #3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread 
* commit '2bd83c00a0c72d3f6bd929c4df5fe83ee31b4704':
  Work on issue #3255640: Need to bump GB to API 10 version name "2.4"
 2010-12-14 14:15:16 -08:00
Dianne Hackborn
2bd83c00a0 Merge "Work on issue #3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread 2010-12-14 14:12:37 -08:00