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

4784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brian Muramatsu
c1a98d0750 Merge "Update Android Eclair CTS Download Link to 2.1_r4" 2010-08-27 13:57:29 -07:00
Yu Shan Emily Lau
edf209e65f am f1598c4c: am ea7d6e8e: Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread 
Merge commit 'f1598c4cf40fb8c00c93acd27ab3230a9c9620e6'

* commit 'f1598c4cf40fb8c00c93acd27ab3230a9c9620e6':
  Add the new option for the device sleep time. This is only for the scripted monkey.
 2010-08-27 12:15:02 -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
Christopher Tate
f36c4e1236 Explicitly enable backup by default in SDK builds 
This change parallels a frameworks/base change that makes the default
backup state at boot "enabled, with LocalTransport as the currently
active transport."  Device vendors who wish to ship the Google backup
transport need to explicitly disable backup by default (it is enabled
when the user agrees to the opt-in disclosure).

Change-Id: I6b0c5c059ef58effd5c121107ea3a5edd9e936cc
 2010-08-27 08:24: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
b15335142e Update preference samples. 
Change-Id: Ia78d9c0f4f7e58f500aef55413b911904d0c40cd
 2010-08-26 17:09:27 -07:00
Yu Shan Emily Lau
f1598c4cf4 am ea7d6e8e: Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread 
Merge commit 'ea7d6e8e6568b777693c52183e9abf973786a6b5' into gingerbread-plus-aosp

* commit 'ea7d6e8e6568b777693c52183e9abf973786a6b5':
  Add the new option for the device sleep time. This is only for the scripted monkey.
 2010-08-26 15:27:57 -07:00
Yu Shan Emily Lau
ea7d6e8e65 Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread 2010-08-26 15:17:36 -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
Yu Shan Emily Lau
9ab015751d Add the new option for the device sleep time. This is only for the scripted monkey. 
Change-Id: I4a6bd7133bbd2da9594a47e1f5529c5358cd9aed
 2010-08-26 14:18:18 -07:00
Raphael Moll
23d595f53c am 059e4eb3: am f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe" 
Merge commit '059e4eb3dbcc3ad645a2cd1f1670d92ab3dc1455'

* commit '059e4eb3dbcc3ad645a2cd1f1670d92ab3dc1455':
  SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
 2010-08-26 13:14:29 -07:00
Raphael Moll
059e4eb3db am f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe" 
Merge commit 'f08d230ed0d2612e79c121e0afa1e439b5702815' into gingerbread-plus-aosp

* commit 'f08d230ed0d2612e79c121e0afa1e439b5702815':
  SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
 2010-08-26 09:02:13 -07:00
Chet Haase
42d5390018 Merge "Demo for using and testing animation events" 2010-08-25 17:40:44 -07:00
Chet Haase
2ab1da8886 Demo for using and testing animation events 
Change-Id: I7db791928dc590fd724f4c71565b42bc366e519c
 2010-08-25 16:49:54 -07:00
Brian Muramatsu
ce8933413f Update Android Eclair CTS Download Link to 2.1_r4 
Bug 2923901

Change-Id: I42b743c04954a77fc060d1a6fc6ec589e7afc72c
 2010-08-25 16:18:35 -07:00
Jean-Baptiste Queru
4ade2d71dc am 40ed6797: am 33462598: am bea98acf: reconcile open-source froyo into google variant 
Merge commit '40ed6797ee0a734ec7af041b84998c610968503a'

* commit '40ed6797ee0a734ec7af041b84998c610968503a':
  Explicitly enable backup by default in SDK builds
 2010-08-25 10:17:11 -07:00
Jean-Baptiste Queru
40ed6797ee am 33462598: am bea98acf: reconcile open-source froyo into google variant 
Merge commit '33462598d8c20001483f3f2e1bca155fa3a83cd5' into gingerbread-plus-aosp

* commit '33462598d8c20001483f3f2e1bca155fa3a83cd5':
  Explicitly enable backup by default in SDK builds
 2010-08-25 10:15:11 -07:00