LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,704 Commits 2 Branches 0 Tags
fe3b0cb7aa448058d0fc13a360d027d2d0e3fb4b
Commit Graph

4704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Brown
ff242db867 Merge "Add samples for secure views." into gingerbread 2010-09-08 11:53:13 -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
Dianne Hackborn
e0a989bcfa am eb39544d: am d3d58cf7: Update to follow ALooper ident change. 
Merge commit 'eb39544df62682e2f765b62488daea7a8100f4cd'

* commit 'eb39544df62682e2f765b62488daea7a8100f4cd':
  Update to follow ALooper ident change.
 2010-09-07 18:51:59 -07:00
Dianne Hackborn
eb39544df6 am d3d58cf7: Update to follow ALooper ident change. 
Merge commit 'd3d58cf7d3a508bb855c2ad626205ddcbb3bd237' into gingerbread-plus-aosp

* commit 'd3d58cf7d3a508bb855c2ad626205ddcbb3bd237':
  Update to follow ALooper ident change.
 2010-09-07 16:36:39 -07:00
Dianne Hackborn
d3d58cf7d3 Update to follow ALooper ident change. 
Also the native-activity sample also has some very simple code showing
how to listen to the accelerometer.

Change-Id: I0629b8bc40cddd66233c1675cd5e8b42a9b722d8
 2010-09-07 15:47:35 -07:00
Joe Onorato
461baf515d am 31018711: am 7d26cd19: Add an activity to Dev Tools that shows the Configuration and DisplayMetrics. 
Merge commit '310187112b211f24c074fd9e34db9dddc59158f3'

* commit '310187112b211f24c074fd9e34db9dddc59158f3':
  Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
 2010-09-07 14:48:17 -07:00
Jeff Brown
cf4db94885 Add samples for secure views. 
Change-Id: Ibe1e63c87f4c6a715009f7bbcdafa552dc2d937c
 2010-09-07 13:04:15 -07:00
Joe Onorato
310187112b am 7d26cd19: Add an activity to Dev Tools that shows the Configuration and DisplayMetrics. 
Merge commit '7d26cd198266cd48cb0a912585419fbe0cc8ed89' into gingerbread-plus-aosp

* commit '7d26cd198266cd48cb0a912585419fbe0cc8ed89':
  Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
 2010-09-07 11:39:40 -07:00
Joe Onorato
7d26cd1982 Add an activity to Dev Tools that shows the Configuration and DisplayMetrics. 
Change-Id: I6d3a682adccfef99eaa4d01b97091eda68f05cd8
 2010-09-07 12:03:48 -04:00
Steve Block
85787ad25c Merge changes I3fe2596a,I340c69c6 
* changes:
  Updates source.android.com for external contributions to V8
  Fixes missing footers in Source tab of http://source.android.com
 2010-09-04 11:13:26 -07:00
Steve Block
1755d86127 Updates source.android.com for external contributions to V8 
Instructs external contributors that changes to external/v8 should be made
directly at http://code.google.com/p/v8.

Change-Id: I3fe2596a183751eeba968f51d206ea37b1d26bb2
 2010-09-04 19:12:21 +01: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
Steve Block
3ced86507a Fixes missing footers in Source tab of http://source.android.com 
Also fixes broken style in bottom half of http://source.android.com/source/download.html

Change-Id: I340c69c6dfe55aabc8446dd9313597bf88d6b369
 2010-09-03 11:22:06 +01:00
Steve Block
d92b7c07d4 Merge "Updates source.android.com for external contributions to WebKit" 2010-09-03 02:03:15 -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
Steve Block
9449ecee46 Updates source.android.com for external contributions to WebKit 
Instructs external contributors that changes to external/webkit should be made
directly at webkit.org.

I've assumed that in the future we will (or should now) direct external
contributors to make changes upstream for other upstream projects too.

Change-Id: I538930794907729ebcca4cbb20a2952d0159873f
 2010-09-02 14:45:16 +01:00
Xavier Ducrohet
5f2cb81aec am 666f4c09: (-s ours) am b7d3c175: Merge "New SDK architecture. DO NOT MERGE." into gingerbread 
Merge commit '666f4c0955d76e0792a58189b717a6666ed9935a'

* commit '666f4c0955d76e0792a58189b717a6666ed9935a':
  New SDK architecture. DO NOT MERGE.
 2010-09-01 17:19:26 -07:00
