Commit Graph

1258 Commits

Author SHA1 Message Date
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
Chet Haase
0a495ab0d3 Demo ability to enable default layout animations from XML
Change-Id: I4a5c73391d277c248958cf8cb5260078006bafb1
2010-09-03 15:50:32 -07:00
Chet Haase
43828a8383 Demo of layout add/remove transitions
Change-Id: Ib5f31bb0b6d16fa18cf10a426a25c7a8138f620a
2010-09-03 12:19:41 -07:00
Dianne Hackborn
2593a187ab am 84d495af: am 23bff5dd: Add API demo for picking a contact with a permission grant.
Merge commit '84d495af1b030208cced9b3cd70486a0e9af6370'

* commit '84d495af1b030208cced9b3cd70486a0e9af6370':
  Add API demo for picking a contact with a permission grant.
2010-09-02 14:52:45 -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
Xavier Ducrohet
b28497e279 Merge "Make source.properties use the current codename." 2010-08-30 16:14:36 -07:00
Xavier Ducrohet
b4466250fb Make source.properties use the current codename.
Change-Id: Ie8c94f930b1ad4c3462a03138dc11e3691fca458
2010-08-30 16:13:07 -07:00
Jean-Baptiste Queru
712e7865b0 resolved conflicts for merge of 85173cc0 to master
Change-Id: I0ac3819b7c8a1822f217817ea6b8471cac24044f
2010-08-30 13:24:13 -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
bee2a75066 am 1f40b600: am 562306ec: Fix build.
Merge commit '1f40b600a8201de2f983e0e117c664f63fc68f55'

* commit '1f40b600a8201de2f983e0e117c664f63fc68f55':
  Fix build.
2010-08-27 18:11:14 -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
018ba7867d am 131bf0b0: am 704da604: Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
Merge commit '131bf0b09ea3725bfe1c605c2fe7229d3d63a9cb'

* commit '131bf0b09ea3725bfe1c605c2fe7229d3d63a9cb':
  Disable Proguard for the SampleBrowerPlugin
2010-08-27 16:04:52 -07:00
Dianne Hackborn
3e4a5c8a5e Update to follow clipboard APIs.
Change-Id: I905a499f2697bea218b6d4c3f8ec339fbe52c916
2010-08-27 11:06:05 -07:00
Dianne Hackborn
eaca8a46d1 am 1cb87dac: am 4f410fb5: Update to follow API.
Merge commit '1cb87dac3363386295e1483053563aff2e1ac989'

* commit '1cb87dac3363386295e1483053563aff2e1ac989':
  Update to follow API.
2010-08-27 08:29:04 -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
b15335142e Update preference samples.
Change-Id: Ia78d9c0f4f7e58f500aef55413b911904d0c40cd
2010-08-26 17:09:27 -07: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
Chet Haase
2ab1da8886 Demo for using and testing animation events
Change-Id: I7db791928dc590fd724f4c71565b42bc366e519c
2010-08-25 16:49:54 -07:00
Chet Haase
989a1180de Merge "Adding demo for xml animator loading" 2010-08-25 08:17:55 -07:00
Chet Haase
0366ddf4d3 Adding demo for xml animator loading
Change-Id: I77d4e4f3b26c47e7973dd64282c12a9d6c3b5dd1
2010-08-24 19:50:12 -07:00
Joe Malin
88bcee2e89 Note Pad: merged jmalin and hackbod chgs
Change-Id: Ica0fff191b806981bdca05977174a6ed3bb6d9f1
2010-08-24 17:44:55 -07:00
Gilles Debunne
6e94ff6be9 New Views/Controls themes: Theme.Holo and Theme.Light.Holo
Change-Id: Ie3cd1ea5713119ce2027096a55e68997127a46f7
2010-08-23 17:23:02 -07:00
Megha Joshi
46a790eab0 fixing build
Change-Id: If7b523185be7ace6a812adf3b392f38fb05504a6
2010-08-21 18:07:01 -07:00
Megha Joshi
762cc59930 Merge "Clean up sample code to look better." 2010-08-21 17:06:05 -07:00
Dianne Hackborn
effa303688 Update fragment dialog samples.
- Follow API changes.
- Clean up and mark up for inclusion as sample code.
- New sample that shows a DialogFragment used as both a dialog
  and embedded in an activity.

Change-Id: Icaa41283562f4f345b188442ef988c9d5edd8ed1
2010-08-20 18:32:43 -07:00
Chet Haase
434672af29 add demo of bouncing balls to show various Animator APIs
Change-Id: I9d3aec9661d8845f67ea1c01b00f85f2380fd77f
2010-08-20 17:59:09 -07:00