LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,510 Commits 2 Branches 0 Tags
3451f2e235a6842a2396daac27b4ab21cb151811
Commit Graph

1258 Commits

Author SHA1 Message Date
Dianne Hackborn
2086587ba4 Update sample admin with a description to uses-policies info. 2010-01-26 12:28:25 -08:00
Dirk Dougherty
07b5c3bdb7 am c220077d: Merge "SDK doc change: Misc fixes." into eclair 
Merge commit 'c220077d52972356ff30d46d47def7669731f0d7' into eclair-plus-aosp

* commit 'c220077d52972356ff30d46d47def7669731f0d7':
  SDK doc change: Misc fixes.
 2010-01-22 16:49:51 -08:00
Dirk Dougherty
c220077d52 Merge "SDK doc change: Misc fixes." into eclair 2010-01-22 16:45:03 -08:00
Dirk Dougherty
e096b94573 SDK doc change: Misc fixes. 
Bug: 2160782
Change-Id: I44d1d9687df45dae40a6922a37e6b410cc2de835
 2010-01-22 15:18:15 -08:00
Xavier Ducrohet
5f063195d6 Move SDK files to froyo. 
Change-Id: I55a5cb149982f1f30dc513ff018d8630d6513592
 2010-01-22 14:46:05 -08:00
Dianne Hackborn
cc4ee91892 Start implementing UI for changing requested policies. 2010-01-21 14:30:29 -08:00
Derek Sollenberger
4fe6d38a68 Removing unused parameter from NP_Initialize. 2010-01-21 15:04:58 -05:00
Dianne Hackborn
877103b3f1 Merge "Initial sample code for writing a device policy." 2010-01-17 15:18:42 -08:00
Dianne Hackborn
c86ba3199d Initial sample code for writing a device policy. 2010-01-16 18:01:37 -08:00
Derek Sollenberger
1645f9cab0 am aebdb460: am 1bc5ab62: Adding a new sub-plugin that gives visual feedback for navigation keys. 
Merge commit 'aebdb4608541e3ffb158283bbc249b586ad9aa8f'

* commit 'aebdb4608541e3ffb158283bbc249b586ad9aa8f':
  Adding a new sub-plugin that gives visual feedback for navigation keys.
 2010-01-14 11:31:00 -08:00
Derek Sollenberger
aebdb46085 am 1bc5ab62: Adding a new sub-plugin that gives visual feedback for navigation keys. 
Merge commit '1bc5ab625c5ca84a3e0f240b58327d8084af22a8' into eclair-mr2-plus-aosp

* commit '1bc5ab625c5ca84a3e0f240b58327d8084af22a8':
  Adding a new sub-plugin that gives visual feedback for navigation keys.
 2010-01-14 11:23:01 -08:00
Derek Sollenberger
1bc5ab625c Adding a new sub-plugin that gives visual feedback for navigation keys. 2010-01-14 14:06:50 -05:00
Xavier Ducrohet
cd0c5185e2 am 7ae4c402: am 2f2fb96b: Make the SDK packaging put the samples in the root folder. 
Merge commit '7ae4c4026a3e0596d32983003594abb0d3df80cc'

* commit '7ae4c4026a3e0596d32983003594abb0d3df80cc':
  Make the SDK packaging put the samples in the root folder.
 2010-01-12 13:12:19 -08:00
Xavier Ducrohet
7ae4c4026a am 2f2fb96b: Make the SDK packaging put the samples in the root folder. 
Merge commit '2f2fb96b4b037a016336a98e3b637f4394e1f323' into eclair-plus-aosp

* commit '2f2fb96b4b037a016336a98e3b637f4394e1f323':
  Make the SDK packaging put the samples in the root folder.
 2010-01-12 12:46:21 -08:00
Xavier Ducrohet
2f2fb96b4b Make the SDK packaging put the samples in the root folder. 
Change-Id: Icb88f88d503de9690ba210c0bfabdc0598021860
 2010-01-12 12:32:12 -08:00
Derek Sollenberger
f0ef1b60fe Merge "resolved conflicts for merge of a85d523b to master" 2010-01-11 14:13:18 -08:00
Derek Sollenberger
b81615148c resolved conflicts for merge of a85d523b to master 2010-01-11 17:12:46 -05:00
Trevor Johns
e8ca26df95 am 7b48a646: am c7d2c458: Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair 
Merge commit '7b48a6463f960bf63f43e46900ef92bc3b867aa1'

* commit '7b48a6463f960bf63f43e46900ef92bc3b867aa1':
  Adding index file for BusinessCard sample. This will be displayed in the HTML
 2010-01-11 14:09:50 -08:00
Trevor Johns
7b48a6463f am c7d2c458: Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair 
Merge commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193' into eclair-plus-aosp

* commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193':
  Adding index file for BusinessCard sample. This will be displayed in the HTML
 2010-01-11 14:05:34 -08:00
Derek Sollenberger
a85d523be1 am d53b56d1: Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces. 
Merge commit 'd53b56d1806161bd26c2d97b9af67ef0e41f6e25' into eclair-mr2-plus-aosp

* commit 'd53b56d1806161bd26c2d97b9af67ef0e41f6e25':
  Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces.
 2010-01-11 13:10:56 -08:00
Trevor Johns
f44d1b040f Adding index file for BusinessCard sample. This will be displayed in the HTML 
documentation when this sample is selected via the Resource tab.
 2010-01-11 11:59:10 -08:00
Derek Sollenberger
d53b56d180 Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces. 2010-01-11 13:45:50 -05:00
Romain Guy
74192eafec Deprecate fill_parent and introduce match_parent. 
Bug: #2361749.
 2010-01-08 15:11:18 -08:00
Grace Kloba
8cb8766744 am 653b97e7: am a0e762ca: free the NPObject in NPP_Destroy. 
Merge commit '653b97e701546e816f75167280bf87b665a47b2c'

* commit '653b97e701546e816f75167280bf87b665a47b2c':
  free the NPObject in NPP_Destroy.
 2010-01-04 10:03:34 -08:00
Grace Kloba
653b97e701 am a0e762ca: free the NPObject in NPP_Destroy. 
Merge commit 'a0e762caeaca275ed8390e9ee1cfb5e9149e07b7' into eclair-mr2-plus-aosp

* commit 'a0e762caeaca275ed8390e9ee1cfb5e9149e07b7':
  free the NPObject in NPP_Destroy.
 2010-01-04 09:59:45 -08:00
Jack Palevich
c1645153e7 Tool for compressing/decompressing ETC1 textures. 
The ETC1 texture format is commonly supported by
OpenGL ES 2.0-capable GPUs.

For historical reasons ETC1 texture files have the
default extension .PKM

This tool relies on the libETC1 library to
compress and decompress the image data.
 2009-12-31 13:19:21 +08:00
Grace Kloba
a0e762caea free the NPObject in NPP_Destroy. 2009-12-27 14:33:09 -08:00
Jack Palevich
8e50990893 Remove unnecessary matrix stack manipulations. 
glDrawTexiOES does not use the matix stack, so no need to modify it.
 2009-12-22 18:32:05 +08:00
Grace Kloba
831940271a am 6be651ee: am 3bc69e62: Merge change Ib59457e0 into eclair-mr2 
Merge commit '6be651ee000270b56b285f60a6bda9c090cfbb9f'

* commit '6be651ee000270b56b285f60a6bda9c090cfbb9f':
  Change full screen surface to Opaque as it is required
 2009-12-16 14:24:17 -08:00
Grace Kloba
6be651ee00 am 3bc69e62: Merge change Ib59457e0 into eclair-mr2 
Merge commit '3bc69e6256b616514871276e24bf98f37b3f89ad' into eclair-mr2-plus-aosp

* commit '3bc69e6256b616514871276e24bf98f37b3f89ad':
  Change full screen surface to Opaque as it is required
 2009-12-16 14:21:19 -08:00
Grace Kloba
b59457e055 Change full screen surface to Opaque as it is required 
by the new plugin model.

Comment out the video as it is not working and causes
crash when touch.
 2009-12-16 11:38:53 -08:00
Dirk Dougherty
a276296490 Merge commit 'e897c1b4' into manualmerge 
Conflicts:
	samples/ApiDemos/src/com/example/android/apis/app/_index.html
 2009-12-15 23:27:22 -08:00
Dirk Dougherty
e897c1b428 am 1d151678: Merge change Ie8650e4b into eclair 
Merge commit '1d15167865b22730cf6ba314a057e62f960aa1db' into eclair-plus-aosp

* commit '1d15167865b22730cf6ba314a057e62f960aa1db':
  sdk doc change for esr: fix some broken links to resources files.
 2009-12-15 19:26:25 -08:00
Android (Google) Code Review
1d15167865 Merge change Ie8650e4b into eclair 
* changes:
  sdk doc change for esr: fix some broken links to resources files.
 2009-12-15 19:23:33 -08:00
Dirk Dougherty
0b1153b115 sdk doc change for esr: fix some broken links to resources files. 
Bug: 2160782
Change-Id: Ie8650e4b642a96e67a2e7e62669282bc58d414ba
 2009-12-15 18:47:00 -08:00
Trevor Johns
7a41627710 am 55d80586: am 5dba584a: Merge change Ic3464854 into eclair 
Merge commit '55d80586c76580bf6cbc00e9bd89658a72aa985b'

