LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,172 Commits 2 Branches 0 Tags
a95b29a1b468c1412e2627f66ed70c274ee4346c
Commit Graph

13172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsieh
4abacac32d Merge "Fix prototype of poll" 2013-11-04 00:30:46 +00:00
quddusc
2d7d363fa1 Merge commit '177a5df9' into manualmerge2 
Conflicts:
	samples/browseable/ActivityInstrumentation/_index.jd

Change-Id: I7fd9bf69af0bc1450462952f2e250d1776a0b8db
 2013-11-02 13:42:43 -07:00
Dirk Dougherty
5969d205e6 am 5e90c148: Merge commit \'2397b75d\' into manualmerge 
* commit '5e90c1485a5efe55502884a9f63994914ac19fac':
  Fix broken javadoc reference.
 2013-11-01 19:44:48 -07:00
Dirk Dougherty
5e90c1485a Merge commit '2397b75d' into manualmerge 
Conflicts:
	samples/browseable/TextLinkify/_index.jd

Change-Id: I2b64b72766d8543e238461f74c7bd4a1959a9e37
 2013-11-01 19:38:11 -07:00
Dirk Dougherty
35da2acf9c am 9b903167: am 3ef2b0f3: Add StorageProvider sample code to browseables. 
* commit '9b903167a08ae700247e69f4c0701082d1150291':
  Add StorageProvider sample code to browseables.
 2013-11-01 19:22:25 -07:00
quddusc
0f2ebe84da am 60737e95: Merge commit \'3943cdc9\' into manualmerge2 
* commit '60737e950718d02f206a9da5928299e28df4e382':
  Updated browsable sample descriptions.
 2013-11-01 19:22:24 -07:00
Dirk Dougherty
9b903167a0 am 3ef2b0f3: Add StorageProvider sample code to browseables. 
* commit '3ef2b0f3711df9249ea48ac9cd4b08e663d45f18':
  Add StorageProvider sample code to browseables.
 2013-11-01 19:20:18 -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
cbf0e9141b Merge "redirect web overview page to index.html" into klp-docs 2013-11-01 21:49:12 +00:00
Scott Main
f84f063448 redirect web overview page to index.html 
Change-Id: I2ea6709ab8754ff055c16a1c93314350343bc441
 2013-11-01 11:35:13 -07:00
Elliott Hughes
356cdcbd27 am f99585bd: am ff11bce0: am 07bdc2b8: Merge "Fix build." 
* commit 'f99585bddd07da98a018e70e29bad55e2204e6ea':
  Fix build.
 2013-10-31 22:32:46 -07:00
Elliott Hughes
f99585bddd am ff11bce0: am 07bdc2b8: Merge "Fix build." 
* commit 'ff11bce0978d56ce571454d16084028df4106e13':
  Fix build.
 2013-10-31 21:29:06 -07:00
Elliott Hughes
ff11bce097 am 07bdc2b8: Merge "Fix build." 
* commit '07bdc2b8e6980173ca9e8070803dcaad042e52c2':
  Fix build.
 2013-10-31 21:26:13 -07:00
Elliott Hughes
07bdc2b8e6 Merge "Fix build." 2013-11-01 04:24:08 +00:00
Elliott Hughes
0d86e637f6 Fix build. 
Change-Id: If09775ab21fef5b1df0222f07443a55190ae7a1c
 2013-10-31 18:41:52 -07:00
Andrew Hsieh
61097c7e51 Fix prototype of poll 
from poll(struct pollfd *, nfds_t, long) to
poll(struct pollfd *, nfds_t, int)

See 11952073af22568bba0b661f7a9d4402c443a888
and ebfbb367fb

Change-Id: Idba600d4b172404f0a1d5d715febcba8a495a770
 2013-11-01 08:33:08 +08: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
Svetoslav Ganov
79efac6b3a Merge "Add print samples to the ApiDemos app." into klp-dev 2013-10-30 21:04:49 +00:00