LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,396 Commits 2 Branches 0 Tags
3b10d94a49dc5ed85985846653ea96ec2da60f1f
Commit Graph

168 Commits

Author SHA1 Message Date
Daniel Sandler
26d17bc870 am b4e1e2e2: am 6f53211d: Merge change Ie022d478 into eclair 
Merge commit 'b4e1e2e24c48c0a90bc4645113b164b419f31aa9'

* commit 'b4e1e2e24c48c0a90bc4645113b164b419f31aa9':
  hdpi artwork for development/{apps,samples}.
 2009-10-01 11:44:06 -07:00
Daniel Sandler
b4e1e2e24c am 6f53211d: Merge change Ie022d478 into eclair 
Merge commit '6f53211d6d9095c67107ac72def6d405e33b7fac' into eclair-plus-aosp

* commit '6f53211d6d9095c67107ac72def6d405e33b7fac':
  hdpi artwork for development/{apps,samples}.
 2009-09-29 18:01:01 -07:00
Daniel Sandler
75ab82e25f hdpi artwork for development/{apps,samples}. 
(drop dated 29-Sep-2009)

Change-Id: Ie022d478ed4eafc641e475dad94f507a6c358595
 2009-09-29 20:41:24 -04:00
Jean-Michel Trivi
481fc7807a am 2296cfbd: am 8c77415e: Merge change Ic94b435b into eclair 
Merge commit '2296cfbd37e696bd32e92c88a30dd290c7470018'

* commit '2296cfbd37e696bd32e92c88a30dd290c7470018':
  Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
 2009-09-29 11:10:58 -07:00
Jean-Michel Trivi
2296cfbd37 am 8c77415e: Merge change Ic94b435b into eclair 
Merge commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87' into eclair-plus-aosp

* commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87':
  Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
 2009-09-28 15:23:31 -07:00
Jean-Michel Trivi
c94b435b86 Fix bug 2142296 where the user couldn't back out of the JetBoy demo. 
The application was trapping the key up event on the back key. It
worked on Donut because the framework implemented the "back" behavior
on the key down. The fix consists in sending the key up event on the
back button to the Activity class.
 2009-09-28 15:06:25 -07:00
Dianne Hackborn
e78ac99cc0 am 83f37133: am bad9ac7f: Merge change 27163 into eclair 
Merge commit '83f3713356c2669ed839e5521ff772c18746c856'

* commit '83f3713356c2669ed839e5521ff772c18746c856':
  Add transition animation sample, log to service sample.
 2009-09-27 15:41:44 -07:00
Dianne Hackborn
83f3713356 am bad9ac7f: Merge change 27163 into eclair 
Merge commit 'bad9ac7f373f5585ee6e43926b21c470d07663f8' into eclair-plus-aosp

* commit 'bad9ac7f373f5585ee6e43926b21c470d07663f8':
  Add transition animation sample, log to service sample.
 2009-09-25 16:20:56 -07:00
Dianne Hackborn
cfc90dc1aa Add transition animation sample, log to service sample. 
Change-Id: I7021a7fbbe26d9c52699d7c2216452a5bd51452b
 2009-09-25 16:10:42 -07:00
Raphael
e9917eb019 am 3776994c: am a5115b64: Merge change 26885 into eclair 
Merge commit '3776994ce00c8f2423a7eb94641fb7c8a025a331'

* commit '3776994ce00c8f2423a7eb94641fb7c8a025a331':
  Tell the SDK that ApiDemoes requires Eclair preview.
 2009-09-25 11:13:27 -07:00
Piotr Gurgul
5b47911df6 am 284e84b6: am 95a32505: Merge change 26649 into eclair 
Merge commit '284e84b677f0e8588bf5d3ebc44b615d922b493f'

* commit '284e84b677f0e8588bf5d3ebc44b615d922b493f':
  Define tested.project.dir property for existing samples
 2009-09-25 10:54:06 -07:00
Raphael
3776994ce0 am a5115b64: Merge change 26885 into eclair 
Merge commit 'a5115b646e651228566b3a2823260cd7f70a882c' into eclair-plus-aosp

