Commit Graph

2101 Commits

Author SHA1 Message Date
Adam Koch
a36818f44c am 0c9bfb30: am 8180be14: Bitmapfun Sample: Minor updates/fixes.
* commit '0c9bfb3099ec507505665130c17e277d6edfb6ef':
  Bitmapfun Sample: Minor updates/fixes.
2013-11-12 11:53:55 -08:00
Adam Koch
0c9bfb3099 am 8180be14: Bitmapfun Sample: Minor updates/fixes.
* commit '8180be1421028c4f4d4d837c4f9a59205701d1fe':
  Bitmapfun Sample: Minor updates/fixes.
2013-11-12 19:49:53 +00:00
Chong Zhang
69805de2c4 am 83270583: am 469e5a18: am 4e5bae34: am 9678ee60: am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
* commit '832705838ae60e1bde93f3309b24c6db18cc9750':
  Add sample code to customize the MediaRouteControllerDialog
2013-11-08 13:38:47 -08:00
Chong Zhang
832705838a am 469e5a18: am 4e5bae34: am 9678ee60: am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
* commit '469e5a18f8bca5d883937356e0787c3485558335':
  Add sample code to customize the MediaRouteControllerDialog
2013-11-08 13:35:50 -08:00
Chong Zhang
4e5bae3461 am 9678ee60: am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
* commit '9678ee604ba5bfe1810b5773b1739af5919e7249':
  Add sample code to customize the MediaRouteControllerDialog
2013-11-08 13:02:18 -08:00
Chong Zhang
9678ee604b am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
* commit 'c1eb23062b8ef62942666d00d6565cbf02f842f0':
  Add sample code to customize the MediaRouteControllerDialog
2013-11-08 12:59:41 -08:00
Adam Koch
8180be1421 Bitmapfun Sample: Minor updates/fixes.
Change-Id: I71dce2fdbe41ff67cc0aac9456d72d9aa7cb8318
2013-11-07 22:01:16 +00:00
Scott Main
b6a83cef3d am 16560f1e: resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp
* commit '16560f1e146c854bb006e22601dbcf6eac798167':
2013-11-05 15:35:13 -08:00
Scott Main
16560f1e14 resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp
Change-Id: Iaf15aa6c9087eb0e72661b40acbf74830df0b00c
2013-11-05 15:28:56 -08:00
Scott Main
fae59e8ae1 resolved conflicts for merge of 1d38e9a1 to klp-ub-dev
Change-Id: I4f74db2ae175c2405aacece146244928f436551c
2013-11-05 13:15:10 -08:00
Chong Zhang
c1eb23062b Add sample code to customize the MediaRouteControllerDialog
Bug: 11320487
Change-Id: I365c93173a74e99c63d919d2852690eed174d3b3
2013-11-05 09:53:24 -08:00
Dirk Dougherty
d7f2d1ca07 resolved conflicts for merge of 2397b75d to klp-ub-dev
Change-Id: I1807a041af543acb7eb93105712d7f4af4d67521
2013-11-05 09:21:20 -08:00
Dirk Dougherty
d142dc87c1 am 43ce6bb3: am 99acac3a: Add updated StorageProvider sample, merge _index with existing file.
* commit '43ce6bb39c4df5dffc7cc6459bf3cc27273f7af0':
  Add updated StorageProvider sample, merge _index with existing file.
2013-11-04 21:59:12 -08:00
Dirk Dougherty
43ce6bb39c am 99acac3a: Add updated StorageProvider sample, merge _index with existing file.
* commit '99acac3adb85aecf7dc42ae9242adfa8c8c6dfc0':
  Add updated StorageProvider sample, merge _index with existing file.
2013-11-04 21:53:22 -08:00
quddusc
4e4303c993 resolved conflicts for merge of 3943cdc9 to klp-ub-dev 2013-11-04 18:47:17 -08:00
quddusc
0f2ebe84da am 60737e95: Merge commit \'3943cdc9\' into manualmerge2
* commit '60737e950718d02f206a9da5928299e28df4e382':
  Updated browsable sample descriptions.
2013-11-01 19:22:24 -07:00
quddusc
60737e9507 Merge commit '3943cdc9' into manualmerge2
Conflicts:
	samples/browseable/ActivityInstrumentation/_index.jd
	samples/browseable/TextLinkify/_index.jd

