Nick Pelly
ba29b9b177
am c2860adc: Update sample app for final GB MR API changes.
...
* commit 'c2860adcb8c8c84927bfe17fadd61b5beea61ae4':
Update sample app for final GB MR API changes.
2011-02-01 10:11:04 -08:00
Nick Pelly
c2860adcb8
Update sample app for final GB MR API changes.
...
Change-Id: Ic6b7aa2ffe88f6a9228322d41a2be391eb5bf545
2011-02-01 08:25:46 -08:00
Jeff Hamilton
28745b4ee5
am 509fbb4d: Sample code for foreground NDEF Push APIs.
...
* commit '509fbb4df3bdbc8c78614f5297459f7afe2b1ba6':
Sample code for foreground NDEF Push APIs.
2011-01-26 15:47:51 -08:00
Jeff Hamilton
509fbb4df3
Sample code for foreground NDEF Push APIs.
2011-01-26 17:41:35 -06:00
Jeff Hamilton
7a11acd92b
am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
...
* commit 'e0fbd3ffe82e6e80c6b070c3afbdb8e7fdd9bb25':
Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
2011-01-25 14:39:53 -08:00
Jeff Hamilton
e0fbd3ffe8
Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
...
Change-Id: Ic537d209b07e81e80aeca5aa3e4a63657ac6fb76
2011-01-25 16:33:33 -06:00
Jeff Hamilton
e8b4ac2e6d
am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
...
* commit 'aad3a1b7327491f29db69a4e4bf7c3791662d6b5':
Add a sample for the NFC foreground dispatch APIs.
2011-01-13 12:46:08 -08:00
Jeff Hamilton
aad3a1b732
Add a sample for the NFC foreground dispatch APIs.
...
Change-Id: Iee532d53b4d9354977414b0302b386a940606ab3
2011-01-13 14:39:58 -06:00
Mathias Agopian
9335c6b6e9
am cec3f598: Merge "Add an API demo showcasing the new rotation vector sensor" into gingerbread
...
* commit 'cec3f598e6e7e527583daae393b3d0192af77baf':
Add an API demo showcasing the new rotation vector sensor
2010-11-30 14:08:47 -08:00
Mathias Agopian
cec3f598e6
Merge "Add an API demo showcasing the new rotation vector sensor" into gingerbread
2010-11-30 14:05:20 -08:00
Anirudh Dewani
35dfdb6fc3
am dbe66332: Extended camera preview to switch between multiple available device cameras
...
* commit 'dbe66332e278962c058a596353b839a2fd6dca1b':
Extended camera preview to switch between multiple available device cameras
2010-11-29 15:54:05 -08:00
Anirudh Dewani
dbe66332e2
Extended camera preview to switch between multiple available device cameras
...
Change-Id: I8e97d6182bf02cba29ae3bc9f1a7ef21a277117e
2010-11-26 02:28:11 +05:30
Mathias Agopian
d6e9c61294
Add an API demo showcasing the new rotation vector sensor
...
Change-Id: I3f00560b0340db31779259aa98efc174b0b645cd
2010-11-24 13:53:57 -08:00
Roman Nurik
bf8c20f6f0
am bccecc2b: Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread
...
* commit 'bccecc2b871749695148a7dcf27ff5b8655a77a0':
Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)
2010-11-03 07:56:40 -07:00
Roman Nurik
bccecc2b87
Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread
2010-11-03 07:55:06 -07:00
Roman Nurik
90c1d50252
Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)
...
Change-Id: I4fa3b0aff4edfe80533066a81b0eacc97caa6f86
2010-10-26 14:04:11 -07:00
Jack Palevich
ddc73f98ca
am 902b355d: Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread
2010-10-26 10:27:09 -07:00
Jack Palevich
902b355dfc
Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread
2010-10-26 10:25:13 -07:00
Jack Palevich
9ca6f2c057
Remove unused Grid object from LabelMaker.java class.
...
Also remove unnescessary "executable" bits from a documentation file.
Change-Id: I49bf8a6f0dabece62d16956b7e02c9a846bdd69b
2010-10-25 14:03:27 -07:00
Roman Nurik
affd0f8ec3
am 83c50ca7: Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn\'t support a preview size with the same aspect ratio as the device display." into gingerbread
...
Merge commit '83c50ca740fabe25189601db90dc1f65ed4d2061' into gingerbread-plus-aosp
* commit '83c50ca740fabe25189601db90dc1f65ed4d2061':
Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display.
2010-10-25 13:55:34 -07:00
Roman Nurik
72dcdbbd09
Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display.
...
Change-Id: Ic7ccc324dfe4d46f3aeb5c7edafc7cc97a6fdc49
2010-10-22 11:30:57 -07:00
Dianne Hackborn
79ee0a9a05
am 8143be8d: Update device admin example to wipe SD card.
...
Merge commit '8143be8d0348e4918ccc75e0a44e617c295da2fc' into gingerbread-plus-aosp
* commit '8143be8d0348e4918ccc75e0a44e617c295da2fc':
Update device admin example to wipe SD card.
2010-10-16 16:55:15 -07:00
Dianne Hackborn
8143be8d03
Update device admin example to wipe SD card.
...
Change-Id: I224006f284916761578e3d04b208828f80ea3cb6
2010-10-15 18:52:33 -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
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
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
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
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
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
The Android Open Source Project
ffe072e1a2
merge from open-source master
...
Change-Id: I7d0f3b08f6e632b689c870017374741a544bc7e8
2010-06-14 10:49:52 -07:00
The Android Open Source Project
1424c5daa1
merge from open-source master
...
Change-Id: Icb039ab90287961b1ad358b78eaead4a9aa2ae59
2010-06-14 10:01:48 -07:00
The Android Open Source Project
10afb18820
merge from open-source master
...
Change-Id: Iedee6a43e23821175148324bc2502a33112e2d59
2010-06-14 09:26:36 -07:00
Jean-Baptiste Queru
e78a6a8d11
Merge "Cleaned up Samples by removing unsed imports and variables. Changed deprecated Config.LOGD to Config.DEBUG Removed unnecessary whitespaces"
2010-06-14 09:20:43 -07:00
Christian Mehlmauer
62e92d7a2a
Cleaned up Samples by removing unsed imports and variables.
...
Changed deprecated Config.LOGD to Config.DEBUG
Removed unnecessary whitespaces
Change-Id: I01414dd83eb6f9a41e56762dd7fc00e7f1115039
2010-06-12 12:13:18 +02:00
Romain Guy
db64fc5c60
Merge "Reduced warnings by removing unused imports, unused variables and adding type arguments"
2010-06-11 18:37:31 -07:00
Jean-Baptiste Queru
f33fca8fec
Merge "Removed unused Imports, Added Type Arguments, removed some Warnings by using unused Methods and Variables"
2010-06-11 15:19:42 -07:00
The Android Open Source Project
cc303b81e4
merge from froyo-plus-aosp
...
Change-Id: I2143b0ab6c94047d36d83a734985e9dfa67efda3
2010-06-07 16:43:33 -07:00
The Android Open Source Project
7acf0f3726
merge from open-source master
...
Change-Id: Ia3b88d1fc8864903dd67478e972758871730a215
2010-06-07 16:30:52 -07:00