* commit 'a5115b646e651228566b3a2823260cd7f70a882c':
  Tell the SDK that ApiDemoes requires Eclair preview.
 2009-09-24 16:14:13 -07:00
Raphael
50dc6c7556 Tell the SDK that ApiDemoes requires Eclair preview. 
After the preview we'll change it to the final API level.

BUG 2141157
 2009-09-24 11:52:40 -07:00
Piotr Gurgul
284e84b677 am 95a32505: Merge change 26649 into eclair 
Merge commit '95a32505be164e0424d01fdd2b06c04cd54e6f06' into eclair-plus-aosp

* commit '95a32505be164e0424d01fdd2b06c04cd54e6f06':
  Define tested.project.dir property for existing samples
 2009-09-23 15:38:33 -07:00
Piotr Gurgul
979d5abe06 Define tested.project.dir property for existing samples 
As now test projects are recognized by presence of the property
tested.project.dir, it has been manually added for existing
test project samples.
 2009-09-23 12:15:05 -07:00
Derek Sollenberger
71e02ae249 am f7d831e8: am 4a9200d0: renaming setJavaClassName to setPluginStubJavaClassName 
Merge commit 'f7d831e876c1135b1fc73058358ce3dfb61ca304'

* commit 'f7d831e876c1135b1fc73058358ce3dfb61ca304':
  renaming setJavaClassName to setPluginStubJavaClassName
 2009-09-21 10:53:18 -07:00
Derek Sollenberger
f7d831e876 am 4a9200d0: renaming setJavaClassName to setPluginStubJavaClassName 
Merge commit '4a9200d0945cd5eb4cfe7a8721c70eeec67e528e' into eclair-plus-aosp

* commit '4a9200d0945cd5eb4cfe7a8721c70eeec67e528e':
  renaming setJavaClassName to setPluginStubJavaClassName
 2009-09-21 10:42:56 -07:00
Derek Sollenberger
4a9200d094 renaming setJavaClassName to setPluginStubJavaClassName 
Change-Id: I1a962ed93e27615611a248b8791d3392ba36df1e
 2009-09-21 09:15:38 -04:00
Patrick Scott
0f21d65744 am 967b58be: am 107621ad: Merge change 25538 into eclair 
Merge commit '967b58bed382c3b096e65e8ac7f943c12c96bdb4'

* commit '967b58bed382c3b096e65e8ac7f943c12c96bdb4':
  Do not install libsampleplugin by default.
 2009-09-17 13:20:14 -07:00
Patrick Scott
967b58bed3 am 107621ad: Merge change 25538 into eclair 
Merge commit '107621ad3120121bfd0eec59f2069995fbe27b0b' into eclair-plus-aosp

* commit '107621ad3120121bfd0eec59f2069995fbe27b0b':
  Do not install libsampleplugin by default.
 2009-09-17 13:09:39 -07:00
Patrick Scott
4a8c3bf380 Do not install libsampleplugin by default. 
This avoids installing the library during a normal build. When building
SampleBrowserPlugin, the library will be packaged in the apk.
 2009-09-17 15:07:35 -04:00
Derek Sollenberger
cc2e456256 am 4ccb60a8: am 33769eea: Merge change 24203 into eclair 
Merge commit '4ccb60a894badfea7365e43ac87ba63e20fb5bdd'

* commit '4ccb60a894badfea7365e43ac87ba63e20fb5bdd':
  Updating samplePlugin to use java surface views.
 2009-09-17 09:46:02 -07:00
Derek Sollenberger
c99110c936 am 33b4efa5: am 3b3de839: Merge change 23489 into eclair 
Merge commit '33b4efa5cbf3928cddacf3f45e596a05dc256ab3'

* commit '33b4efa5cbf3928cddacf3f45e596a05dc256ab3':
  adding support for plugins to use the java view system.
 2009-09-17 09:45:58 -07:00
Derek Sollenberger
4ccb60a894 am 33769eea: Merge change 24203 into eclair 
Merge commit '33769eea082e0fece00f9cc16995f1edba5bfeb0' into eclair-plus-aosp