Change-Id: Ia9a333bd09d2e7e9417a560581c40bd02d295c12
2013-11-01 19:17:20 -07:00
Dirk Dougherty
a0b7965b3a Add updated StorageProvider sample, merge _index with existing file.
Change-Id: I63d691929d2b30cedaafa5ede900670c59d4f83d
(cherry picked from commit 99acac3adb)
2013-11-01 23:53:24 +00:00
Dirk Dougherty
99acac3adb Add updated StorageProvider sample, merge _index with existing file.
Change-Id: I63d691929d2b30cedaafa5ede900670c59d4f83d
2013-11-01 15:10:11 -07:00
Scott Main
1d38e9a13e Merge "Updated description for the StorageProvider browseable sample." into klp-docs 2013-10-31 21:10:47 +00:00
quddusc
177a5df995 Fixed broken link in ActivityInstrumentation sample description.
Change-Id: I1ab9a5750693f44dec7aa97c99a2cfcd6af0b78e
(cherry picked from commit b5de8afa23)
2013-10-31 20:01:25 +00:00
quddusc
9edda10707 Updated description for the StorageProvider browseable sample.
Change-Id: I3f83a89e3b154f207e4054b92f0d4fc1f7851eb4
(cherry picked from commit a76387f7a4)
2013-10-31 20:00:41 +00:00
quddusc
433830c039 am 213a31d7: am b5de8afa: Fixed broken link in ActivityInstrumentation sample description.
* commit '213a31d7398da7328a6a8577b504131c6e880235':
  Fixed broken link in ActivityInstrumentation sample description.
2013-10-31 11:51:25 -07:00
quddusc
213a31d739 am b5de8afa: Fixed broken link in ActivityInstrumentation sample description.
* commit 'b5de8afa234acc3caf231fe319f471dabb7d99b1':
  Fixed broken link in ActivityInstrumentation sample description.
2013-10-31 11:46:16 -07:00
quddusc
b5de8afa23 Fixed broken link in ActivityInstrumentation sample description.
Change-Id: I1ab9a5750693f44dec7aa97c99a2cfcd6af0b78e
2013-10-31 11:03:15 -07:00
Dirk Dougherty
2397b75dc4 Fix broken javadoc reference.
Change-Id: I6b39015c340894715b3b24980ca0241a5e8f2a5a
(cherry picked from commit cc1867bc5b)
2013-10-31 17:01:59 +00:00
Dirk Dougherty
3ef2b0f371 Add StorageProvider sample code to browseables.
Change-Id: I353f596e9fc7455781e4c8d7f1972dfcd5739ddb
(cherry picked from commit c921db8d27)
2013-10-31 16:59:07 +00:00
Dirk Dougherty
d036ed771d am 6d63d11e: am cc1867bc: Fix broken javadoc reference.
* commit '6d63d11e37dd60ccbdbf8e5fef00a611ab43aa3c':
  Fix broken javadoc reference.
2013-10-31 05:56:25 -07:00
Dirk Dougherty
6d63d11e37 am cc1867bc: Fix broken javadoc reference.
* commit 'cc1867bc5b13507da9e9142d018f8cee3a5d0f08':
  Fix broken javadoc reference.
2013-10-31 05:53:26 -07:00
Dirk Dougherty
cc1867bc5b Fix broken javadoc reference.
Change-Id: I6b39015c340894715b3b24980ca0241a5e8f2a5a
2013-10-31 05:45:54 -07:00
quddusc
727ff57f4a am 0b448c3b: am 11d2eef3: Updated browsable sample descriptions.
* commit '0b448c3b9237ef25409fe15c5b3f44d54adf138b':
  Updated browsable sample descriptions.
2013-10-31 05:08:14 -07:00
quddusc
0b448c3b92 am 11d2eef3: Updated browsable sample descriptions.
* commit '11d2eef36fc495bc842e3601cb90ba66f3243527':
  Updated browsable sample descriptions.
2013-10-31 05:02:26 -07:00
quddusc
11d2eef36f Updated browsable sample descriptions.
Change-Id: I21e3dfacb4bc1acfbe3b17c5f8001ee758f9eec2
(cherry picked from commit 3943cdc962)
2013-10-31 11:55:15 +00:00
quddusc
d2b26f74de am a969fb4b: am a76387f7: Updated description for the StorageProvider browseable sample.
* commit 'a969fb4b5a4238e0aa0b5c86a57a883cae707517':
  Updated description for the StorageProvider browseable sample.
