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
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
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
Xavier Ducrohet
bf0b91c48c
am 2f61f0b7: am ae71adc7: Merge "Fix WXGA skin" into honeycomb
...
* commit '2f61f0b75432d55961100419d615c1de5458dc74':
Fix WXGA skin
2011-01-16 23:08:34 -08:00
Xavier Ducrohet
70928d8a8c
am 7f712e36: am a67b557e: Merge "Add RS includes to the SDK and update skin list." into honeycomb
...
* commit '7f712e367050703ca1e5a42159808f9f5eb879e2':
Add RS includes to the SDK and update skin list.
2011-01-16 23:08:13 -08:00
Winson Chung
a9ad0ad870
am 2c5a0a9c: am eb80909d: Adding WidgetPreview utility.
...
* commit '2c5a0a9cf1dbe0da2b13034b6bbd4e2e72aaf6ad':
Adding WidgetPreview utility.
2011-01-16 23:07:09 -08:00
Dianne Hackborn
a9152a368b
am b101f20f: am e63a4b58: Add some more API demos for themes.
...
* commit 'b101f20ff2c2987a3d2f0e7e9c544244b5a7521e':
Add some more API demos for themes.
2011-01-16 23:02:20 -08:00
Xavier Ducrohet
ecae4533f2
am 8841bf1d: (-s ours) am 7eada540: Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
...
* commit '8841bf1d41f8bc2dee32d881121e1a1c9a15664a':
Move SDK component to 2.4 - DO NOT MERGE.
2011-01-16 19:44:38 -08:00
Xavier Ducrohet
8841bf1d41
am 7eada540: 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-16 19:42:37 -08:00
Xavier Ducrohet
0c0d4dfd12
am ac70efe3: Merge "Move SDK component to API 10 + codename." into honeycomb
...
* commit 'ac70efe3445dc697c521853af382624af63da457':
Move SDK component to API 10 + codename.
2011-01-16 19:40:38 -08:00
Xavier Ducrohet
2f61f0b754
am ae71adc7: Merge "Fix WXGA skin" into honeycomb
...
* commit 'ae71adc7c815cc3965e424b6c8f9d93a4fd0af12':
Fix WXGA skin
2011-01-16 19:40:36 -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
7f712e3670
am a67b557e: Merge "Add RS includes to the SDK and update skin list." into honeycomb
...
* commit 'a67b557e13a11afc84beed873c7be4f2fac59643':
Add RS includes to the SDK and update skin list.
2011-01-16 19:18:16 -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
2c5a0a9cf1
am eb80909d: Adding WidgetPreview utility.
...
* commit 'eb80909dfc0d44d1bd6b38aea12b3740cea4efa9':
Adding WidgetPreview utility.
2011-01-16 17:58:38 -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
Dianne Hackborn
b101f20ff2
am e63a4b58: Add some more API demos for themes.
...
* commit 'e63a4b58a26cdce8b62984c83763dafdf282895b':
Add some more API demos for themes.
2011-01-16 14:49:50 -08:00
Dianne Hackborn
e63a4b58a2
Add some more API demos for themes.
...
Shows how to make a basic custom theme with a custom background,
and a theme that selects between the old theme and Holo.
Also use a little trick to make the API demos for HC specific
samples be hidden on older versions of the platform.
Change-Id: Ie53e8103147e81975fca73b96bda989a00504534
2011-01-16 14:29:28 -08:00
Xavier Ducrohet
0af60fc747
Fix WXGA skin
...
Change-Id: Ia283c1f9774318661c7164fdb9da70c72bb26bdc
2011-01-16 13:41:34 -08:00