* commit '33769eea082e0fece00f9cc16995f1edba5bfeb0':
  Updating samplePlugin to use java surface views.
 2009-09-15 17:13:09 -07:00
Derek Sollenberger
33b4efa5cb am 3b3de839: Merge change 23489 into eclair 
Merge commit '3b3de83970037c9fec707dbdb06af2835b9f5913' into eclair-plus-aosp

* commit '3b3de83970037c9fec707dbdb06af2835b9f5913':
  adding support for plugins to use the java view system.
 2009-09-15 17:13:05 -07:00
Derek Sollenberger
08581f1c06 Updating samplePlugin to use java surface views. 
Change-Id: I1b925ce3a6aeb0bd5464a7d5711449029944d7de
 2009-09-15 19:31:43 -04:00
Derek Sollenberger
16ce3cdcac adding support for plugins to use the java view system. 
Change-Id: I7305300dfc09e3e0968a1e61c21a6a2cdb983594
 2009-09-15 19:31:43 -04:00
Eric Fischer
9e688ef136 am 9f742986: am 0c12e21a: Merge change 23532 into eclair 
Merge commit '9f742986117baf8d365b8938baec57ccf499041a'

* commit '9f742986117baf8d365b8938baec57ccf499041a':
  Add backslashes before apostrophes so they don't get lost.
 2009-09-01 17:35:48 -07:00
Eric Fischer
9f74298611 am 0c12e21a: Merge change 23532 into eclair 
Merge commit '0c12e21a3152b62fb330c86b5ea544e927300608' into eclair-plus-aosp

* commit '0c12e21a3152b62fb330c86b5ea544e927300608':
  Add backslashes before apostrophes so they don't get lost.
 2009-09-01 17:33:25 -07:00
Eric Fischer
2528f77daa Add backslashes before apostrophes so they don't get lost. 
This is required by another change I am about to submit that makes it
an error not to include the backslash, since it is inevitably a mistake
when someone fails to include it.
 2009-09-01 15:42:46 -07:00
Jean-Baptiste Queru
da29b263fe am 9dc454b1: merge from open-source master 
Merge commit '9dc454b1b175af7f94b264295165d84e0abc8f80'

* commit '9dc454b1b175af7f94b264295165d84e0abc8f80':
  Updated to better distinguish between options and operands
  Enhancement: ApiDemos - App - Dialog - AlertDialog with MultipleChoices backed by Cursor
 2009-09-01 12:14:06 -07:00
Jean-Baptiste Queru
9dc454b1b1 merge from open-source master 2009-09-01 08:27:45 -07:00
Scott Main
8b1558c551 am 38b43f9c: am 50992e80: docs only. add a homepage for the searchable dictionary sample app. and make all urls relative 
Merge commit '38b43f9cdac13f018bf23908d02d087b66643af6'

* commit '38b43f9cdac13f018bf23908d02d087b66643af6':
  docs only.
 2009-08-31 19:41:04 -07:00
Scott Main
38b43f9cda am 50992e80: docs only. add a homepage for the searchable dictionary sample app. and make all urls relative 
Merge commit '50992e805e758e2231f28ec2127b57a1a9fd0ddc' into eclair

* commit '50992e805e758e2231f28ec2127b57a1a9fd0ddc':
  docs only.
 2009-08-31 19:36:23 -07:00
Scott Main
50992e805e docs only. 
add a homepage for the searchable dictionary sample app.
and make all urls relative
 2009-08-31 15:22:28 -07:00
Mike LeBeau
2fecbd9275 am 83e2eae3: Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box. 
Merge commit '83e2eae3fbb54cb284e96a8ce3f658f4dadba172'

* commit '83e2eae3fbb54cb284e96a8ce3f658f4dadba172':
  Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box.
 2009-08-28 10:58:51 -07:00
Mike LeBeau
83e2eae3fb Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box. 
This reverts commit 3e83e8bc8b.
 2009-08-28 10:42:04 -07:00
