Xavier Ducrohet
6c99a05152
am 9e914e4a: Reorder the samples packaging + readme.
...
Merge commit '9e914e4aa2075a38d76048261808a9a3a3036eb5' into gingerbread-plus-aosp
* commit '9e914e4aa2075a38d76048261808a9a3a3036eb5':
Reorder the samples packaging + readme.
2010-10-13 14:22:51 -07:00
Xavier Ducrohet
9e914e4aa2
Reorder the samples packaging + readme.
...
Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177
2010-10-13 13:38:45 -07:00
Kenny Root
d5e77d5e56
am 3ceb9b53: Merge "Update OBB sample to revised API" into gingerbread
...
Merge commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd' into gingerbread-plus-aosp
* commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd':
Update OBB sample to revised API
2010-10-11 17:31:13 -07:00
Kenny Root
a2f69539af
Update OBB sample to revised API
...
Change-Id: Idc724170a9cbb6a94523b406b8a1f91fcf8293a4
2010-10-11 17:25:23 -07:00
Dianne Hackborn
efddd2c5b2
am 8bcb38f3: Merge "New API demo showing different screen orientation options." into gingerbread
...
Merge commit '8bcb38f3d49d0fdefd51546ada4232203fc606cf' into gingerbread-plus-aosp
* commit '8bcb38f3d49d0fdefd51546ada4232203fc606cf':
New API demo showing different screen orientation options.
2010-10-04 14:58:44 -07:00
Dianne Hackborn
bf895af17d
New API demo showing different screen orientation options.
...
Change-Id: I75b206f86ee87b50cccc5e23140d55bd566781cd
2010-10-02 16:56:56 -07:00
Jeff Brown
284e195427
resolved conflicts for merge of 4110368b to gingerbread-plus-aosp
...
Change-Id: I6a75675ffcb4d9bcb1b7d321a4934b3e3fcca137
2010-10-01 10:42:11 -07:00
Jeff Brown
4110368b93
Merge "Improve touch paint sample to use geometrical touch width." into gingerbread
2010-09-30 15:58:59 -07:00
Jeff Brown
fc1ee06369
Improve touch paint sample to use geometrical touch width.
...
Added multitouch support.
Fixed the trackball based drawing.
Change-Id: I15d9c5c4ac26a83f476f98c1f2ef3a5841e2ffbd
2010-09-30 15:32:28 -07:00
Kenny Root
e575be05fd
am 12c86756: Merge "Add OBB usage example" into gingerbread
...
Merge commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d' into gingerbread-plus-aosp
* commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d':
Add OBB usage example
2010-09-30 10:09:11 -07:00
Kenny Root
b9e80e74e2
Add OBB usage example
...
Change-Id: I7da5ac0009cb32829e7c6470c0a60ebff2988905
2010-09-29 16:18:08 -07:00
Megha Joshi
292096fccd
am 3471dafa: am 42d3a4ae: Adding CrossCompatibility sample app.
...
Merge commit '3471dafa11b721ae4510cb182e3d54033faed12d' into gingerbread-plus-aosp
* commit '3471dafa11b721ae4510cb182e3d54033faed12d':
Adding CrossCompatibility sample app.
2010-09-13 17:43:01 -07:00
Megha Joshi
3471dafa11
am 42d3a4ae: Adding CrossCompatibility sample app.
...
Merge commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226' into gingerbread
* commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226':
Adding CrossCompatibility sample app.
2010-09-13 17:38:43 -07:00
Megha Joshi
42d3a4ae14
Adding CrossCompatibility sample app.
...
Change-Id: I565584ea53212f61a9fbbb44e50da59f4ba06fff
2010-09-13 17:00:10 -07:00
Vairavan Srinivasan
3d925ea9e8
am 50d579d0: GlobalTime: Perform Zoom In and Out only after initialization
...
Merge commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843' into gingerbread-plus-aosp
* commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843':
GlobalTime: Perform Zoom In and Out only after initialization
2010-09-10 15:41:59 -07:00
Jeff Brown
2073f44b8f
am ff242db8: Merge "Add samples for secure views." into gingerbread
...
Merge commit 'ff242db8670695e946400d957a82d2933e7e01a1' into gingerbread-plus-aosp
* commit 'ff242db8670695e946400d957a82d2933e7e01a1':
Add samples for secure views.
2010-09-08 11:57:59 -07:00
Vairavan Srinivasan
50d579d0ec
GlobalTime: Perform Zoom In and Out only after initialization
...
Invoking zoom on mGLView before initialization causes Null pointer
exception. The usecase is to launch global time and immediately
press key 2 or 8 (just before the globe is seen on display).
Change-Id: I10e7736527a934029364c9c83f147f94574f5488
2010-09-07 19:13:46 -07:00
Jeff Brown
cf4db94885
Add samples for secure views.
...
Change-Id: Ibe1e63c87f4c6a715009f7bbcdafa552dc2d937c
2010-09-07 13:04:15 -07:00
Dianne Hackborn
84d495af1b
am 23bff5dd: Add API demo for picking a contact with a permission grant.
...
Merge commit '23bff5dd80c782ac6d4f67caa57230f265fca77e' into gingerbread-plus-aosp
* commit '23bff5dd80c782ac6d4f67caa57230f265fca77e':
Add API demo for picking a contact with a permission grant.
2010-09-02 14:49:25 -07:00
Dianne Hackborn
23bff5dd80
Add API demo for picking a contact with a permission grant.
...
Change-Id: I9b0659e18afb19f8050cb77104c41ea291a9e3c7
2010-09-02 11:21:05 -07:00
Jean-Baptiste Queru
85173cc08a
am be97ad65: Merge "Replaced deprecated Contacts Api with ContactsContract"
...
Merge commit 'be97ad655dedb392caa06ccc6c528b37ba5169fb' into gingerbread-plus-aosp
* commit 'be97ad655dedb392caa06ccc6c528b37ba5169fb':
Replaced deprecated Contacts Api with ContactsContract
2010-08-30 10:25:04 -07:00
Jean-Baptiste Queru
be97ad655d
Merge "Replaced deprecated Contacts Api with ContactsContract"
2010-08-30 09:04:19 -07:00
Dianne Hackborn
1f40b600a8
am 562306ec: Fix build.
...
Merge commit '562306ecd83526a81aed41ff1db2625d7d3ab271' into gingerbread-plus-aosp
* commit '562306ecd83526a81aed41ff1db2625d7d3ab271':
Fix build.
2010-08-27 17:03:48 -07:00
Dianne Hackborn
562306ecd8
Fix build.
...
Change-Id: Ic030f82e79981792dc3116d318e217ab81ecea3b
2010-08-27 17:00:52 -07:00
Derek Sollenberger
131bf0b09e
am 704da604: Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
...
Merge commit '704da60406d259c5a3bfe273755861f80575d7ca' into gingerbread-plus-aosp
* commit '704da60406d259c5a3bfe273755861f80575d7ca':
Disable Proguard for the SampleBrowerPlugin
2010-08-27 07:45:43 -07:00
Derek Sollenberger
704da60406
Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
2010-08-27 07:43:54 -07:00
Derek Sollenberger
48c0834ab5
Disable Proguard for the SampleBrowerPlugin
...
The native plugin library makes calls into java files that are
not often stripped out when Proguard optimizes the package.
Change-Id: I6ce8867dc9fa23e8a6adcc8daf9c8fb75f83c16d
2010-08-27 10:40:51 -04:00
Dianne Hackborn
1cb87dac33
am 4f410fb5: Update to follow API.
...
Merge commit '4f410fb5bfe0bad4760610b771edb33300470041' into gingerbread-plus-aosp
* commit '4f410fb5bfe0bad4760610b771edb33300470041':
Update to follow API.
2010-08-26 14:46:30 -07:00
Dianne Hackborn
4f410fb5bf
Update to follow API.
...
Change-Id: I9d6a1dc64cd4e55bf68994784c4a724aeafd7857
2010-08-26 14:38:20 -07:00
Mathias Agopian
5b8ec51113
am b5c4c9e2: don\'t strip resources so it work on all devices
...
Merge commit 'b5c4c9e266c13bbd32a36f553ad0089ccedd6dc1' into gingerbread-plus-aosp
* commit 'b5c4c9e266c13bbd32a36f553ad0089ccedd6dc1':
don't strip resources so it work on all devices
2010-08-18 13:37:58 -07:00
Mathias Agopian
b5c4c9e266
don't strip resources so it work on all devices
...
Change-Id: Ifc6be52151fcdecd0f8f622c7312ffa0ac4705e9
2010-08-17 20:04:34 -07:00
Svetoslav Ganov
b07724366e
am 4b06026c: am 9f93186b: Adding a sample accessibility service
...
Merge commit '4b06026cb901d4a032ecc731a835767ff1bf27fe' into gingerbread-plus-aosp
* commit '4b06026cb901d4a032ecc731a835767ff1bf27fe':
Adding a sample accessibility service
2010-08-17 10:48:34 -07:00
Svetoslav Ganov
4b06026cb9
am 9f93186b: Adding a sample accessibility service
...
Merge commit '9f93186beae13ea057a4b2e867928b357cd650a4' into gingerbread
* commit '9f93186beae13ea057a4b2e867928b357cd650a4':
Adding a sample accessibility service
2010-08-17 10:45:23 -07:00
Mathias Agopian
9cd582f8cb
am a37be42f: Reformat to Android style guidelines
...
Merge commit 'a37be42f9f4d0f54f8ff10524ee023177f0b7990' into gingerbread-plus-aosp
* commit 'a37be42f9f4d0f54f8ff10524ee023177f0b7990':
Reformat to Android style guidelines
2010-08-16 16:54:37 -07:00
Mathias Agopian
056fe7952e
am a7c85d92: Take screen rotation into account
...
Merge commit 'a7c85d92351070605b93176c1f691f4f80321ad5' into gingerbread-plus-aosp
* commit 'a7c85d92351070605b93176c1f691f4f80321ad5':
Take screen rotation into account
2010-08-16 16:54:33 -07:00
Mathias Agopian
a37be42f9f
Reformat to Android style guidelines
...
Change-Id: Ib9d7e39464a246dbaae38e00fbb325f153f89f65
2010-08-16 16:13:24 -07:00
Mathias Agopian
a7c85d9235
Take screen rotation into account
...
Change-Id: I354c58eb1d28552d46b8fa269e12c00eaf6cbb99
2010-08-16 12:55:18 -07:00
Svetoslav Ganov
9f93186bea
Adding a sample accessibility service
...
Change-Id: I5bd42157e263aac6d7a85db090319db168dea2fd
2010-08-11 14:45:56 -07:00
Mathias Agopian
f83e92e078
am 4619318d: Merge "Sample code to illustrate how to use the accelerometer" into gingerbread
...
Merge commit '4619318dd1398bd4f87b2e74827b9fb9796a2643' into gingerbread-plus-aosp
* commit '4619318dd1398bd4f87b2e74827b9fb9796a2643':
Sample code to illustrate how to use the accelerometer
2010-07-14 16:36:10 -07:00
Mathias Agopian
c29f1d199f
Sample code to illustrate how to use the accelerometer
...
this is a small particle + physics system that shows how
to integrate accleration data into positions accurately.
Change-Id: I3bbdc433f52d98464269ac8cb996c4cf037ae8d6
2010-07-13 22:51:23 -07:00
Dianne Hackborn
349d745308
am 98b2c359: Copy over updated NDK APIs and follow other API changes.
...
Merge commit '98b2c359c2b3361f43e14b0c5d07a02c055dd10e' into gingerbread-plus-aosp
* commit '98b2c359c2b3361f43e14b0c5d07a02c055dd10e':
Copy over updated NDK APIs and follow other API changes.
2010-07-13 18:55:43 -07:00
Dianne Hackborn
98b2c359c2
Copy over updated NDK APIs and follow other API changes.
...
Change-Id: Ifec95268c9ade21963eea13357ec2f56fd7968c2
2010-07-13 18:45:52 -07:00
The Android Open Source Project
b9588806a6
merge from open-source master
...
Change-Id: I01fc38c3021027fcc3a3cea79b1c6564913caa9f
2010-07-02 11:43:17 -07:00
Christian Mehlmauer
3eda8fc385
Cleaned up LunarLander sample
...
Change-Id: If2cc44c8312cebce170d07c34c64ea2ce1e5b7ab
2010-07-02 16:20:49 +02:00
Christian Mehlmauer
3a3e3ab2df
Replaced deprecated Contacts Api with ContactsContract
...
Change-Id: I4816781c7b48b27ec64a63d51db02646c3d6c1a5
2010-06-25 18:39:40 +02:00
Scott Main
109bc31187
am e660fef5: am 81b9c9d8: docs: fix doc link bug
...
Merge commit 'e660fef5523dc8ac3ee57fb4503ca53b922a531d' into gingerbread-plus-aosp
* commit 'e660fef5523dc8ac3ee57fb4503ca53b922a531d':
docs: fix doc link bug
2010-06-22 18:43:35 -07:00
Scott Main
e655ff2ce1
am 81b9c9d8: docs: fix doc link bug
...
Merge commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590' into froyo-plus-aosp
* commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590':
docs: fix doc link bug
2010-06-22 18:42:23 -07:00
Scott Main
e660fef552
am 81b9c9d8: docs: fix doc link bug
...
Merge commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590' into gingerbread
* commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590':
docs: fix doc link bug
2010-06-22 18:41:36 -07:00
Scott Main
81b9c9d8ea
docs: fix doc link bug
...
bug: 2788457
Change-Id: Ia4ad8cfcee24db2e7cb509952c606508c2fd01c9
2010-06-22 10:38:04 -07:00
The Android Open Source Project
8467544d4c
merge from froyo-plus-aosp
...
Change-Id: I1f4c76c89aad748b006cfc1370a767782e4ca3e7
2010-06-14 11:28:22 -07:00