LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,496 Commits 2 Branches 0 Tags
ae43104493bfe8271e5b1efc809ae06f8ecea893
Commit Graph

5496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
23c0080a10 Import revised translations. 
Change-Id: I4c228fcb677bf6b5a571c51bd3b030dcba4fadf0
 2011-01-26 16:47:33 -08:00
Jeff Hamilton
28745b4ee5 am 509fbb4d: Sample code for foreground NDEF Push APIs. 
* commit '509fbb4df3bdbc8c78614f5297459f7afe2b1ba6':
  Sample code for foreground NDEF Push APIs.
 2011-01-26 15:47:51 -08:00
Jeff Hamilton
509fbb4df3 Sample code for foreground NDEF Push APIs. 2011-01-26 17:41:35 -06:00
Jean-Baptiste Queru
85dd17355c Merge b7ea5aca to honeycomb-plus-aosp 
Change-Id: I21074a6291cd8987f7e247c181fd02f8ad0f50d0
 2011-01-26 10:08:09 -08:00
Jeff Hamilton
a9bb7f1472 resolved conflicts for merge of ac96a560 to honeycomb-merge 
Change-Id: Ibc0b1fa69597672293f6b753f18f8a14ee732d0b
 2011-01-26 11:12:41 -06:00
Jean-Baptiste Queru
b7ea5aca58 am 475bb357: Merge "Current files for source.android.com" 
* commit '475bb357dbab0d1a93e489a8213843ab984ae95f':
  Current files for source.android.com
 2011-01-26 09:01:56 -08:00
Jean-Baptiste Queru
475bb357db Merge "Current files for source.android.com" 2011-01-26 08:23:47 -08:00
Raphael
24dee78082 am f823ebad: (-s ours) Switch GB SDK to 2.4 / API 10. Do not merge. 
* commit 'f823ebad02e2d699490dc7e975054146c67251cc':
  Switch GB SDK to 2.4 / API 10. Do not merge.
 2011-01-25 15:52:23 -08:00
Xavier Ducrohet
0ad1c69d30 am daf0b895: (-s ours) Cherry-pick f0e5e933 from master. 
* commit 'daf0b895e8e0c952cc8563972d74a5e06fba7d0b':
  Cherry-pick f0e5e933 from master.
 2011-01-25 15:39:11 -08:00
Dianne Hackborn
3de63b416d am 3be09cb1: Merge "Use multiple async tasks." into honeycomb 
* commit '3be09cb183af4e0a637a12cfb421fd90fe40d308':
  Use multiple async tasks.
 2011-01-25 15:25:43 -08:00
Dianne Hackborn
3be09cb183 Merge "Use multiple async tasks." into honeycomb 2011-01-25 15:23:59 -08:00
Andy Stadler
3555b81258 am dae2faa3: Fix eclipse classpath 
* commit 'dae2faa37be3f0f877ed946513f97ac80fa6cf3e':
  Fix eclipse classpath
 2011-01-25 15:23:37 -08:00
Raphael
27fc0176e4 am 89ee8c72: (-s ours) Merge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread 
* commit '89ee8c72f35907a3546fb067eef2bdc8e134d53b':
  SDK for 2.3.1 -- DO NOT MERGE
 2011-01-25 15:21:18 -08:00
Andy Stadler
dae2faa37b Fix eclipse classpath 
* Remove AccountsAndSyncSettings
* Add bouncycastle_intermediates/classes-jarjar.jar

Change-Id: I7bab0a0abd4513a01fe8b633c71876b3e23e86ed
 2011-01-25 15:20:45 -08:00
Jean-Baptiste Queru
a6db53f077 Current files for source.android.com 
This matches the current state of the live site.

Change-Id: If209bc337d31cf8669e2afb78c9b52e5bbe3cdac
 2011-01-25 15:16:28 -08:00
Jeff Hamilton
06bef9df0b am 7a11acd9: am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent. 
* commit '7a11acd92bec5e7a089bdb248a78589491962c76':
  Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
 2011-01-25 14:44:37 -08:00
Jeff Hamilton
7a11acd92b am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent. 
* commit 'e0fbd3ffe82e6e80c6b070c3afbdb8e7fdd9bb25':
  Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
 2011-01-25 14:39:53 -08:00