Mike LeBeau
67545123a4 Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box. 
This reverts commit 3e83e8bc8b.
 2009-08-28 10:35:46 -07:00
Dianne Hackborn
f43e9dcf73 am b8ff7ade: Add sample of correctly requesting camera feature, optional shared lib. 
Merge commit 'b8ff7ade6966ecef0ee25441381b9604b0ca09bc'

* commit 'b8ff7ade6966ecef0ee25441381b9604b0ca09bc':
  Add sample of correctly requesting camera feature, optional shared lib.
 2009-08-27 22:20:20 -07:00
Dianne Hackborn
b8ff7ade69 Add sample of correctly requesting camera feature, optional shared lib. 
Change-Id: I5697e70cedeba9de6458caf50a363057278a7387
 2009-08-27 20:13:19 -07:00
Muthu Ramadoss
8f5361ba0d Enhancement: ApiDemos - App - Dialog - AlertDialog with MultipleChoices backed by Cursor 
Added an example for using AlertDialog in Multichoice mode backed up by Cursor. This example can be used to test the following bug: http://code.google.com/p/android/issues/detail?id=955

AMEND:
	Added a Toast to display readonly status of cursor, so data will not be updated.
	Removed empty code blocks, which did nothing.
 2009-08-26 08:48:03 -07:00
Dianne Hackborn
8c9213216d am 945b2362: Update sample code for new service semantics. 
Merge commit '945b2362908e9f08e252d63f564d17c044527632'

* commit '945b2362908e9f08e252d63f564d17c044527632':
  Update sample code for new service semantics.
 2009-08-24 17:07:29 -07:00
Dianne Hackborn
945b236290 Update sample code for new service semantics. 2009-08-24 16:28:39 -07:00
Scott Main
f063d92183 am 1ef50a9d: am 04680858: docs only. Add new web pages for sample apps included in the SDK. Revise the existing sample app web pages. Delete screenshots for notepad and lunar lander (these have moved into frameworks/base/docs/html/guide/samples/image/. 
Merge commit '1ef50a9d953ead7fd13693965f9644d3582ad16e'

* commit '1ef50a9d953ead7fd13693965f9644d3582ad16e':
  docs only.
 2009-08-24 16:25:06 -07:00
Scott Main
1ef50a9d95 am 04680858: docs only. Add new web pages for sample apps included in the SDK. Revise the existing sample app web pages. Delete screenshots for notepad and lunar lander (these have moved into frameworks/base/docs/html/guide/samples/image/. 
Merge commit '04680858a0671ad615f088edeea87b61ea243f24' into eclair

* commit '04680858a0671ad615f088edeea87b61ea243f24':
  docs only.
 2009-08-24 16:20:14 -07:00
Scott Main
04680858a0 docs only. 
Add new web pages for sample apps included in the SDK.
Revise the existing sample app web pages.
Delete screenshots for notepad and lunar lander (these have
moved into frameworks/base/docs/html/guide/samples/image/.
 2009-08-24 15:27:00 -07:00
Xavier Ducrohet
ffbab142a9 am 53b3190a: am e95a86cf: Merge change 22346 into donut 
Merge commit '53b3190a47434a324eb352cdb95d61b252d1ed5a'

* commit '53b3190a47434a324eb352cdb95d61b252d1ed5a':
  Fix target for ApiDemos (API is now 4)
 2009-08-22 07:50:28 -07:00
Xavier Ducrohet
53b3190a47 am e95a86cf: Merge change 22346 into donut 
Merge commit 'e95a86cfec18836ddbff149690a13766bfc9ada3' into eclair

* commit 'e95a86cfec18836ddbff149690a13766bfc9ada3':
  Fix target for ApiDemos (API is now 4)
 2009-08-22 07:44:12 -07:00
Android (Google) Code Review
e95a86cfec Merge change 22346 into donut 
* changes:
  Fix target for ApiDemos (API is now 4)
 2009-08-21 16:08:11 -07:00
Xavier Ducrohet
c86903288c Fix target for ApiDemos (API is now 4) 
Also add some progress output to the ant rules.
 2009-08-21 15:59:02 -07:00