2013-10-30 21:16:17 -07:00
quddusc
a969fb4b5a am a76387f7: Updated description for the StorageProvider browseable sample.
* commit 'a76387f7a4f5e65f8225e1b657ecdcfbee20682b':
  Updated description for the StorageProvider browseable sample.
2013-10-30 21:14:50 -07:00
quddusc
3943cdc962 Updated browsable sample descriptions.
Change-Id: I21e3dfacb4bc1acfbe3b17c5f8001ee758f9eec2
2013-10-30 20:51:43 -07:00
quddusc
a76387f7a4 Updated description for the StorageProvider browseable sample.
Change-Id: I3f83a89e3b154f207e4054b92f0d4fc1f7851eb4
2013-10-30 20:37:34 -07:00
Dirk Dougherty
7f725ffdae am 7656c163: am 2a7b416b: Merge "Add StorageProvider sample code to browseables." into klp-dev
* commit '7656c1633448f8f2fa4c7917b09b258ead962a45':
  Add StorageProvider sample code to browseables.
2013-10-30 19:39:12 -07:00
Dirk Dougherty
7656c16334 am 2a7b416b: Merge "Add StorageProvider sample code to browseables." into klp-dev
* commit '2a7b416b5a4d3dbb70f825072363681a0e6183d1':
  Add StorageProvider sample code to browseables.
2013-10-30 19:36:37 -07:00
Dirk Dougherty
2a7b416b5a Merge "Add StorageProvider sample code to browseables." into klp-dev 2013-10-31 02:33:02 +00:00
Dirk Dougherty
c921db8d27 Add StorageProvider sample code to browseables.
Change-Id: I353f596e9fc7455781e4c8d7f1972dfcd5739ddb
2013-10-30 19:31:29 -07:00
Svetoslav Ganov
d89fa640d0 am a12747bc: am 7c833d71: Merge "Update the print from off-screen WebView sample" into klp-dev
* commit 'a12747bca5bc980d9844022dbf860d6b95be9b6a':
  Update the print from off-screen WebView sample
2013-10-30 19:02:02 -07:00
Svetoslav Ganov
a12747bca5 am 7c833d71: Merge "Update the print from off-screen WebView sample" into klp-dev
* commit '7c833d7164cc8689da9495dc2d3c5a3185296e07':
  Update the print from off-screen WebView sample
2013-10-30 18:59:38 -07:00
Svetoslav Ganov
7c833d7164 Merge "Update the print from off-screen WebView sample" into klp-dev 2013-10-31 01:56:29 +00:00
Svetoslav Ganov
b356564db1 Update the print from off-screen WebView sample
To print we create an off-screen WebView but do not destroy it
immeidately after printing. WebViews are somehow expensive and
we do not want to keep them around more than needed.

Change-Id: Ic9c78994e0c96d4d08c0e318c459acddd2e5a652
2013-10-30 18:51:49 -07:00
Adam Koch
4544562a93 am 70f9c934: am ddba6b87: Merge "KitKat SMS APIs DevByte Sample Code" into klp-dev
* commit '70f9c934671fe0f4d700084b8ad196429796e4b8':
  KitKat SMS APIs DevByte Sample Code
2013-10-30 16:55:23 -07:00
Adam Koch
70f9c93467 am ddba6b87: Merge "KitKat SMS APIs DevByte Sample Code" into klp-dev
* commit 'ddba6b876843c72e49b812d028f19e0be656ab9f':
  KitKat SMS APIs DevByte Sample Code
2013-10-30 16:52:18 -07:00
Adam Koch
ddba6b8768 Merge "KitKat SMS APIs DevByte Sample Code" into klp-dev 2013-10-30 23:44:10 +00:00
Svetoslav Ganov
f9c86a50ff am c100e53e: am 79efac6b: Merge "Add print samples to the ApiDemos app." into klp-dev
* commit 'c100e53e42f8f4fbbd09cf5d5a7db83bb7cd48cd':
  Add print samples to the ApiDemos app.
2013-10-30 14:11:36 -07:00
Svetoslav Ganov
c100e53e42 am 79efac6b: Merge "Add print samples to the ApiDemos app." into klp-dev
* commit '79efac6b3aedb6e5bcb54bec7566fa9038240f93':
  Add print samples to the ApiDemos app.
2013-10-30 14:09:25 -07:00