LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,948 Commits 2 Branches 0 Tags
9d5635501a9fdf2f9ef5b51a4be021622f2f9a67
Commit Graph

1876 Commits

Author SHA1 Message Date
Trevor Johns
9d5635501a Merge "Align "from code" parent-child preference flow with "from XML"" 2014-03-11 19:52:17 +00:00
Nick Kralevich
720b4e94e5 Fix build 
This was broken due to 390ec00c6693fb20004f357901beae919a79329f
in frameworks/base

Change-Id: Ieaff5f34ef56efdd492af2f2e7c2294448223616
 2014-02-03 15:25:34 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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