Trevor Johns
1beb0a7f40
am 6d1e068d: am 953dbee4: Merge "NFC sample app" into honeycomb
...
* commit '6d1e068db029cdae99874149b7904da6f5cb7307':
NFC sample app
2011-01-19 15:28:37 -08:00
Trevor Johns
6d1e068db0
am 953dbee4: Merge "NFC sample app" into honeycomb
...
* commit '953dbee407ebffd4bd340aac5dc5aea469fa2bdf':
NFC sample app
2011-01-19 15:26:53 -08:00
Trevor Johns
953dbee407
Merge "NFC sample app" into honeycomb
2011-01-19 15:23:41 -08:00
Fabrice Di Meglio
e597c89af7
am df07ce17: am 791c7542: Merge "Update account tester" into honeycomb
...
* commit 'df07ce17a7b67858e17f68d2bcc932819479be14':
Update account tester
2011-01-19 14:35:27 -08:00
Fabrice Di Meglio
df07ce17a7
am 791c7542: Merge "Update account tester" into honeycomb
...
* commit '791c75424600614d0f8604c54fad4ba80ee57794':
Update account tester
2011-01-19 14:33:57 -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
1eedc9f9d6
am 09c6f52d: am ede325fe: Merge "HC preview & GB 2.3.1 use platform-tools rev 2." into honeycomb
...
* commit '09c6f52dc543516685beef0ead0be707ff4d0f44':
HC preview & GB 2.3.1 use platform-tools rev 2.
2011-01-19 12:44:14 -08:00
Xavier Ducrohet
09c6f52dc5
am ede325fe: Merge "HC preview & GB 2.3.1 use platform-tools rev 2." into honeycomb
...
* commit 'ede325fe5a2beca79adac09f17adef7e9d72afaf':
HC preview & GB 2.3.1 use platform-tools rev 2.
2011-01-19 12:42:48 -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
ef0db47709
am 1148b835: am 7844a14f: Merge "Modify Bluetooth Chat app for new insecure rfcomm API." into honeycomb
...
* commit '1148b835a9036f19e57ebb3802285b586b467e08':
Modify Bluetooth Chat app for new insecure rfcomm API.
2011-01-19 10:44:27 -08:00
Jaikumar Ganesh
1148b835a9
am 7844a14f: Merge "Modify Bluetooth Chat app for new insecure rfcomm API." into honeycomb
...
* commit '7844a14f5525ca0bd47a9b6b73e040003dd47890':
Modify Bluetooth Chat app for new insecure rfcomm API.
2011-01-19 10:42:28 -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
c0b6eee941
am 67bb019c: am 91946fe8: Merge "Add RenderScript samples to the SDK." into honeycomb
...
* commit '67bb019cc4625169272bbd839f2c81166409cd78':
Add RenderScript samples to the SDK.
2011-01-18 21:59:32 -08:00
Xavier Ducrohet
78631056c8
am 3d3d3b58: am 7a3e7b1b: Update sdk.prop for the platform SDK component.
...
* commit '3d3d3b58b2401a897ce00b7ed1e981622d557fcb':
Update sdk.prop for the platform SDK component.
2011-01-18 21:54:07 -08:00
Xavier Ducrohet
67bb019cc4
am 91946fe8: Merge "Add RenderScript samples to the SDK." into honeycomb
...
* commit '91946fe86a7c1f481796d8e0b0f219f457db5750':
Add RenderScript samples to the SDK.
2011-01-18 18:40:59 -08:00
Xavier Ducrohet
91946fe86a
Merge "Add RenderScript samples to the SDK." into honeycomb
2011-01-18 18:13:34 -08:00
Xavier Ducrohet
3292919d70
Add RenderScript samples to the SDK.
...
Change-Id: I6139a792916a1cb942c05be8243d52784f39f859
2011-01-18 16:41:29 -08:00
Xavier Ducrohet
3d3d3b58b2
am 7a3e7b1b: Update sdk.prop for the platform SDK component.
...
* commit '7a3e7b1b9ad0a06744a1c76ae398f684dda7b2bf':
Update sdk.prop for the platform SDK component.
2011-01-18 14:39:38 -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
aa26871dc9
am b70177bf: am 6039b091: Merge "Add BasicGLSurfaceView sample." into honeycomb
...
* commit 'b70177bf1d89e10ee80c06f162a3c69d4237ef7a':
Add BasicGLSurfaceView sample.
2011-01-18 08:47:56 -08:00
Xavier Ducrohet
e783ac1c8c
am e857d011: am 959f517c: Merge "Remove illegal @Override on interface method." into honeycomb
...
* commit 'e857d011b6d4aff3abf43c1436db9f0126518687':
Remove illegal @Override on interface method.
2011-01-18 08:47:54 -08:00
Xavier Ducrohet
72fc0eb9ba
am 0974a320: am e21f4d69: Merge "Update the API level of the Honeycomb samples." into honeycomb
...
* commit '0974a32008602344e4bcd88bca1881ba3af7ac35':
Update the API level of the Honeycomb samples.
2011-01-18 08:47:52 -08:00
Jack Palevich
b70177bf1d
am 6039b091: Merge "Add BasicGLSurfaceView sample." into honeycomb
...
* commit '6039b0915ea44fcad503f33b6f0c9b27669f999c':
Add BasicGLSurfaceView sample.
2011-01-18 08:26:16 -08:00
Xavier Ducrohet
e857d011b6
am 959f517c: Merge "Remove illegal @Override on interface method." into honeycomb
...
* commit '959f517c248d3c6726b4bd7126317332da7696a1':
Remove illegal @Override on interface method.
2011-01-18 08:25:24 -08:00
Xavier Ducrohet
0974a32008
am e21f4d69: Merge "Update the API level of the Honeycomb samples." into honeycomb
...
* commit 'e21f4d695a3bdac4cb81127a2bd41555a4c940be':
Update the API level of the Honeycomb samples.
2011-01-18 08:25:19 -08:00
Winson Chung
ece9eb1c90
am aa50525f: am e8afb7e3: Fixing typo.
...
* commit 'aa50525f4809208df4a27c6b4e58b0d4334e81d9':
Fixing typo.
2011-01-18 07:50:17 -08:00
Winson Chung
aa50525f48
am e8afb7e3: Fixing typo.
...
* commit 'e8afb7e327d6eb5beeeffd7b32a2adb6b7a4cabc':
Fixing typo.
2011-01-18 07:33:29 -08:00
Jack Palevich
6039b0915e
Merge "Add BasicGLSurfaceView sample." into honeycomb
2011-01-18 02:42:31 -08:00
Dianne Hackborn
538705cfb7
am 44af4c2b: am 0d11c9c3: Follow API changes.
...
* commit '44af4c2b30cd8fbf0a09a3bb340c4ca4ef855aaa':
Follow API changes.
2011-01-17 23:31:41 -08:00
Jack Palevich
f74109fc37
am 80ea3ea8: am 2fd42883: am 5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
...
* commit '80ea3ea8e1ad5e9d5189a1136b380d162999e2a8':
Add BasicGLSurfaceView sample.
2011-01-17 23:31:34 -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
Dianne Hackborn
44af4c2b30
am 0d11c9c3: Follow API changes.
...
* commit '0d11c9c34501a9a9dedee1092fd63af218dc28c8':
Follow API changes.
2011-01-17 20:00:58 -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
80ea3ea8e1
am 2fd42883: am 5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
...
* commit '2fd4288383e8af566d8d423eb606f8fd98a21d8f':
Add BasicGLSurfaceView sample.
2011-01-17 17:45:02 -08:00
Jack Palevich
2fd4288383
am 5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
...
* commit '5e38995f6af6339e5dccf86b50f8b658917c7aeb':
Add BasicGLSurfaceView sample.
2011-01-17 17:42:56 -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
6b064da77c
am f056c22c: am d8865cc3: Update demo for DPM encryption controls
...
* commit 'f056c22cf74daabec457cfcb17a72f8ca01c3b9e':
Update demo for DPM encryption controls
2011-01-17 12:58:44 -08:00
Andy Stadler
f056c22cf7
am d8865cc3: Update demo for DPM encryption controls
...
* commit 'd8865cc32c917cebf1fc65c8266d939b9a5718a7':
Update demo for DPM encryption controls
2011-01-17 12:56:21 -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
b2ad14e9ca
am ecae4533: (-s ours) am 8841bf1d: (-s ours) am 7eada540: Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
...
* commit 'ecae4533f22dffdbfd671d0c3af559826db41f97':
Move SDK component to 2.4 - DO NOT MERGE.
2011-01-16 23:08:42 -08:00
Xavier Ducrohet
ea059fa763
am 0c0d4dfd: am ac70efe3: Merge "Move SDK component to API 10 + codename." into honeycomb
...
* commit '0c0d4dfd12c8386c0c710611e345b435a7013e04':
Move SDK component to API 10 + codename.
2011-01-16 23:08:36 -08:00