Commit Graph

5382 Commits

Author SHA1 Message Date
Jeff Brown
3ba0b44aef am eddcd118: Merge "Prevent monkey from turning off the screen." into honeycomb
* commit 'eddcd1186b05b9b425ae765e98882a1815e3ac4d':
  Prevent monkey from turning off the screen.
2011-01-19 19:59:04 -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
3e5ad6bf25 am 11b83fd9: Merge "Added Honeycomb Gallery sample application." into honeycomb
* commit '11b83fd9f791496410a28f3db95bb27c0873c6fd':
  Added Honeycomb Gallery sample application.
2011-01-19 18:35:04 -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
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
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
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
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
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
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
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
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
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
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