Jeff Hamilton
e0fbd3ffe8 Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent. 
Change-Id: Ic537d209b07e81e80aeca5aa3e4a63657ac6fb76
 2011-01-25 16:33:33 -06:00
Eric Fischer
56326d5f38 am 01f08464: (-s ours) Import translations for additional languages. 
* commit '01f0846415ed75a8e30a26bf5e064c46025df2eb':
  Import translations for additional languages.
 2011-01-25 12:52:19 -08:00
David Turner
c2ddf901c2 am 1b20f62a: am dfb9123d: Merge "Use __asm__ instead of asm in public libc headers" 
* commit '1b20f62a9aa8906d8a2afd5e6720a9cccb138c2e':
  Use __asm__ instead of asm in public libc headers
 2011-01-25 10:58:48 -08:00
Jean-Baptiste Queru
ad72b96188 merge 6d0d0d64 from gingerbread-plus-aosp 
Change-Id: I6b9bb3380fc74414542a8875b8afa09b391d29c2
 2011-01-25 10:50:13 -08:00
David Turner
1b20f62a9a am dfb9123d: Merge "Use __asm__ instead of asm in public libc headers" 
* commit 'dfb9123d750437d050fcbbd7d64e18bf44011234':
  Use __asm__ instead of asm in public libc headers
 2011-01-25 09:28:59 -08:00
David Turner
dfb9123d75 Merge "Use __asm__ instead of asm in public libc headers" 2011-01-25 08:49:13 -08:00
The Android Automerger
902bc7bcea resolved conflicts for merge of 42f87e1b to honeycomb-plus-aosp 
Change-Id: Ic0ea8910670567e1725e42de76e6da0cd09decac
 2011-01-24 23:45:43 -08:00
Dianne Hackborn
649790adc5 Use multiple async tasks. 
Change-Id: If6be431a4f9443eaaf4478bae57c29f77f558b91
 2011-01-24 21:26:57 -08:00
Xavier Ducrohet
8ae584edb2 am d7d15831: Merge "Update the SDK platform components to API 11." into honeycomb 
* commit 'd7d15831d79aae53e2b7d9d402a2503e9f68dc98':
  Update the SDK platform components to API 11.
 2011-01-24 17:29:14 -08:00
Xavier Ducrohet
d7d15831d7 Merge "Update the SDK platform components to API 11." into honeycomb 2011-01-24 17:26:12 -08:00
Xavier Ducrohet
c177f55e12 Update the SDK platform components to API 11. 
Change-Id: I17f202c986ca0a27e89f02430bb2400eaa85c534
 2011-01-24 17:25:36 -08:00
Jeff Brown
4b7c467764 am 24e38f1b: Merge "Add WindowOrientationListener log enable/disable checkbox." into honeycomb 
* commit '24e38f1bef4d8600c64029ce20f9ee7d9d6201a5':
  Add WindowOrientationListener log enable/disable checkbox.
 2011-01-24 15:33:40 -08:00
Jeff Brown
24e38f1bef Merge "Add WindowOrientationListener log enable/disable checkbox." into honeycomb 2011-01-24 15:31:31 -08:00
Jean-Baptiste Queru
6d0d0d644a am a8d817c9: Merge "source.android.com documentation cleanup" 
* commit 'a8d817c9fc93692fac01f6df253a3712e0cf4e34':
  source.android.com documentation cleanup
 2011-01-24 15:27:50 -08:00
Jean-Baptiste Queru
a8d817c9fc Merge "source.android.com documentation cleanup" 2011-01-24 15:13:08 -08:00
Nick Pelly
e99861912c am 1717afbc: am 072bca5b: Add Tag app to eclipse classpath 
* commit '1717afbca4361cc190d3a3098c4ffce6ddb443f0':
  Add Tag app to eclipse classpath
 2011-01-24 13:23:48 -08:00
Yu Shan Emily Lau
ed08c1266c am d391ae20: Fixed the appCrashBugreport reset flag. Bug# 3383876 
* commit 'd391ae20984ff1323b8d59c8dcfdda18154b957d':
  Fixed the appCrashBugreport reset flag. Bug# 3383876
 2011-01-24 12:28:40 -08:00