Xavier Ducrohet
666f4c0955 am b7d3c175: Merge "New SDK architecture. DO NOT MERGE." into gingerbread 
Merge commit 'b7d3c175e25143cb75199d4e62418df5bc2e413b' into gingerbread-plus-aosp

* commit 'b7d3c175e25143cb75199d4e62418df5bc2e413b':
  New SDK architecture. DO NOT MERGE.
 2010-09-01 16:53:40 -07:00
Xavier Ducrohet
b7d3c175e2 Merge "New SDK architecture. DO NOT MERGE." into gingerbread 2010-09-01 16:48:59 -07:00
Dan Morrill
36a745a2e0 Merge "Changing default CDD to 2.2." 2010-09-01 10:14:22 -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
Yu Shan Emily Lau
2374edc103 am 64a1698a: am 67aad2d8: Merge "Add the simple script log for the statbility stress test. Add the randomize script option." into gingerbread 
Merge commit '64a1698a306dabc9ce4c8fb50adbce49a1784192'

* commit '64a1698a306dabc9ce4c8fb50adbce49a1784192':
  Add the simple script log for the statbility stress test.
 2010-08-30 16:05:58 -07:00
Xavier Ducrohet
3aecc4de01 New SDK architecture. DO NOT MERGE. 
tools normally under the platform, move to a single location
called platform-tools/

Change-Id: I70659167778303722acb107a2d04bbf01467f884
 2010-08-30 16:01:45 -07:00
Yu Shan Emily Lau
64a1698a30 am 67aad2d8: Merge "Add the simple script log for the statbility stress test. Add the randomize script option." into gingerbread 
Merge commit '67aad2d8d51e9d48730f0c6e4848c60b1a9d0798' into gingerbread-plus-aosp

* commit '67aad2d8d51e9d48730f0c6e4848c60b1a9d0798':
  Add the simple script log for the statbility stress test.
 2010-08-30 15:56:38 -07:00
Yu Shan Emily Lau
67aad2d8d5 Merge "Add the simple script log for the statbility stress test. Add the randomize script option." into gingerbread 2010-08-30 15:52:59 -07:00
Yu Shan Emily Lau
6a6c533129 Add the simple script log for the statbility stress test. 
Add the randomize script option.

Change-Id: I7fbbd3b78a2fc5fe5300ac4811540d0cd2070688
 2010-08-30 15:31:33 -07:00
Jean-Baptiste Queru
d9ef1df4a8 am e98ed06e: am d9380caf: Merge "Make runtest --path smarter when choosing path to build." 
Merge commit 'e98ed06e17e28a11609caf133a08b3ced21a049a'

* commit 'e98ed06e17e28a11609caf133a08b3ced21a049a':
  Make runtest --path smarter when choosing path to build.
 2010-08-30 13:28:09 -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
e98ed06e17 am d9380caf: Merge "Make runtest --path smarter when choosing path to build." 
Merge commit 'd9380caf410ddf4b17a6e5035a89851bc58408f7' into gingerbread-plus-aosp

* commit 'd9380caf410ddf4b17a6e5035a89851bc58408f7':
  Make runtest --path smarter when choosing path to build.
 2010-08-30 10:33:39 -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
d9380caf41 Merge "Make runtest --path smarter when choosing path to build." 2010-08-30 09:10:24 -07:00
Jean-Baptiste Queru
be97ad655d Merge "Replaced deprecated Contacts Api with ContactsContract" 2010-08-30 09:04:19 -07:00
Xavier Ducrohet
e1a36a69e8 am 7ddeaf21: am 420b59fe: Fix windows SDK build. 
Merge commit '7ddeaf2189847cbc6765af552c98439d654d6938'

* commit '7ddeaf2189847cbc6765af552c98439d654d6938':
  Fix windows SDK build.
 2010-08-27 19:43:59 -07:00
Xavier Ducrohet
7ddeaf2189 am 420b59fe: Fix windows SDK build. 
Merge commit '420b59fe215f8a912e66759d1c4a252bea3df39d' into gingerbread-plus-aosp

* commit '420b59fe215f8a912e66759d1c4a252bea3df39d':
  Fix windows SDK build.
 2010-08-27 19:41:51 -07:00
Xavier Ducrohet
420b59fe21 Fix windows SDK build. 
Location of hierarchyviewer is now in hierarchyviewer2/app/etc

Change-Id: I14257c96552a16d19461cdf8194045a608dd03b3
 2010-08-27 19:30:38 -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