Commit Graph

1258 Commits

Author SHA1 Message Date
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
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
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
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
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
Alexander Lucas
32d902cd11 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-18 18:07:11 -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
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
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
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
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
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
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
Jack Palevich
2f6e41d664 Add BasicGLSurfaceView sample.
Show how to get started with OpenGL ES 2.0.

Change-Id: I22e5e72114fd76bb7319c51e0a3b0d0e05c546fb
2011-01-14 19:27:56 -08:00
Jaikumar Ganesh
0d799e0964 am 1b608620: 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-14 16:13:36 -08:00
Jaikumar Ganesh
1b6086207f Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread 2011-01-14 16:11:35 -08:00
Jaikumar Ganesh
6314c20eeb Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
Also fix some bugs.
Bug: 3352266

Change-Id: Ie64cb243159b1f6eea5f268f02a1dd58970d1e22
2011-01-14 13:11:34 -08:00
Christopher Tate
86e2451d1c am eb3c9bb4: am 560094ef: Merge "Add a dynamically-revealed view to the drag demo" into honeycomb
* commit 'eb3c9bb439166ef17450e4e9fb4d8fa2d96b6ef3':
  Add a dynamically-revealed view to the drag demo
2011-01-14 12:40:37 -08:00
Christopher Tate
eb3c9bb439 am 560094ef: Merge "Add a dynamically-revealed view to the drag demo" into honeycomb
* commit '560094efef3da5f616faed00212f8fdae9037d99':
  Add a dynamically-revealed view to the drag demo
2011-01-14 12:38:21 -08:00
Christopher Tate
560094efef Merge "Add a dynamically-revealed view to the drag demo" into honeycomb 2011-01-14 12:36:49 -08:00
Wink Saville
181414a48c Fix build.
Commented out the offending lines and add a RuntimeException to
fix the build.

Change-Id: Ide2a7897d639edb1cd28401566558a90235c250b
2011-01-13 21:05:24 -08:00
Christopher Tate
cbbfda2bd0 Add a dynamically-revealed view to the drag demo
This is to show off and test the handling of views that become
visible after the primary ACTION_DRAG_STARTED broadcast happens.

Change-Id: I8bb575c2e055a9d60fc6ed8bc77457dec13a80b4
2011-01-13 20:28:47 -08:00
Jake Hamby
c09e5a4ec9 am 3695fe3a: Fix BT chat sample app to use Honeycomb action bar.
* commit '3695fe3a4242504d523d0222306775ada5cd6430':
  Fix BT chat sample app to use Honeycomb action bar.
2011-01-13 17:46:33 -08:00
Jake Hamby
3695fe3a42 Fix BT chat sample app to use Honeycomb action bar.
The BT chat app previously used a custom title, which is no longer
supported in Honeycomb with the default theme. It also required the
option menu, which has been replaced with the action bar.

Fixed the app to use the standard Honeycomb style and action bar.

Bug: 3098795
Change-Id: I8f8656b261c6e15cc6b0b2f445087ff3baabb4d4
2011-01-13 16:59:47 -08:00
Jeff Hamilton
b0a4fe0141 am e8b4ac2e: am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
* commit 'e8b4ac2e6d04cc4651c8b0852d8bcf02c4e5019a':
  Add a sample for the NFC foreground dispatch APIs.
2011-01-13 12:48:30 -08:00
Jeff Hamilton
e8b4ac2e6d am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
* commit 'aad3a1b7327491f29db69a4e4bf7c3791662d6b5':
  Add a sample for the NFC foreground dispatch APIs.
2011-01-13 12:46:08 -08:00
Jeff Hamilton
aad3a1b732 Add a sample for the NFC foreground dispatch APIs.
Change-Id: Iee532d53b4d9354977414b0302b386a940606ab3
2011-01-13 14:39:58 -06:00
Andy Stadler
36a3d06181 am 3eb48a06: Add encryption status controls
* commit '3eb48a061aa2d6aafe7493bb3d83ea8f8d53a33d':
  Add encryption status controls
2011-01-12 21:19:06 -08:00
Andy Stadler
3eb48a061a Add encryption status controls
* Enable, disable, and activate encryption
* Report encryption status

Change-Id: Ia76cf6033fe00ebdfd3369f8123f5d1ec109f3a9
2011-01-12 20:41:20 -08:00