Alexander Lucas
a029474d6c
am a0575674: Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
...
* commit 'a057567484888f206cd70ecc2dcb269b16f23718':
For SipDemo sample code: Changed chosen image for "selected" state of talk button
2011-01-27 18:28:36 -08:00
Jack Palevich
536d8b9f78
am 5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
...
* commit '5e38995f6af6339e5dccf86b50f8b658917c7aeb':
Add BasicGLSurfaceView sample.
2011-01-27 09:18:16 -08:00
Xavier Ducrohet
ae760d9489
am 7eada540: (-s ours) Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
...
* commit '7eada54037b5476bfc1cc4a3e8933defa0b04096':
Move SDK component to 2.4 - DO NOT MERGE.
2011-01-27 08:48:40 -08:00
Jaikumar Ganesh
5a87804c87
am 1b608620: (-s ours) Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
...
* commit '1b6086207f2b06fb2647428e6210c2aefc6a930a':
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
2011-01-27 08:12:00 -08:00
Elliott Hughes
71dbb060ca
am ed6b76c6: Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
...
* commit 'ed6b76c670658390a43e199f9dc199d85483300a':
Minor doc fixes (mainly the infamous "repo init-u").
2011-01-27 08:10:42 -08:00
Jeff Hamilton
71a96a345a
am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
...
* commit 'aad3a1b7327491f29db69a4e4bf7c3791662d6b5':
Add a sample for the NFC foreground dispatch APIs.
2011-01-26 21:14:42 -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
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
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
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
Yu Shan Emily Lau
d391ae2098
Fixed the appCrashBugreport reset flag. Bug# 3383876
...
Change-Id: I51d06ad30ed43789943cc99744898028e11b8466
2011-01-24 11:57:32 -08:00
Dianne Hackborn
7c69dba7cc
Remove use of old theme name.
...
Change-Id: Iebc7a81738122fbfb94f22649e07eabb39dc4afb
2011-01-23 14:10:41 -08:00
Ed Heyl
fd6a2b4d25
Merge "Really don't send POWER or ENDCALL." into honeycomb
2011-01-20 19:10:22 -08:00
Adam Powell
4da9196dd0
API change - bug 3370353 and bug 3370338
...
Change-Id: I9da53f3260ca17713e793b420e477686ad23c7d3
2011-01-20 18:36:37 -08:00
Jeff Brown
82df76b040
Really don't send POWER or ENDCALL.
...
Change-Id: If55c6bc7565a9a6b493da16fac5c7ad3c621684f
2011-01-20 17:41:18 -08:00
Yu Shan Emily Lau
080c237638
Merge "Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#3146736" into honeycomb
2011-01-20 10:21:37 -08:00
Jeff Brown
eddcd1186b
Merge "Prevent monkey from turning off the screen." into honeycomb
2011-01-19 19:56:18 -08:00
Jeff Brown
8a2659dc0d
Prevent monkey from turning off the screen.
...
Bug: 3371251
Change-Id: Iadae29e8e4a67052746b8e2d2f5f542e4ee6dcc5
2011-01-19 19:43:49 -08:00
Alexander Lucas
11b83fd9f7
Merge "Added Honeycomb Gallery sample application." into honeycomb
2011-01-19 18:33:28 -08:00
Alexander Lucas
9f935c7da5
Added Honeycomb Gallery sample application.
...
Change-Id: I1eefc2837016a7973544f0c57a8464466e7dcef9
2011-01-19 17:02:48 -08:00
Trevor Johns
953dbee407
Merge "NFC sample app" into honeycomb
2011-01-19 15:23:41 -08:00
Fabrice Di Meglio
791c754246
Merge "Update account tester" into honeycomb
2011-01-19 14:30:52 -08:00
Megha Joshi
6aa608a559
NFC sample app
...
Cherry-picking NFC sample into Honeycomb branch, since it wasn't
merged during it's original commit to Gingerbread.
Change-Id: I79308f04c1b2edd6cb5bb675fa13b9e5083a8432
2011-01-19 14:07:55 -08:00
Xavier Ducrohet
ede325fe5a
Merge "HC preview & GB 2.3.1 use platform-tools rev 2." into honeycomb
2011-01-19 12:41:19 -08:00
Jaikumar Ganesh
7844a14f55
Merge "Modify Bluetooth Chat app for new insecure rfcomm API." into honeycomb
2011-01-19 10:40:43 -08:00
Jaikumar Ganesh
2af724c6eb
Modify Bluetooth Chat app for new insecure rfcomm API.
...
Also fix some bugs.
Change-Id: I2e20a3b02fb904d64e03a2c4602a5b724912c742
2011-01-19 10:30:32 -08:00
Raphael
aaa879bc8b
HC preview & GB 2.3.1 use platform-tools rev 2.
...
Change-Id: Ib2dc3165f88b4c3bd3ba31a956ddb983ea496f2b
2011-01-18 23:06:25 -08:00
Xavier Ducrohet
91946fe86a
Merge "Add RenderScript samples to the SDK." into honeycomb
2011-01-18 18:13:34 -08:00
Alexander Lucas
a057567484
Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
2011-01-18 18:04:38 -08:00
Xavier Ducrohet
3292919d70
Add RenderScript samples to the SDK.
...
Change-Id: I6139a792916a1cb942c05be8243d52784f39f859
2011-01-18 16:41:29 -08:00
Xavier Ducrohet
7a3e7b1b9a
Update sdk.prop for the platform SDK component.
...
sdk.properties should be stored in development.git and
not sdk.git so move it here.
Change-Id: I32e166927ea91cad36d66bb14e90cb36ccb3bc82
2011-01-18 14:21:55 -08:00
Fabrice Di Meglio
ac3b18ffe1
Update account tester
...
- update Theme to use default one
- AccountManager.getAuthTokenByFeatures() can be called thru a button
- code refactoring and cleaning
Change-Id: I1b4cfb340d9ed1506541fb9faf349f50d05df472
2011-01-18 13:31:33 -08:00
Jack Palevich
6039b0915e
Merge "Add BasicGLSurfaceView sample." into honeycomb
2011-01-18 02:42:31 -08:00
Xavier Ducrohet
959f517c24
Merge "Remove illegal @Override on interface method." into honeycomb
2011-01-17 21:51:43 -08:00
Xavier Ducrohet
e21f4d695a
Merge "Update the API level of the Honeycomb samples." into honeycomb
2011-01-17 21:51:39 -08:00
Jack Palevich
ebb6bc2fc8
Add BasicGLSurfaceView sample.
...
Show how to get started with OpenGL ES 2.0.
Change-Id: Iee83ca6a52eee64e8c6b77bc9a8abff11a1eabfd
2011-01-17 17:48:44 -08:00
Jack Palevich
5e38995f6a
Merge "Add BasicGLSurfaceView sample." into gingerbread
2011-01-17 17:39:43 -08:00
Winson Chung
e8afb7e327
Fixing typo.
...
Change-Id: I7e16ed4713d9bc2c2263e526e46c54a1f85b952c
2011-01-17 17:13:31 -08:00
Xavier Ducrohet
62e3bb6f93
Remove illegal @Override on interface method.
...
Samples should compile with 1.5
Change-Id: I029ae9ded4237fd9d4d2d1dbf2c7c537afbbf36b
2011-01-17 17:05:05 -08:00
Xavier Ducrohet
2beeb1c309
Update the API level of the Honeycomb samples.
...
Change-Id: I5f14d45474957e9ee35a058d7b6295c860335429
2011-01-17 16:58:04 -08:00
Dianne Hackborn
0d11c9c345
Follow API changes.
...
Change-Id: Ieb1df7fc0708f22aae3d851f74ade1343eb44e08
2011-01-17 15:27:56 -08:00
Andy Stadler
d8865cc32c
Update demo for DPM encryption controls
...
* Follow revised API
* Show more status
Bug: 3346770
Change-Id: I6c5cd8d8f055ceb3a3a78cf3868dbc0f2d535acf
2011-01-17 12:53:31 -08:00
Xavier Ducrohet
ac70efe344
Merge "Move SDK component to API 10 + codename." into honeycomb
2011-01-16 19:38:59 -08:00
Xavier Ducrohet
7eada54037
Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
2011-01-16 19:38:51 -08:00
Xavier Ducrohet
ae71adc7c8
Merge "Fix WXGA skin" into honeycomb
2011-01-16 19:38:41 -08:00
Xavier Ducrohet
a67b557e13
Merge "Add RS includes to the SDK and update skin list." into honeycomb
2011-01-16 19:16:16 -08:00
Winson Chung
eb80909dfc
Adding WidgetPreview utility.
...
Change-Id: Idfdf866400687e58304863c3c4f3dd3c4aed45b1
2011-01-16 17:13:16 -08:00
Xavier Ducrohet
0e58a80e38
Move SDK component to API 10 + codename.
...
Change-Id: If6c739a082c3c631de62d3c0db7615bcf29b4126
2011-01-16 15:27:25 -08:00
Xavier Ducrohet
22f3c41f71
Move SDK component to 2.4 - DO NOT MERGE.
...
Change-Id: Ibee46cfa081d81a7cc12f9b81ec0a3637f5b487f
2011-01-16 15:23:50 -08:00