Yu Shan Emily Lau
d391ae2098 Fixed the appCrashBugreport reset flag. Bug# 3383876 
Change-Id: I51d06ad30ed43789943cc99744898028e11b8466
 2011-01-24 11:57:32 -08:00
Jeff Brown
48bab43f1b am f40ea5cf: (-s ours) am 98ab3219: Prevent monkey from turning off the screen. (DO NOT MERGE) 
* commit 'f40ea5cfd9523f1303d1711dbf7df3ccb5697a0a':
  Prevent monkey from turning off the screen. (DO NOT MERGE)
 2011-01-24 00:02:08 -08:00
Jeff Brown
2559c31618 Add WindowOrientationListener log enable/disable checkbox. 
Change-Id: I1107eb39a72b42ddc97e611c3fc33c3997ed49cd
 2011-01-23 14:57:12 -08:00
Dianne Hackborn
8929f13429 am 7c69dba7: Remove use of old theme name. 
* commit '7c69dba7cc03073820d567dcb2fa6af031326e7a':
  Remove use of old theme name.
 2011-01-23 14:41:27 -08:00
Dianne Hackborn
7c69dba7cc Remove use of old theme name. 
Change-Id: Iebc7a81738122fbfb94f22649e07eabb39dc4afb
 2011-01-23 14:10:41 -08:00
Dianne Hackborn
42f87e1b47 am e6354845: Merge "Monkey: request am to show the ANR dialog" 
* commit 'e635484562dc7f21aa16de3147a100210708c8f8':
  Monkey: request am to show the ANR dialog
 2011-01-22 11:52:53 -08:00
Dianne Hackborn
e635484562 Merge "Monkey: request am to show the ANR dialog" 2011-01-22 11:36:43 -08:00
Vairavan Srinivasan
af5e575643 Monkey: request am to show the ANR dialog 
Default return value of 1 from appNotResponding was to show the
ANR dialog in eclair. However, recent version of android's am
interpret 1 as to wait. Fix is to change the default return
value from 1 to 0.

Change-Id: I6620ef54309f1d30ef18a2b60d73b346c2446f93
 2011-01-21 18:00:52 -08:00
Skyler Kaufman
641028359a am 8215de78: am e2a6258c: Merge "A tiny http server to test source.android.com changes" 
* commit '8215de789a5678f67bc5fc4af062b151263eabdd':
  A tiny http server to test source.android.com changes
 2011-01-21 16:11:46 -08:00
Alexander Lucas
2d93907d2e am 32d902cd: am a0575674: Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread 
* commit '32d902cd114dc3132f30db71ca954804b5548345':
  For SipDemo sample code:  Changed chosen image for "selected" state of talk button
 2011-01-21 15:50:36 -08:00
Nick Pelly
1717afbca4 am 072bca5b: Add Tag app to eclipse classpath 
* commit '072bca5b0991c2b4ddbd058ff51fe7f52cb11177':
  Add Tag app to eclipse classpath
 2011-01-21 10:51:18 -08:00
Nick Pelly
072bca5b09 Add Tag app to eclipse classpath 
Change-Id: Ib548b6a1bfa073069bba8d4225768b048192916e
 2011-01-21 10:12:17 -08:00
Jeff Brown
f40ea5cfd9 am 98ab3219: Prevent monkey from turning off the screen. (DO NOT MERGE) 
* commit '98ab321927f1ea9ebb7ba6b5506ac6748b005555':
  Prevent monkey from turning off the screen. (DO NOT MERGE)
 2011-01-20 21:46:27 -08:00
Ed Heyl
e0dfaf68b4 am fd6a2b4d: Merge "Really don\'t send POWER or ENDCALL." into honeycomb 
* commit 'fd6a2b4d2552f4a6179ac6f5f499e48310a8d813':
  Really don't send POWER or ENDCALL.
 2011-01-20 21:42:01 -08:00
Adam Powell
7052e85913 am 4da9196d: API change - bug 3370353 and bug 3370338 
* commit '4da9196dd096cb0e5d6a34b0a87f2dbd6aa8578f':
  API change - bug 3370353 and bug 3370338
 2011-01-20 21:41:58 -08:00
Ed Heyl
fd6a2b4d25 Merge "Really don't send POWER or ENDCALL." into honeycomb 2011-01-20 19:10:22 -08:00