Kenny Root
56281044e3
resolved conflicts for merge of 79ee0a9a to master
...
Change-Id: I110bd412e38358b3d99235bf10fd9d1022aa04e9
2010-10-18 13:56:13 -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
Xavier Ducrohet
1cefa9fb2e
am 24277fdb: Merge "Set SDK samples to API 8 + gingerbread." into gingerbread
...
Merge commit '24277fdb61ce6133e31c7ef3e99bd4fc1314f0ac' into gingerbread-plus-aosp
* commit '24277fdb61ce6133e31c7ef3e99bd4fc1314f0ac':
Set SDK samples to API 8 + gingerbread.
2010-10-15 18:22:48 -07:00
Raphael
95a7877b9e
Set SDK samples to API 8 + gingerbread.
...
DO NOT MERGE
Change-Id: I1040974ab20426ad1fbdb958a21f10681fb68e69
2010-10-15 11:27:08 -07:00
Kenny Root
10540d6528
resolved conflicts for merge of 6c99a051 to master
...
Change-Id: I0bae8e92609253924f0c7adbc59f8c45394f341a
2010-10-15 00:14:56 -07:00
Chet Haase
e358b47be5
Updating code to use new non-generified animator APIs
...
Change-Id: I3023db9d1f9cb8bf98b788fce4ae2b58b182987d
2010-10-14 13:13:07 -07:00
Kenny Root
3ad988d373
am d5e77d5e: am 3ceb9b53: Merge "Update OBB sample to revised API" into gingerbread
...
Merge commit 'd5e77d5e56aa584e2bf21349f3d11918a15d594c'
* commit 'd5e77d5e56aa584e2bf21349f3d11918a15d594c':
Update OBB sample to revised API
2010-10-13 14:37:34 -07:00
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
Joe Malin
390d67679c
Samples: Fix bugs in Note Pad sample app.
...
Change-Id: I859cbc73eaaa77a9ff89484f33c7150d76a4e2c2
2010-10-11 09:13:32 -07:00
Chet Haase
45d18599b8
Various fixes
...
Change-Id: I70509d19d1df01e998de4804bc7c1e1899ad8dee
2010-10-07 12:29:12 -07:00
Dianne Hackborn
0ada5c781f
Make note pad provider private, but able to grant URI permissions.
...
Change-Id: I6113ec86e4d4cbc105932067ac2fbb2a0d468e15
2010-10-05 14:09:05 -07:00
Dianne Hackborn
ee3433bc58
resolved conflicts for merge of efddd2c5 to master
...
Change-Id: Ida5785a4b936ed485ee6f895cbe994acf5b37626
2010-10-05 14:06:01 -07:00
Chet Haase
7da3f9f51e
Modfied demo to show setting animations to null
...
Originally, setting LayoutTransition animators to null just restored the default animation behavior, It seems more sensible to have null actually disable the animation. I made that change to the framework and modified this demo to show how it's done. Along the way, I refactored the code a bit and fixed some minor bugs.
Change-Id: Icfb53ada234b635294c5faa68a15932f25859fb8
2010-10-04 17:25:41 -07:00
Chet Haase
2a06483139
Demos for show/hide layout transitions
...
Change-Id: Idb7ecb66b7dc0126a230385dd09af6a9208d5345
2010-10-04 15:19:26 -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
cc633e4965
resolved conflicts for merge of 4110368b to gingerbread-plus-aosp
...
Change-Id: I23f83b1272ba6aef5a4fbadf5e450c1e0b4dd82b
2010-09-30 16:39:16 -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
Jeff Brown
b39c4ba316
Added samples for splitting touches across views.
...
Also modified the rotating button demo to use touch splitting.
Change-Id: I560736903651e6846f847a9bd743a24a1707f6d2
2010-09-30 11:56:14 -07:00
Kenny Root
4e64cbb031
am e575be05: am 12c86756: Merge "Add OBB usage example" into gingerbread
...
Merge commit 'e575be05fd15d0858e4e0655ba3e1d6ecacf26d4'
* commit 'e575be05fd15d0858e4e0655ba3e1d6ecacf26d4':
Add OBB usage example
2010-09-30 11:29:05 -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
Joe Malin
f82564473f
Samples: Fix bugs in Note Pad sample app.
...
Change-Id: Iacb22efa30d3627dba5a5f91151da5c75722715e
2010-09-28 16:02:00 -07:00
Dianne Hackborn
8fc1811242
Make FramementLayout demo better... and, um actually work.
...
Also some other small cleanup.
Change-Id: Iaaf5d4a85113b4a01a4bd3986e2334972e1096ad
2010-09-21 19:29:47 -07:00
Joe Onorato
2d1343ad32
Add sample code for the new tablet ticker.
...
Change-Id: I621cb3daf3fe79db149e8efbac5ea3ec62371503
2010-09-21 11:55:12 -04:00
Amith Yamasani
b1fc132329
Merge "SearchView examples"
2010-09-15 16:11:32 -07:00
Amith Yamasani
ed6ae47c87
SearchView examples
2010-09-14 18:05:13 -07:00
Megha Joshi
8d74e52a0a
resolved conflicts for merge of 292096fc to master
...
Change-Id: I2a0d13b3b36aaf3fd6d6b1161bb75ae5ae890630
2010-09-14 10:39:56 -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
Dianne Hackborn
519b6aa41e
Modify retain sample to show of retained targets.
...
Change-Id: I33dd83651006469ef2af7976861f3b832e13bf60
2010-09-12 17:10:44 -07:00
Vairavan Srinivasan
0e8b60db14
am 3d925ea9: am 50d579d0: GlobalTime: Perform Zoom In and Out only after initialization
...
Merge commit '3d925ea9e884000a7e5e8e18c681967f9550b15d'
* commit '3d925ea9e884000a7e5e8e18c681967f9550b15d':
GlobalTime: Perform Zoom In and Out only after initialization
2010-09-10 16:36:56 -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
Chet Haase
fe3b0cb7aa
Merge "Enhanced demo for view transformation properties"
2010-09-09 15:35:56 -07:00
Chet Haase
b0a7a1ac0f
Enhanced demo for view transformation properties
...
Change-Id: I01939513d7848b09ce17e7f604512a89062f446f
2010-09-09 14:53:12 -07:00
Jeff Brown
b7e6e13f99
resolved conflicts for merge of 2073f44b to master
...
Change-Id: I4e787edd6aed6027ceb30bd9c6def6912c48c63c
2010-09-08 13:11:24 -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
Gilles Debunne
045eac4208
New simple_selectable_list_item layout demo in ApiDemos / List
...
This layout uses the new border rectangle to highlight selected items.
Change-Id: Ic1b1bb4cb703c1f30e36a2913b9432a76ea0a6d6
2010-09-08 11:21:31 -07:00
Gilles Debunne
cd97f6686e
Merge "Added a disabled button and a second text edit in View / Controls"
2010-09-08 11:09:19 -07:00
Gilles Debunne
62c863d257
Added a disabled button and a second text edit in View / Controls
...
Change-Id: I2e0e9b480609289fa7f9546614af51d4ce293a9c
2010-09-08 10:18:06 -07:00
Chet Haase
d9855a8dbe
Animation classname changes
...
Change-Id: I0b3b5f1563ab0ac301684880957ed55ebfc54da5
2010-09-08 08:38:21 -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