Commit Graph

1139 Commits

Author SHA1 Message Date
Dianne Hackborn
e36d13b70d Add new samples for explicit alert dialog themes.
Change-Id: I1e306c0786952ab391c479a9322065efd8566ca7
2011-01-27 16:35:02 -08:00
Scott Main
4c33e9c0ef am f43f3176: am 44a6ed7b: Merge "change notepad min sdk version to 11 and adjust action item appearance" into honeycomb
* commit 'f43f31761af52264836ce9dc5de29b27036b13dd':
  change notepad min sdk version to 11 and adjust action item appearance
2011-01-27 15:14:10 -08:00
Scott Main
f43f31761a am 44a6ed7b: Merge "change notepad min sdk version to 11 and adjust action item appearance" into honeycomb
* commit '44a6ed7b3ff5080dc18f821d83852e331d7a3891':
  change notepad min sdk version to 11 and adjust action item appearance
2011-01-27 15:07:01 -08:00
Scott Main
44a6ed7b3f Merge "change notepad min sdk version to 11 and adjust action item appearance" into honeycomb 2011-01-27 15:02:52 -08:00
Scott Main
29ecb2f11d change notepad min sdk version to 11 and adjust action item appearance
Change-Id: I5385067b2720ebb053565cadcfe725103165abb8
2011-01-27 14:58:55 -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
8dc2b87b64 am fa378cdd: am 28745b4e: am 509fbb4d: Sample code for foreground NDEF Push APIs.
* commit 'fa378cddf30b0b50c48ee332c3f5c3bdb82baa32':
  Sample code for foreground NDEF Push APIs.
2011-01-26 19:08:27 -08:00
Jeff Hamilton
fa378cddf3 am 28745b4e: am 509fbb4d: Sample code for foreground NDEF Push APIs.
* commit '28745b4ee52ef4864f9bdaed1d5e1cb9ac849b15':
  Sample code for foreground NDEF Push APIs.
2011-01-26 16:57:49 -08:00
Jeff Hamilton
28745b4ee5 am 509fbb4d: Sample code for foreground NDEF Push APIs.
* commit '509fbb4df3bdbc8c78614f5297459f7afe2b1ba6':
  Sample code for foreground NDEF Push APIs.
2011-01-26 15:47:51 -08:00
Jeff Hamilton
509fbb4df3 Sample code for foreground NDEF Push APIs. 2011-01-26 17:41:35 -06:00
Jeff Hamilton
a9bb7f1472 resolved conflicts for merge of ac96a560 to honeycomb-merge
Change-Id: Ibc0b1fa69597672293f6b753f18f8a14ee732d0b
2011-01-26 11:12:41 -06:00
Dianne Hackborn
a7bdb442c5 am 3de63b41: am 3be09cb1: Merge "Use multiple async tasks." into honeycomb
* commit '3de63b416d80b1d50c6087336d0a34b2ffbe8528':
  Use multiple async tasks.
2011-01-25 16:20:06 -08:00
Nick Pelly
78c8e27935 resolved conflicts for merge of 06bef9df to master
Change-Id: Ie0a21c77481542f882a58418bfb7269f9c357a4a
2011-01-25 16:11:28 -08:00
Dianne Hackborn
3de63b416d am 3be09cb1: Merge "Use multiple async tasks." into honeycomb
* commit '3be09cb183af4e0a637a12cfb421fd90fe40d308':
  Use multiple async tasks.
2011-01-25 15:25:43 -08:00
Jeff Hamilton
06bef9df0b am 7a11acd9: am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
* commit '7a11acd92bec5e7a089bdb248a78589491962c76':
  Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
2011-01-25 14:44:37 -08:00
Jeff Hamilton
7a11acd92b am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
* commit 'e0fbd3ffe82e6e80c6b070c3afbdb8e7fdd9bb25':
  Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
2011-01-25 14:39:53 -08:00
Jeff Hamilton
e0fbd3ffe8 Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
Change-Id: Ic537d209b07e81e80aeca5aa3e4a63657ac6fb76
2011-01-25 16:33:33 -06:00
Dianne Hackborn
649790adc5 Use multiple async tasks.
Change-Id: If6be431a4f9443eaaf4478bae57c29f77f558b91
2011-01-24 21:26:57 -08:00
Xavier Ducrohet
d2d33e1f48 am 8ae584ed: am d7d15831: Merge "Update the SDK platform components to API 11." into honeycomb
* commit '8ae584edb2d0349ce42b775de795d9d35761f2da':
  Update the SDK platform components to API 11.
2011-01-24 17:31:50 -08:00
Xavier Ducrohet
8ae584edb2 am d7d15831: Merge "Update the SDK platform components to API 11." into honeycomb
* commit 'd7d15831d79aae53e2b7d9d402a2503e9f68dc98':
  Update the SDK platform components to API 11.
2011-01-24 17:29:14 -08:00
Xavier Ducrohet
c177f55e12 Update the SDK platform components to API 11.
Change-Id: I17f202c986ca0a27e89f02430bb2400eaa85c534
2011-01-24 17:25:36 -08:00
Dianne Hackborn
02f9ba4604 am 8929f134: am 7c69dba7: Remove use of old theme name.
* commit '8929f134293cfcb636ac3da76b2b400ae3df1a06':
  Remove use of old theme name.
2011-01-23 16:50:21 -08:00
Dianne Hackborn
8929f13429 am 7c69dba7: Remove use of old theme name.
* commit '7c69dba7cc03073820d567dcb2fa6af031326e7a':
  Remove use of old theme name.
2011-01-23 14:41:27 -08:00
Dianne Hackborn
7c69dba7cc Remove use of old theme name.
Change-Id: Iebc7a81738122fbfb94f22649e07eabb39dc4afb
2011-01-23 14:10:41 -08:00
Alexander Lucas
5a2acc8ef3 am 2d93907d: am 32d902cd: am a0575674: Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
* commit '2d93907d2e81d3e781d71b50d6f4ec2e57ccb1c5':
  For SipDemo sample code:  Changed chosen image for "selected" state of talk button
2011-01-21 15:56:04 -08:00
Alexander Lucas
2d93907d2e am 32d902cd: am a0575674: Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
* commit '32d902cd114dc3132f30db71ca954804b5548345':
  For SipDemo sample code:  Changed chosen image for "selected" state of talk button
2011-01-21 15:50:36 -08:00
Adam Powell
261a9724d1 am 7052e859: am 4da9196d: API change - bug 3370353 and bug 3370338
* commit '7052e85913a10e1f09b118ac22f6b3a676cf60f9':
  API change - bug 3370353 and bug 3370338
2011-01-21 10:57:27 -08:00
Adam Powell
7052e85913 am 4da9196d: API change - bug 3370353 and bug 3370338
* commit '4da9196dd096cb0e5d6a34b0a87f2dbd6aa8578f':
  API change - bug 3370353 and bug 3370338
2011-01-20 21:41:58 -08:00
Adam Powell
4da9196dd0 API change - bug 3370353 and bug 3370338
Change-Id: I9da53f3260ca17713e793b420e477686ad23c7d3
2011-01-20 18:36:37 -08:00
Alexander Lucas
e39365fbea am 3e5ad6bf: am 11b83fd9: Merge "Added Honeycomb Gallery sample application." into honeycomb
* commit '3e5ad6bf25299b48da1780c3f0995803aaa1431a':
  Added Honeycomb Gallery sample application.
2011-01-19 18:36:50 -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
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