Commit Graph

2128 Commits

Author SHA1 Message Date
Katie McCormick
4afb47eb21 am b652393d: am b3017f4d: Sample code: bug fix
* commit 'b652393dd55979be53e73e62fa985d5cd836b156':
  Sample code: bug fix
2013-11-26 12:20:41 -08:00
Katie McCormick
b652393dd5 am b3017f4d: Sample code: bug fix
* commit 'b3017f4d2321dda48811b09813761cc53df6b893':
  Sample code: bug fix
2013-11-26 20:16:58 +00:00
Katie McCormick
b3017f4d23 Sample code: bug fix
Fix for:

b/6535950

Change-Id: I8f03a2e70c72dd68b4d183a54351ad09b23b83c4
2013-11-26 11:15:49 -08:00
Alexander Lucas
5a0ab97113 am b40c1571: am 3a85c6d5: am 98a13468: Updating samples browser to include ActionBarCompat samples
* commit 'b40c1571dc9ecf016f6b3bdba26ab54e0941ad43':
  Updating samples browser to include ActionBarCompat samples
2013-11-22 10:10:14 -08:00
Alexander Lucas
b40c1571dc am 3a85c6d5: am 98a13468: Updating samples browser to include ActionBarCompat samples
* commit '3a85c6d598f8575a1442278bf3733eec6c5d6a2e':
  Updating samples browser to include ActionBarCompat samples
2013-11-22 10:06:20 -08:00
Alexander Lucas
3a85c6d598 am 98a13468: Updating samples browser to include ActionBarCompat samples
* commit '98a13468a649288ff83fd26a80c5922cede6ec1a':
  Updating samples browser to include ActionBarCompat samples
2013-11-22 18:03:49 +00:00
Alexander Lucas
98a13468a6 Updating samples browser to include ActionBarCompat samples
Change-Id: I4bf39042db2bfef3ed538280f6fc533a7a379882
2013-11-21 15:45:13 -08:00
Mindy Pereira
8ca83ba6d3 am 279ed15a: am fd2db1be: Merge "Swiperefresh sample" into klp-ub-dev
* commit '279ed15a7f654e358ff572538c160fe7f896be42':
  Swiperefresh sample
2013-11-19 17:28:24 -08:00
Mindy Pereira
279ed15a7f am fd2db1be: Merge "Swiperefresh sample" into klp-ub-dev
* commit 'fd2db1bef161e8bc7eda014f3924009330a9ab44':
  Swiperefresh sample
2013-11-19 17:26:01 -08:00
Mindy Pereira
fd2db1bef1 Merge "Swiperefresh sample" into klp-ub-dev 2013-11-20 01:23:57 +00:00
Mindy Pereira
18152c7cea Swiperefresh sample
Change-Id: Ifc5736c91e61b592a010bd212752347e141849cc
2013-11-19 17:14:06 -08:00
Joe Fernandez
54ec4ff7df am becd685b: am 4233252a: Sample code for OpenGL Android training class
* commit 'becd685b66f349063f642e2292d21d22d0964ba1':
  Sample code for OpenGL Android training class
2013-11-15 11:59:36 -08:00
Joe Fernandez
becd685b66 am 4233252a: Sample code for OpenGL Android training class
* commit '4233252af95fe9f12c47fdde92ea4718b3334108':
  Sample code for OpenGL Android training class
2013-11-15 19:56:27 +00:00
Joe Fernandez
4233252af9 Sample code for OpenGL Android training class
( Original Id: Ib1650025a3c4b018c60d70ede3f25113660f68d8 )

Change-Id: I1d760b75d1f2bfe1ec90c71471867577bd146241
(cherry picked from commit 66f6fe6633)
2013-11-15 19:15:57 +00:00
Jeff Sharkey
eabf753ff6 am f652b217: am f7ca56e8: am b4b28f87: Only enable VaultProvider on KitKat devices.
* commit 'f652b2178458faaea431bceded58a0656084292c':
  Only enable VaultProvider on KitKat devices.
2013-11-13 18:44:09 -08:00
Jeff Sharkey
f652b21784 am f7ca56e8: am b4b28f87: Only enable VaultProvider on KitKat devices.
* commit 'f7ca56e83df39502b603ecdaa4ca12fd0afef733':
  Only enable VaultProvider on KitKat devices.
2013-11-13 14:51:57 -08:00
Jeff Sharkey
f7ca56e83d am b4b28f87: Only enable VaultProvider on KitKat devices.
* commit 'b4b28f87362f2f910042fceb0ea274d4d98028b7':
  Only enable VaultProvider on KitKat devices.
2013-11-13 14:48:21 -08:00
Jeff Sharkey
b4b28f8736 Only enable VaultProvider on KitKat devices.
Otherwise the app would crash when starting on pre-KK devices missing
the parent class.

Bug: 11670294
Change-Id: I6fc843ba9d525265a4aaad6e8896a3e66d577d1f
2013-11-13 14:33:04 -08:00
Jeff Sharkey
3cb41832c3 am f191627b: am 39b80a76: am c21b79e2: Fix build breakage.
* commit 'f191627b9f1b0e5fde1811e86afb9f5616802d75':
  Fix build breakage.
2013-11-13 00:35:01 -08:00
Jeff Sharkey
f191627b9f am 39b80a76: am c21b79e2: Fix build breakage.
* commit '39b80a765cda05173bc04af8f3d9ebda6e8b98a0':
  Fix build breakage.
2013-11-13 00:32:55 -08:00
Jeff Sharkey
39b80a765c am c21b79e2: Fix build breakage.
* commit 'c21b79e22d1e9ad2384844fdaa4b0c2b5945e914':
  Fix build breakage.
2013-11-13 00:29:39 -08:00
Jeff Sharkey
c21b79e22d Fix build breakage.
Change-Id: I82216379660604eedcd22b22536b385b8aa18c48
2013-11-13 00:24:12 -08:00
Jeff Sharkey
dc952dcb4d am fe06414a: am b09a66d2: am 93de4115: Vault example documents provider.
* commit 'fe06414ae7d574653cca17e8a7453696042ba3bb':
  Vault example documents provider.
2013-11-12 23:49:44 -08:00
Jeff Sharkey
fe06414ae7 am b09a66d2: am 93de4115: Vault example documents provider.
* commit 'b09a66d28e21fc019ea0a88fa57ce5f3c54e710a':
  Vault example documents provider.
2013-11-12 23:45:33 -08:00
Jeff Sharkey
b09a66d28e am 93de4115: Vault example documents provider.
* commit '93de41153819ff3e64f5e6cc8ec0fabd529503eb':
  Vault example documents provider.
2013-11-12 23:41:38 -08:00
Jeff Sharkey
93de411538 Vault example documents provider.
Example provider that encrypts both metadata and contents of
documents stored inside.  It shows advanced usage of new storage
access APIs and hardware-backed key chain.

Change-Id: I2cdf4e949be8471c3d8b4f45ec0681c9248ea09c
2013-11-12 16:00:23 -08:00
Adam Koch
071913567c am a36818f4: am 0c9bfb30: am 8180be14: Bitmapfun Sample: Minor updates/fixes.
* commit 'a36818f44cee8f06c990429cafad260f5df796ae':
  Bitmapfun Sample: Minor updates/fixes.
2013-11-12 11:57:43 -08:00
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