* commit '55d80586c76580bf6cbc00e9bd89658a72aa985b':
  Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
 2009-12-15 15:06:19 -08:00
Xavier Ducrohet
050eb28ab5 am cf4e98b2: am b84cf9e1: Clean up the SDK and make it compiled and installed in the SDK system image. 
Merge commit 'cf4e98b260230ea5d9290d2e18f37b2f3c585970'

* commit 'cf4e98b260230ea5d9290d2e18f37b2f3c585970':
  Clean up the SDK and make it compiled and installed in the SDK system image.
 2009-12-15 15:05:51 -08:00
Trevor Johns
55d80586c7 am 5dba584a: Merge change Ic3464854 into eclair 
Merge commit '5dba584a08e6d2d5c84ca971b796e053995e4214' into eclair-plus-aosp

* commit '5dba584a08e6d2d5c84ca971b796e053995e4214':
  Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
 2009-12-15 12:17:03 -08:00
Android (Google) Code Review
5dba584a08 Merge change Ic3464854 into eclair 
* changes:
  Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
 2009-12-15 12:13:54 -08:00
Xavier Ducrohet
cf4e98b260 am b84cf9e1: Clean up the SDK and make it compiled and installed in the SDK system image. 
Merge commit 'b84cf9e1e378f6cc6642b4ac3f391a85b208a23b' into eclair-plus-aosp

* commit 'b84cf9e1e378f6cc6642b4ac3f391a85b208a23b':
  Clean up the SDK and make it compiled and installed in the SDK system image.
 2009-12-15 10:33:08 -08:00
Trevor Johns
0ed0224e24 Renaming com.google.example.android.contactmanager to com.example.android.contactmanager. 2009-12-14 23:25:59 -08:00
Xavier Ducrohet
b84cf9e1e3 Clean up the SDK and make it compiled and installed in the SDK system image. 
Change-Id: I6e5f01a1cc45beada70608307f4ac38a4dcdd0b9
 2009-12-14 22:36:44 -08:00
Roman Nurik
b96f645ccb am 8b13cf63: am 70634b36: am e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup. 
Merge commit '8b13cf63d4d96e290c83a35725ff26cf2601b063'

* commit '8b13cf63d4d96e290c83a35725ff26cf2601b063':
  Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
 2009-12-11 01:38:51 -08:00
Trevor Johns
b8cd782342 am ddedf966: am 5f6b6bfb: am 0359bdb7: Merge change I2b0bb983 into eclair 
Merge commit 'ddedf9666e90cfac79c1b31ff2beaef4ad60366c'

* commit 'ddedf9666e90cfac79c1b31ff2beaef4ad60366c':
  Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
 2009-12-10 23:41:21 -08:00
Roman Nurik
8b13cf63d4 am 70634b36: am e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup. 
Merge commit '70634b3633dc2847df14db67a4e22dce5a16e45f' into eclair-mr2-plus-aosp

* commit '70634b3633dc2847df14db67a4e22dce5a16e45f':
  Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
 2009-12-10 19:54:47 -08:00
Roman Nurik
70634b3633 am e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup. 
Merge commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9' into eclair-mr2

* commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9':
  Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
 2009-12-10 19:48:38 -08:00
Trevor Johns
ddedf9666e am 5f6b6bfb: am 0359bdb7: Merge change I2b0bb983 into eclair 
Merge commit '5f6b6bfb881601bdcb65c274449ffad08df5b29b' into eclair-mr2-plus-aosp

* commit '5f6b6bfb881601bdcb65c274449ffad08df5b29b':
  Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
 2009-12-10 17:51:34 -08:00
Trevor Johns
5f6b6bfb88 am 0359bdb7: Merge change I2b0bb983 into eclair 
Merge commit '0359bdb72f3da3f319d0b3ef87a70c4f98d4154f' into eclair-mr2

* commit '0359bdb72f3da3f319d0b3ef87a70c4f98d4154f':
  Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
 2009-12-10 17:44:35 -08:00
Romain Guy
63893a62cc am 764ff751: am dcf99fbe: Merge change If4ff28ed into eclair-mr2 
Merge commit '764ff7513a47da76a59fee7c5f299afb7662aac6'

* commit '764ff7513a47da76a59fee7c5f299afb7662aac6':
  Cleanup one of the ListView sample demos.
 2009-12-10 17:14:18 -08:00
Trevor Johns
879e646757 am 19d79f2f: am 4eb4ed2d: am bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID. 
Merge commit '19d79f2fb44ce0ce48bd95f972d929910afa951c'

* commit '19d79f2fb44ce0ce48bd95f972d929910afa951c':
  Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
 2009-12-10 17:14:13 -08:00